From 437fbbc5180ae9b215c10ba2d4618ecff2790b51 Mon Sep 17 00:00:00 2001 From: Shyamal Khachane Date: Mon, 9 Oct 2023 16:33:26 +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 | 8 +++++--- components/esp_wifi/lib | 2 +- examples/wifi/scan/main/scan.c | 7 +++++-- examples/wifi/wifi_enterprise/main/Kconfig.projbuild | 2 +- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h index d7db356ceb..3e0304f262 100644 --- a/components/esp_wifi/include/esp_wifi_types.h +++ b/components/esp_wifi/include/esp_wifi_types.h @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2015-2022 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2015-2023 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -48,18 +48,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 36f50458b6..33a3dd2b54 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 36f50458b66eaf18372d5513fb95a8085941bdff +Subproject commit 33a3dd2b545499e8f1d25e5fc6f44de35a45931b diff --git a/examples/wifi/scan/main/scan.c b/examples/wifi/scan/main/scan.c index 121946c5ed..1067bdd32a 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 606e87b15d..8a8f50c249 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 WPA_SUITE_B_192