From bbf0d76ac39ba68deccfe1d05eccaee700ad05be Mon Sep 17 00:00:00 2001 From: yinqingzhao Date: Fri, 31 May 2024 18:20:31 +0800 Subject: [PATCH 1/6] fix(wifi):fix data len not correct in he actions --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index fff3460aaf..cb49ddb64b 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit fff3460aafdcfef2d1890caa80c1855eb5fac327 +Subproject commit cb49ddb64b9fd10f0b0bb62445611e903e275eef From 3b0e048f0ed3159294dfffbccc8f333a8c2311e4 Mon Sep 17 00:00:00 2001 From: muhaidong Date: Fri, 31 May 2024 14:35:55 +0800 Subject: [PATCH 2/6] fix(wifi): fixed disable gcmp choose pairwise cipher wrong issue --- components/esp_wifi/include/esp_wifi.h | 10 +++++++++- components/esp_wifi/lib | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h index f56beb6c6e..1ec09eb11e 100644 --- a/components/esp_wifi/include/esp_wifi.h +++ b/components/esp_wifi/include/esp_wifi.h @@ -242,6 +242,12 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs; #define WIFI_FTM_RESPONDER 0 #endif +#if CONFIG_GCMP +#define WIFI_ENABLE_GCMP (1<<4) +#else +#define WIFI_ENABLE_GCMP 0 +#endif + #if CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED #define WIFI_DUMP_HESIGB_ENABLED true #else @@ -258,12 +264,14 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs; #define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1) #define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2) #define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3) +#define CONFIG_FEATURE_GCMP_BIT (1<<4) /* Set additional WiFi features and capabilities */ #define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \ WIFI_ENABLE_SPIRAM | \ WIFI_FTM_INITIATOR | \ - WIFI_FTM_RESPONDER) + WIFI_FTM_RESPONDER | \ + WIFI_ENABLE_GCMP) #define WIFI_INIT_CONFIG_DEFAULT() { \ .osi_funcs = &g_wifi_osi_funcs, \ diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index cb49ddb64b..e16a9ee1b2 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit cb49ddb64b9fd10f0b0bb62445611e903e275eef +Subproject commit e16a9ee1b2c72c423e497ea62b34ae87761f7fd6 From 687a40df4ee0d90cb573d6056acadc29504bcf51 Mon Sep 17 00:00:00 2001 From: zhangyanjiao Date: Thu, 6 Jun 2024 10:40:36 +0800 Subject: [PATCH 3/6] fix(wifi): do not send null data when scan start/done for mesh Closes https://github.com/espressif/esp-idf/issues/13786 --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index e16a9ee1b2..12fad1ea40 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit e16a9ee1b2c72c423e497ea62b34ae87761f7fd6 +Subproject commit 12fad1ea40d5ce4b1da7a1866f7bdd9b11a355bc From c3a47bf36561153f9e473ef3d758809d1a891e4f Mon Sep 17 00:00:00 2001 From: muhaidong Date: Tue, 4 Jun 2024 17:27:18 +0800 Subject: [PATCH 4/6] fix(wifi): fix configure gcmp failure issue --- components/esp_wifi/Kconfig | 2 +- components/esp_wifi/include/esp_wifi.h | 12 ++++++++++-- components/esp_wifi/lib | 2 +- components/wpa_supplicant/src/crypto/crypto_ops.c | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig index 1a69b8d6bd..67f268c8fd 100644 --- a/components/esp_wifi/Kconfig +++ b/components/esp_wifi/Kconfig @@ -406,7 +406,7 @@ menu "Wi-Fi" config ESP_WIFI_GMAC_SUPPORT bool "WiFi GMAC Support(GMAC128 and GMAC256)" - default n + default y help Select this option to enable GMAC support. GMAC support is compulsory for WiFi 192 bit certification. diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h index 1ec09eb11e..b9589ad70d 100644 --- a/components/esp_wifi/include/esp_wifi.h +++ b/components/esp_wifi/include/esp_wifi.h @@ -242,12 +242,18 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs; #define WIFI_FTM_RESPONDER 0 #endif -#if CONFIG_GCMP +#if CONFIG_ESP_WIFI_GCMP_SUPPORT #define WIFI_ENABLE_GCMP (1<<4) #else #define WIFI_ENABLE_GCMP 0 #endif +#if CONFIG_ESP_WIFI_GMAC_SUPPORT +#define WIFI_ENABLE_GMAC (1<<5) +#else +#define WIFI_ENABLE_GMAC 0 +#endif + #if CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED #define WIFI_DUMP_HESIGB_ENABLED true #else @@ -265,13 +271,15 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs; #define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2) #define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3) #define CONFIG_FEATURE_GCMP_BIT (1<<4) +#define CONFIG_FEATURE_GMAC_BIT (1<<5) /* Set additional WiFi features and capabilities */ #define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \ WIFI_ENABLE_SPIRAM | \ WIFI_FTM_INITIATOR | \ WIFI_FTM_RESPONDER | \ - WIFI_ENABLE_GCMP) + WIFI_ENABLE_GCMP | \ + WIFI_ENABLE_GMAC) #define WIFI_INIT_CONFIG_DEFAULT() { \ .osi_funcs = &g_wifi_osi_funcs, \ diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 12fad1ea40..21d34cbbf1 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 12fad1ea40d5ce4b1da7a1866f7bdd9b11a355bc +Subproject commit 21d34cbbf1a9e7d0f6907483012d7e390b393a77 diff --git a/components/wpa_supplicant/src/crypto/crypto_ops.c b/components/wpa_supplicant/src/crypto/crypto_ops.c index 17c052c986..7b3f31a148 100644 --- a/components/wpa_supplicant/src/crypto/crypto_ops.c +++ b/components/wpa_supplicant/src/crypto/crypto_ops.c @@ -43,7 +43,7 @@ static int esp_aes_gmac(const u8 *key, size_t key_len, const u8 *iv, size_t iv_l #if CONFIG_GMAC return aes_gmac(key, key_len, iv, iv_len, aad, aad_len, tag); #else - return 0; + return -1; #endif } From c4bda59c319339faaf573d466f213bea77e191e4 Mon Sep 17 00:00:00 2001 From: "wangtao@espressif.com" Date: Tue, 11 Jun 2024 16:25:51 +0800 Subject: [PATCH 5/6] fix(wifi): fix sta scan when connected cause bcn timeout loop issue --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 21d34cbbf1..7f676ffedd 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 21d34cbbf1a9e7d0f6907483012d7e390b393a77 +Subproject commit 7f676ffedd56d64d418ca5dfa13847a2dbe07b4c From 3ccffd46f129d8a1af506515dda2f0f577456c36 Mon Sep 17 00:00:00 2001 From: aditi_lonkar Date: Mon, 8 Apr 2024 17:38:27 +0530 Subject: [PATCH 6/6] fix(esp_wifi): Fix for issue in changing opmode when wps is enabled --- components/esp_wifi/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib index 7f676ffedd..70c2d7f46d 160000 --- a/components/esp_wifi/lib +++ b/components/esp_wifi/lib @@ -1 +1 @@ -Subproject commit 7f676ffedd56d64d418ca5dfa13847a2dbe07b4c +Subproject commit 70c2d7f46d65a1b7904ce968e6b63a51acfc0745