Explorar o código

Merge branch 'bugfix/wifi_bugs_fixes' into 'master'

esp_wifi: Fix some wifi bugs.

Closes WIFI-3105, WIFI-3166, and WIFI-3174

See merge request espressif/esp-idf!11651
Jiang Jiang Jian %!s(int64=5) %!d(string=hai) anos
pai
achega
f13ace5253

+ 1 - 1
components/esp_wifi/lib

@@ -1 +1 @@
-Subproject commit c69597c79fc5d3b2bffb5cc330bd7ab8f956e460
+Subproject commit d530c227d7cd073ce14658124325e0352fae4e1d

+ 4 - 0
components/wpa_supplicant/src/crypto/tls_mbedtls.c

@@ -502,6 +502,10 @@ struct tls_connection * tls_connection_init(void *tls_ctx)
 
 void tls_connection_deinit(void *tls_ctx, struct tls_connection *conn)
 {
+	/* case: tls init failed */
+	if (!conn) {
+		return;
+	}
 	/* Free ssl ctx and data */
 	tls_mbedtls_conn_delete((tls_context_t *) conn->tls);
 	os_free(conn->tls);

+ 5 - 2
components/wpa_supplicant/src/eap_peer/eap.c

@@ -476,8 +476,11 @@ int eap_peer_config_init(
 			  sm->config.new_password_len);
 	}
 
-    if (g_wpa_ttls_phase2_type) {
-        sm->config.phase2 = g_wpa_ttls_phase2_type;
+	if (g_wpa_ttls_phase2_type) {
+		sm->config.phase2 = g_wpa_ttls_phase2_type;
+	} else {
+		/* set default config phase2 mode as MSCHAPV2 */
+		sm->config.phase2 = "auth=MSCHAPV2";
 	}
 
 	return 0;