espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-08 07:04:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/skip_sae_during_wps' into 'master'

Browse Source 
esp_wifi: Add changes to skip SAE handshake during WPS connection

Closes ESPCS-875

See merge request espressif/esp-idf!21369
This commit is contained in:
Jiang Jiang Jian
2022-12-05 22:26:45 +08:00
parent 84ab32b4ef 4967e90571
commit 6419436684
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -1849,7 +1849,7 @@ int wifi_wps_enable_internal(const esp_wps_config_t *config)
ret = wifi_station_wps_init(config); ret = wifi_station_wps_init(config);
if (ret != 0) { if (ret != 0) {
wps_set_type(WPS_STATUS_DISABLE); wps_set_type(WPS_TYPE_DISABLE);
wps_set_status(WPS_STATUS_DISABLE); wps_set_status(WPS_STATUS_DISABLE);
return ESP_FAIL; return ESP_FAIL;
} }