Merge branch 'bugfix/fix_wps_with_sae_enabled_ap' into 'master'

esp_wifi: Fix WPS issue for WPA3+WPA2 mode

Closes WIFI-6038

See merge request espressif/esp-idf!24049
This commit is contained in:
Jiang Jiang Jian 2023-06-09 18:48:21 +08:00
commit 213504238f
2 changed files with 2 additions and 0 deletions

View File

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

View File

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