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

Merge branch 'bugfix/fix_wps_with_sae_enabled_ap_v5.0' into 'release/v5.0'

Browse Source 
esp_wifi: Fix WPS issue for WPA3+WPA2 mode(v5.0)

See merge request espressif/esp-idf!24154
This commit is contained in:
Jiang Jiang Jian
2023-06-12 11:20:51 +08:00
parent 838850abab a66d93a75f
commit e6ad0a4fa2
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
components/wpa_supplicant/esp_supplicant/src/esp_wpa3.c
View File

@ -151,6 +151,7 @@ static u8 *wpa3_build_sae_msg(u8 *bssid, u32 sae_msg_type, size_t *sae_msg_len)
case SAE_MSG_COMMIT: case SAE_MSG_COMMIT:
/* Do not go for SAE when WPS is ongoing */ /* Do not go for SAE when WPS is ongoing */
if (esp_wifi_get_wps_status_internal() != WPS_STATUS_DISABLE) { if (esp_wifi_get_wps_status_internal() != WPS_STATUS_DISABLE) {
*sae_msg_len = 0;
return NULL; return NULL;
} }
if (ESP_OK != wpa3_build_sae_commit(bssid, sae_msg_len)) if (ESP_OK != wpa3_build_sae_commit(bssid, sae_msg_len))

1
components/wpa_supplicant/esp_supplicant/src/esp_wps.c
View File

@ -810,6 +810,7 @@ int wps_finish(void)
os_memcpy(config->sta.password, sm->key[0], sm->key_len[0]); os_memcpy(config->sta.password, sm->key[0], sm->key_len[0]);
os_memcpy(config->sta.bssid, sm->bssid, ETH_ALEN); os_memcpy(config->sta.bssid, sm->bssid, ETH_ALEN);
config->sta.bssid_set = 0; config->sta.bssid_set = 0;
config->sta.sae_pwe_h2e = 0;
esp_wifi_set_config(WIFI_IF_STA, config); esp_wifi_set_config(WIFI_IF_STA, config);
os_free(config); os_free(config);