mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-02 11:10:54 +03:00
Merge branch 'feature/softap_owe_support' into 'master'
Add support for OWE Only in SoftAP mode Closes WIFI-4281 and IDFGH-12437 See merge request espressif/esp-idf!47341
This commit is contained in:
@@ -346,6 +346,14 @@ menu "Wi-Fi"
|
||||
help
|
||||
Select this option to support wpa3_compatible mode for station and AP
|
||||
|
||||
config ESP_WIFI_ENABLE_WPA3_OWE_SOFTAP
|
||||
bool "Enable OWE-ONLY SOFTAP"
|
||||
default y
|
||||
select ESP_WIFI_MBEDTLS_CRYPTO
|
||||
depends on ESP_WIFI_SOFTAP_SUPPORT
|
||||
help
|
||||
Select this option to allow the device to enable OWE Only mode for softap.
|
||||
|
||||
config ESP_WIFI_SLP_IRAM_OPT
|
||||
bool "WiFi SLP IRAM speed optimization"
|
||||
select PM_SLP_DEFAULT_PARAMS_OPT
|
||||
|
||||
@@ -290,6 +290,12 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
|
||||
#define WIFI_ENABLE_PASSIVE_HIDDEN_AP 0
|
||||
#endif
|
||||
|
||||
#if CONFIG_ESP_WIFI_ENABLE_WPA3_OWE_SOFTAP
|
||||
#define WIFI_ENABLE_OWE_SOFTAP (1<<10)
|
||||
#else
|
||||
#define WIFI_ENABLE_OWE_SOFTAP 0
|
||||
#endif
|
||||
|
||||
#define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0)
|
||||
#define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1)
|
||||
#define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2)
|
||||
@@ -300,6 +306,7 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
|
||||
#define CONFIG_FEATURE_WIFI_ENT_BIT (1<<7)
|
||||
#define CONFIG_FEATURE_BSS_MAX_IDLE_BIT (1<<8)
|
||||
#define CONFIG_FEATURE_WIFI_PASSIVE_HIDDEN_AP_BIT (1<<9)
|
||||
#define CONFIG_FEATURE_OWE_SOFTAP_BIT (1<<10)
|
||||
|
||||
/* Set additional WiFi features and capabilities */
|
||||
#define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
|
||||
@@ -311,7 +318,8 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
|
||||
WIFI_ENABLE_11R | \
|
||||
WIFI_ENABLE_ENTERPRISE | \
|
||||
WIFI_ENABLE_BSS_MAX_IDLE | \
|
||||
WIFI_ENABLE_PASSIVE_HIDDEN_AP)
|
||||
WIFI_ENABLE_PASSIVE_HIDDEN_AP | \
|
||||
WIFI_ENABLE_OWE_SOFTAP)
|
||||
|
||||
#define WIFI_INIT_CONFIG_DEFAULT() { \
|
||||
.osi_funcs = &g_wifi_osi_funcs, \
|
||||
|
||||
+1
-1
Submodule components/esp_wifi/lib updated: 5bc1b23488...694f70f614
@@ -325,6 +325,14 @@ config WIFI_RMT_WPA3_COMPATIBLE_SUPPORT
|
||||
help
|
||||
Select this option to support wpa3_compatible mode for station and AP
|
||||
|
||||
config WIFI_RMT_ENABLE_WPA3_OWE_SOFTAP
|
||||
bool "Enable OWE-ONLY SOFTAP"
|
||||
default y
|
||||
select WIFI_RMT_MBEDTLS_CRYPTO
|
||||
depends on WIFI_RMT_SOFTAP_SUPPORT
|
||||
help
|
||||
Select this option to allow the device to enable OWE Only mode for softap.
|
||||
|
||||
config WIFI_RMT_SLP_IRAM_OPT
|
||||
bool "WiFi SLP IRAM speed optimization"
|
||||
select PM_SLP_DEFAULT_PARAMS_OPT
|
||||
|
||||
@@ -142,6 +142,13 @@ if WIFI_RMT_WPA3_COMPATIBLE_SUPPORT
|
||||
default WIFI_RMT_WPA3_COMPATIBLE_SUPPORT
|
||||
endif
|
||||
|
||||
if WIFI_RMT_ENABLE_WPA3_OWE_SOFTAP
|
||||
config ESP_WIFI_ENABLE_WPA3_OWE_SOFTAP # ignore: multiple-definition
|
||||
bool
|
||||
depends on WIFI_RMT_SOFTAP_SUPPORT
|
||||
default WIFI_RMT_ENABLE_WPA3_OWE_SOFTAP
|
||||
endif
|
||||
|
||||
if WIFI_RMT_SLP_IRAM_OPT
|
||||
config ESP_WIFI_SLP_IRAM_OPT # ignore: multiple-definition
|
||||
bool
|
||||
|
||||
@@ -290,6 +290,12 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
|
||||
#define WIFI_ENABLE_PASSIVE_HIDDEN_AP 0
|
||||
#endif
|
||||
|
||||
#if CONFIG_WIFI_RMT_ENABLE_WPA3_OWE_SOFTAP
|
||||
#define WIFI_ENABLE_OWE_SOFTAP (1<<10)
|
||||
#else
|
||||
#define WIFI_ENABLE_OWE_SOFTAP 0
|
||||
#endif
|
||||
|
||||
#define CONFIG_FEATURE_WPA3_SAE_BIT (1<<0)
|
||||
#define CONFIG_FEATURE_CACHE_TX_BUF_BIT (1<<1)
|
||||
#define CONFIG_FEATURE_FTM_INITIATOR_BIT (1<<2)
|
||||
@@ -300,6 +306,7 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
|
||||
#define CONFIG_FEATURE_WIFI_ENT_BIT (1<<7)
|
||||
#define CONFIG_FEATURE_BSS_MAX_IDLE_BIT (1<<8)
|
||||
#define CONFIG_FEATURE_WIFI_PASSIVE_HIDDEN_AP_BIT (1<<9)
|
||||
#define CONFIG_FEATURE_OWE_SOFTAP_BIT (1<<10)
|
||||
|
||||
/* Set additional WiFi features and capabilities */
|
||||
#define WIFI_FEATURE_CAPS (WIFI_ENABLE_WPA3_SAE | \
|
||||
@@ -311,7 +318,8 @@ extern wifi_osi_funcs_t g_wifi_osi_funcs;
|
||||
WIFI_ENABLE_11R | \
|
||||
WIFI_ENABLE_ENTERPRISE | \
|
||||
WIFI_ENABLE_BSS_MAX_IDLE | \
|
||||
WIFI_ENABLE_PASSIVE_HIDDEN_AP)
|
||||
WIFI_ENABLE_PASSIVE_HIDDEN_AP | \
|
||||
WIFI_ENABLE_OWE_SOFTAP)
|
||||
|
||||
#define WIFI_INIT_CONFIG_DEFAULT() { \
|
||||
.osi_funcs = &g_wifi_osi_funcs, \
|
||||
|
||||
Reference in New Issue
Block a user