Merge branch 'bugfix/wpa_eap_v1_connect_issue_v5.3' into 'release/v5.3'

Adjusted authentication mode for wpa-eap version 1 and add some fixes for wpa_supplicant(release/v5.3)

See merge request espressif/esp-idf!40700
This commit is contained in:
Jiang Jiang Jian
2025-07-29 11:46:52 +08:00
6 changed files with 33 additions and 10 deletions
@@ -70,7 +70,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_ENT_192
* Enterprise Networks : WIFI_AUTH_WPA_ENTERPRISE < WIFI_AUTH_WPA2_ENTERPRISE < WIFI_AUTH_WPA3_ENT_192
*/
typedef enum {
WIFI_AUTH_OPEN = 0, /**< Authenticate mode : open */
@@ -78,8 +78,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 */
@@ -88,6 +88,9 @@ typedef enum {
WIFI_AUTH_WPA3_EXT_PSK, /**< This authentication mode will yield same result as WIFI_AUTH_WPA3_PSK and not recommended to be used. It will be deprecated in future, please use WIFI_AUTH_WPA3_PSK instead. */
WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE, /**< This authentication mode will yield same result as WIFI_AUTH_WPA3_PSK and not recommended to be used. It will be deprecated in future, please use WIFI_AUTH_WPA3_PSK instead.*/
WIFI_AUTH_DPP, /**< Authenticate mode : DPP */
WIFI_AUTH_DUMMY1,
WIFI_AUTH_DUMMY2,
WIFI_AUTH_WPA_ENTERPRISE, /**< Authenticate mode : WPA-Enterprise security */
WIFI_AUTH_MAX
} wifi_auth_mode_t;