espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-10-03 18:40:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(esp_wifi): Resolve comments for wpa3 compatible mode

Browse Source
This commit is contained in:
Shreyas Sheth
2025-04-17 18:24:26 +05:30
committed by Kapil Gupta
parent fbfa3aa0e0
commit 1b33c9daae
6 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/include/esp_wifi_types_generic.h
View File

@@ -535,7 +535,7 @@ typedef struct {
wifi_sae_pwe_method_t sae_pwe_h2e; /**< Configuration for SAE PWE derivation method */ wifi_sae_pwe_method_t sae_pwe_h2e; /**< Configuration for SAE PWE derivation method */
uint8_t transition_disable: 1; /**< Whether to enable transition disable feature */ uint8_t transition_disable: 1; /**< Whether to enable transition disable feature */
uint8_t sae_ext: 1; /**< Enable SAE EXT feature. SOC_GCMP_SUPPORT is required for this feature. */ uint8_t sae_ext: 1; /**< Enable SAE EXT feature. SOC_GCMP_SUPPORT is required for this feature. */
uint8_t wpa3_compatible_mode: 1; /**< Whether to enable wpa3 compatible authmode feature */ uint8_t wpa3_compatible_mode: 1; /**< Enable WPA3 compatible authmode feature. Note: Enabling this will override the AP configuration's authmode and pairwise_cipher. The AP will operate as a WPA2 access point for legacy stations and as a WPA3 access point for WPA3 compatible stations. */
uint8_t reserved: 5; /**< Reserved for future feature set */ uint8_t reserved: 5; /**< Reserved for future feature set */
wifi_bss_max_idle_config_t bss_max_idle_cfg; /**< Configuration for bss max idle, effective if CONFIG_WIFI_BSS_MAX_IDLE_SUPPORT is enabled */ wifi_bss_max_idle_config_t bss_max_idle_cfg; /**< Configuration for bss max idle, effective if CONFIG_WIFI_BSS_MAX_IDLE_SUPPORT is enabled */
uint16_t gtk_rekey_interval; /**< GTK rekeying interval in seconds. If set to 0, GTK rekeying is disabled. Range: 60 ~ 65535 including 0. */ uint16_t gtk_rekey_interval; /**< GTK rekeying interval in seconds. If set to 0, GTK rekeying is disabled. Range: 60 ~ 65535 including 0. */

2
components/wpa_supplicant/src/ap/ap_config.h
View File

@@ -310,7 +310,7 @@ struct hostapd_bss_config {
int *sae_groups; int *sae_groups;
#define SAE_ANTI_CLOGGING_THRESHOLD 2 /* max number of commit msg allowed to queue without anti-clogging token request */ #define SAE_ANTI_CLOGGING_THRESHOLD 2 /* max number of commit msg allowed to queue without anti-clogging token request */
int rsn_override_omit_rsnxe; int rsn_override_omit_rsnxe;
}; };

6
components/wpa_supplicant/src/ap/wpa_auth_ie.c
View File

@@ -457,7 +457,7 @@ static int wpa_write_rsnxe_override(struct wpa_auth_config *conf, u8 *buf,
int wpa_auth_gen_wpa_ie(struct wpa_authenticator *wpa_auth) int wpa_auth_gen_wpa_ie(struct wpa_authenticator *wpa_auth)
{ {
u8 *pos, buf[256]; u8 *pos, buf[128];
int res; int res;
pos = buf; pos = buf;
@@ -475,8 +475,6 @@ int wpa_auth_gen_wpa_ie(struct wpa_authenticator *wpa_auth)
res = wpa_write_rsnxe(&wpa_auth->conf, pos, res = wpa_write_rsnxe(&wpa_auth->conf, pos,
buf + sizeof(buf) - pos); buf + sizeof(buf) - pos);
res = wpa_write_rsnxe(&wpa_auth->conf, pos,
buf + sizeof(buf) - pos);
if (res < 0) if (res < 0)
return res; return res;
pos += res; pos += res;
@@ -507,7 +505,7 @@ int wpa_auth_gen_wpa_ie(struct wpa_authenticator *wpa_auth)
pos += res; pos += res;
} }
if ((wpa_auth->conf.wpa & WPA_PROTO_RSN) && if ((wpa_auth->conf.wpa & WPA_PROTO_RSN) &&
(wpa_auth->conf.rsn_override_key_mgmt)) { (wpa_auth->conf.rsn_override_key_mgmt)) {
res = wpa_write_rsnxe_override(&wpa_auth->conf, pos, res = wpa_write_rsnxe_override(&wpa_auth->conf, pos,
buf + sizeof(buf) - pos); buf + sizeof(buf) - pos);

2
components/wpa_supplicant/src/common/wpa_common.c
View File

@@ -1700,7 +1700,7 @@ int wpa_parse_kde_ies(const u8 *buf, size_t len, struct wpa_eapol_ie_parse *ie)
const u8 *pos, *end; const u8 *pos, *end;
int ret = 0; int ret = 0;
memset(ie, 0, sizeof(*ie)); os_memset(ie, 0, sizeof(*ie));
for (pos = buf, end = pos + len; pos + 1 < end; pos += 2 + pos[1]) { for (pos = buf, end = pos + len; pos + 1 < end; pos += 2 + pos[1]) {
if (pos[0] == 0xdd && if (pos[0] == 0xdd &&
((pos == buf + len - 1) || pos[1] == 0)) { ((pos == buf + len - 1) || pos[1] == 0)) {

16
components/wpa_supplicant/src/rsn_supp/wpa.c
View File

@@ -2282,14 +2282,14 @@ int wpa_sm_set_param(struct wpa_sm *sm, enum wpa_sm_conf_params param,
return -1; return -1;
switch (param) { switch (param) {
case WPA_PARAM_RSN_OVERRIDE: case WPA_PARAM_RSN_OVERRIDE:
sm->rsn_override = value; sm->rsn_override = value;
break; break;
case WPA_PARAM_RSN_OVERRIDE_SUPPORT: case WPA_PARAM_RSN_OVERRIDE_SUPPORT:
sm->rsn_override_support = value; sm->rsn_override_support = value;
break; break;
default: default:
break; break;
} }
return ret; return ret;
} }

2
examples/wifi/getting_started/softAP/main/softap_example_main.c
View File

@@ -78,7 +78,7 @@ void wifi_init_softap(void)
#else /* CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT */ #else /* CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT */
.authmode = WIFI_AUTH_WPA2_PSK, .authmode = WIFI_AUTH_WPA2_PSK,
#endif #endif
.wpa3_compatible_mode = 1, .wpa3_compatible_mode = 0,
.pmf_cfg = { .pmf_cfg = {
.required = true, .required = true,
}, },