From f2905d138872b849caaa510f64173902f5304b49 Mon Sep 17 00:00:00 2001 From: Shyamal Khachane Date: Mon, 11 Sep 2023 11:12:59 +0530 Subject: [PATCH] fix(esp_wifi): WPA3 enterprise 192 bit fix and config modification 1. Added SOC caps dependency for enabling 192 bit security in wifi enterprise example 2. Fixed authmode in log and connected event for WPA3 enterprise 192 bit security --- components/esp_wifi/include/esp_wifi_types.h | 6 ++++-- components/esp_wifi/lib | 2 +- examples/wifi/scan/main/scan.c | 7 +++++-- examples/wifi/wifi_enterprise/main/Kconfig.projbuild | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h index 7e5a9d33f8..cabe296cf5 100644 --- a/components/esp_wifi/include/esp_wifi_types.h +++ b/components/esp_wifi/include/esp_wifi_types.h @@ -56,18 +56,20 @@ typedef struct { } wifi_country_t; /* Strength of authmodes */ -/* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA2_ENTERPRISE < WPA3_PSK = WPA2_WPA3_PSK */ +/* OPEN < WEP < WPA_PSK < OWE < WPA2_PSK = WPA_WPA2_PSK < WAPI_PSK < WPA3_PSK = WPA2_WPA3_PSK */ typedef enum { WIFI_AUTH_OPEN = 0, /**< authenticate mode : open */ WIFI_AUTH_WEP, /**< authenticate mode : WEP */ 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_WPA2_ENTERPRISE, /**< authenticate mode : WPA2_ENTERPRISE */ + WIFI_AUTH_ENTERPRISE, /**< authenticate mode : WiFi EAP security */ + WIFI_AUTH_WPA2_ENTERPRISE = WIFI_AUTH_ENTERPRISE, /**< authenticate mode : WiFi EAP 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 */ WIFI_AUTH_OWE, /**< authenticate mode : OWE */ + WIFI_AUTH_WPA3_ENT_192, /**< authenticate mode : WPA3_ENT_SUITE_B_192_BIT */ WIFI_AUTH_MAX } wifi_auth_mode_t; diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 095491fcae..74fac32326 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 095491fcaee847aa82abb914918dd06a7be0b5b9 +Subproject commit 74fac32326a56ac976ea2b7f596373bbc2bad8c0 diff --git a/examples/wifi/scan/main/scan.c b/examples/wifi/scan/main/scan.c index dd61508999..cbb6cfdd44 100644 --- a/examples/wifi/scan/main/scan.c +++ b/examples/wifi/scan/main/scan.c @@ -43,8 +43,8 @@ static void print_auth_mode(int authmode) case WIFI_AUTH_WPA_WPA2_PSK: ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA_WPA2_PSK"); break; - case WIFI_AUTH_WPA2_ENTERPRISE: - ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA2_ENTERPRISE"); + case WIFI_AUTH_ENTERPRISE: + ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_ENTERPRISE"); break; case WIFI_AUTH_WPA3_PSK: ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_PSK"); @@ -52,6 +52,9 @@ static void print_auth_mode(int authmode) case WIFI_AUTH_WPA2_WPA3_PSK: ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA2_WPA3_PSK"); break; + case WIFI_AUTH_WPA3_ENT_192: + ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_WPA3_ENT_192"); + break; default: ESP_LOGI(TAG, "Authmode \tWIFI_AUTH_UNKNOWN"); break; diff --git a/examples/wifi/wifi_enterprise/main/Kconfig.projbuild b/examples/wifi/wifi_enterprise/main/Kconfig.projbuild index 7a9cab2d2b..e1a5f2146a 100644 --- a/examples/wifi/wifi_enterprise/main/Kconfig.projbuild +++ b/examples/wifi/wifi_enterprise/main/Kconfig.projbuild @@ -15,7 +15,7 @@ menu "Example Configuration" bool "WPA3_ENT" config EXAMPLE_WPA3_192BIT_ENTERPRISE bool "WPA3_192BIT_ENT" - depends on IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3 + depends on SOC_WIFI_GCMP_SUPPORT select ESP_WIFI_GCMP_SUPPORT select ESP_WIFI_GMAC_SUPPORT select ESP_WIFI_SUITE_B_192