feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(wifi): fix configure gcmp failure issue

Browse Source
This commit is contained in:
muhaidong
2024-06-04 17:27:18 +08:00
committed by jack
parent 687a40df4e
commit c3a47bf365
4 changed files with 13 additions and 5 deletions
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 config ESP_WIFI_GMAC_SUPPORT
bool "WiFi GMAC Support(GMAC128 and GMAC256)" bool "WiFi GMAC Support(GMAC128 and GMAC256)"
default n default y
help help
Select this option to enable GMAC support. GMAC support is compulsory for WiFi 192 bit certification. 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 #define WIFI_FTM_RESPONDER 0
#endif #endif
#if CONFIG_GCMP #if CONFIG_ESP_WIFI_GCMP_SUPPORT
#define WIFI_ENABLE_GCMP (1<<4) #define WIFI_ENABLE_GCMP (1<<4)
#else #else
#define WIFI_ENABLE_GCMP 0 #define WIFI_ENABLE_GCMP 0
#endif #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 #if CONFIG_ESP_WIFI_ENABLE_DUMP_HESIGB && !WIFI_CSI_ENABLED
#define WIFI_DUMP_HESIGB_ENABLED true #define WIFI_DUMP_HESIGB_ENABLED true
#else #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_INITIATOR_BIT (1<<2)
#define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3) #define CONFIG_FEATURE_FTM_RESPONDER_BIT (1<<3)
#define CONFIG_FEATURE_GCMP_BIT (1<<4) #define CONFIG_FEATURE_GCMP_BIT (1<<4)
#define CONFIG_FEATURE_GMAC_BIT (1<<5)
/* Set additional WiFi features and capabilities */ /* Set additional WiFi features and capabilities */
#define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \ #define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
WIFI_ENABLE_SPIRAM | \ WIFI_ENABLE_SPIRAM | \
WIFI_FTM_INITIATOR | \ WIFI_FTM_INITIATOR | \
WIFI_FTM_RESPONDER | \ WIFI_FTM_RESPONDER | \
WIFI_ENABLE_GCMP) WIFI_ENABLE_GCMP | \
WIFI_ENABLE_GMAC)
#define WIFI_INIT_CONFIG_DEFAULT() { \ #define WIFI_INIT_CONFIG_DEFAULT() { \
.osi_funcs = &g_wifi_osi_funcs, \ .osi_funcs = &g_wifi_osi_funcs, \

2
components/esp_wifi/lib

Submodule components/esp_wifi/lib updated: 12fad1ea40...21d34cbbf1

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 #if CONFIG_GMAC
return aes_gmac(key, key_len, iv, iv_len, aad, aad_len, tag); return aes_gmac(key, key_len, iv, iv_len, aad, aad_len, tag);
#else #else
return 0; return -1;
#endif #endif
} }