espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/wpa_eap_v1_connect_issue' into 'master'

Browse Source 
fix(softAP): Adjusted authentication mode for wpa-eap version 1

Closes WIFIBUG-954

See merge request espressif/esp-idf!35321
This commit is contained in:
Jiang Jiang Jian
2025-05-15 17:51:49 +08:00
parent 94d71a8cd0 c776b440ec
commit 4983ba1a59
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/esp_wifi/include/esp_wifi_types_generic.h
View File

@ -81,7 +81,7 @@ typedef struct {
* @brief Wi-Fi authmode type
* Strength of authmodes
* Personal Networks : OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK = DPP
* Enterprise Networks : WIFI_AUTH_WPA2_ENTERPRISE < WIFI_AUTH_WPA3_ENTERPRISE = WIFI_AUTH_WPA2_WPA3_ENTERPRISE < WIFI_AUTH_WPA3_ENT_192
* Enterprise Networks : WIFI_AUTH_WPA_ENTERPRISE < WIFI_AUTH_WPA2_ENTERPRISE < WIFI_AUTH_WPA3_ENTERPRISE = WIFI_AUTH_WPA2_WPA3_ENTERPRISE < WIFI_AUTH_WPA3_ENT_192
*/
typedef enum {
WIFI_AUTH_OPEN = 0, /**< Authenticate mode : open */
@ -89,8 +89,8 @@ typedef enum {
WIFI_AUTH_WPA_PSK, /**< Authenticate mode : WPA_PSK */
WIFI_AUTH_WPA2_PSK, /**< Authenticate mode : WPA2_PSK */
WIFI_AUTH_WPA_WPA2_PSK, /**< Authenticate mode : WPA_WPA2_PSK */
WIFI_AUTH_ENTERPRISE, /**< Authenticate mode : Wi-Fi EAP security */
WIFI_AUTH_WPA2_ENTERPRISE = WIFI_AUTH_ENTERPRISE, /**< Authenticate mode : Wi-Fi EAP security */
WIFI_AUTH_ENTERPRISE, /**< Authenticate mode : Wi-Fi EAP security, treated the same as WIFI_AUTH_WPA2_ENTERPRISE */
WIFI_AUTH_WPA2_ENTERPRISE = WIFI_AUTH_ENTERPRISE, /**< Authenticate mode : WPA2-Enterprise security */
WIFI_AUTH_WPA3_PSK, /**< Authenticate mode : WPA3_PSK */
WIFI_AUTH_WPA2_WPA3_PSK, /**< Authenticate mode : WPA2_WPA3_PSK */
WIFI_AUTH_WAPI_PSK, /**< Authenticate mode : WAPI_PSK */
@ -101,6 +101,7 @@ typedef enum {
WIFI_AUTH_DPP, /**< Authenticate mode : DPP */
WIFI_AUTH_WPA3_ENTERPRISE, /**< Authenticate mode : WPA3-Enterprise Only Mode */
WIFI_AUTH_WPA2_WPA3_ENTERPRISE, /**< Authenticate mode : WPA3-Enterprise Transition Mode */
WIFI_AUTH_WPA_ENTERPRISE, /**< Authenticate mode : WPA-Enterprise security */
WIFI_AUTH_MAX
} wifi_auth_mode_t;

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 598507db92...653c839e56

2
components/wpa_supplicant/src/rsn_supp/wpa.c
View File

@ -2261,7 +2261,7 @@ void wpa_set_profile(u32 wpa_proto, u8 auth_mode)
struct wpa_sm *sm = &gWpaSm;
sm->proto = wpa_proto;
if (auth_mode == WPA2_AUTH_ENT) {
if (auth_mode == WPA2_AUTH_ENT || (auth_mode == WPA_AUTH_UNSPEC)) {
sm->key_mgmt = WPA_KEY_MGMT_IEEE8021X; /* for wpa2 enterprise */
} else if (auth_mode == WPA2_AUTH_ENT_SHA256) {
sm->key_mgmt = WPA_KEY_MGMT_IEEE8021X_SHA256; /* for wpa2 enterprise sha256 */