From 0ed1cadcf1a79f8cded2b175bdd4c694161e3a2f Mon Sep 17 00:00:00 2001 From: Sarvesh Bodakhe Date: Tue, 19 Mar 2024 11:33:53 +0530 Subject: [PATCH] feat(esp_wifi): Update Wi-Fi WPA3 authmodes as per WPA Specification v3.3 * Merge 'WIFI_AUTH_WPA3_EXT_PSK' and 'WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE' into 'WIFI_AUTH_WPA3_PSK' as per specification. --- components/esp_wifi/include/esp_wifi_types_generic.h | 4 +--- components/esp_wifi/lib | 2 +- examples/wifi/scan/main/scan.c | 6 ------ 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h index 59c9f90684..83e0043d7c 100644 --- a/components/esp_wifi/include/esp_wifi_types_generic.h +++ b/components/esp_wifi/include/esp_wifi_types_generic.h @@ -57,7 +57,7 @@ typedef struct { } wifi_country_t; /* Strength of authmodes */ -/* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK = DPP < WPA3_EXT_PSK = WPA3_EXT_PSK_MIXED_MODE */ +/* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK = DPP */ typedef enum { WIFI_AUTH_OPEN = 0, /**< authenticate mode : open */ WIFI_AUTH_WEP, /**< authenticate mode : WEP */ @@ -71,8 +71,6 @@ typedef enum { WIFI_AUTH_WAPI_PSK, /**< authenticate mode : WAPI_PSK */ WIFI_AUTH_OWE, /**< authenticate mode : OWE */ WIFI_AUTH_WPA3_ENT_192, /**< authenticate mode : WPA3_ENT_SUITE_B_192_BIT */ - WIFI_AUTH_WPA3_EXT_PSK, /**< authenticate mode : WPA3_PSK_EXT_KEY */ - WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE, /**< authenticate mode: WPA3_PSK + WPA3_PSK_EXT_KEY */ WIFI_AUTH_DPP, /**< authenticate mode : DPP */ WIFI_AUTH_MAX } wifi_auth_mode_t; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index fc1523dfac..b69a2fe273 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit fc1523dfacab5477587ad7cde19c7d16db9e1c26 +Subproject commit b69a2fe2739c7450f56f25f6183149cf91baf974 diff --git a/examples/wifi/scan/main/scan.c b/examples/wifi/scan/main/scan.c index 14b6935b5d..02a7388366 100644 --- a/examples/wifi/scan/main/scan.c +++ b/examples/wifi/scan/main/scan.c @@ -55,12 +55,6 @@ static void print_auth_mode(int authmode) case WIFI_AUTH_WPA3_ENT_192: ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_ENT_192"); break; - case WIFI_AUTH_WPA3_EXT_PSK: - ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK"); - break; - case WIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE: - ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_EXT_PSK_MIXED_MODE"); - break; default: ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN"); break;