alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-20 00:36:01 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_configure_gcmp_failure_issue' into 'master'

Browse Source 
fix(wifi): fix configure gcmp failure issue

Closes WIFIBUG-618

See merge request espressif/esp-idf!31312
This commit is contained in:
Jiang Jiang Jian 2024-06-11 16:10:34 +08:00
commit 721b4c89c9
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/Kconfig
View File

@ -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.

12
components/esp_wifi/include/esp_wifi.h
View File

@ -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, \

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 12fad1ea40d5ce4b1da7a1866f7bdd9b11a355bc
Subproject commit 21d34cbbf1a9e7d0f6907483012d7e390b393a77

2
components/wpa_supplicant/src/crypto/crypto_ops.c
View File

@ -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
}