From 7eef2771fe9cc65f2af2efc3585042774a3df6e9 Mon Sep 17 00:00:00 2001 From: Shyamal Khachane Date: Wed, 22 Nov 2023 11:53:21 +0530 Subject: [PATCH] fix(esp_wifi): 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 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h index d724903a8e..249abece54 100644 --- a/components/esp_wifi/include/esp_wifi_types.h +++ b/components/esp_wifi/include/esp_wifi_types.h @@ -47,16 +47,20 @@ typedef struct { wifi_country_policy_t policy; /**< country policy */ } wifi_country_t; +/* Strength of authmodes */ +/* OPEN < WEP < WPA_PSK < 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_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 f2f6694b49..80782b7152 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit f2f6694b49cb536031ccdc3237f892413ee7f088 +Subproject commit 80782b71525cb9543a664e65fdd576332cde622b diff --git a/examples/wifi/scan/main/scan.c b/examples/wifi/scan/main/scan.c index 17e5859c02..a5357bc629 100644 --- a/examples/wifi/scan/main/scan.c +++ b/examples/wifi/scan/main/scan.c @@ -40,8 +40,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"); @@ -49,6 +49,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;