blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 09:39:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/install_key_issue_v5.1' into 'release/v5.1'

Browse Source 
WiFI: Fix key install issue in PTK renew (v5.1)

See merge request espressif/esp-idf!26851
This commit is contained in:
Jiang Jiang Jian 2023-11-02 14:18:42 +08:00
commit 8df1e1ae66
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 557c6fa326dc423118576a5f9d4b34ba60e0d991 Subproject commit 4019e5e8ceafa862175b16b1e414c299502afc3f

10
components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
View File

@ -321,12 +321,15 @@ static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len,u8
sta_info = ap_sta_add(hapd, bssid); sta_info = ap_sta_add(hapd, bssid);
if (!sta_info) { if (!sta_info) {
wpa_printf(MSG_ERROR, "failed to add station " MACSTR, MAC2STR(bssid)); wpa_printf(MSG_ERROR, "failed to add station " MACSTR, MAC2STR(bssid));
return false; goto fail;
} }
#ifdef CONFIG_SAE #ifdef CONFIG_SAE
if (sta_info->lock && os_semphr_take(sta_info->lock, 0) != TRUE) { if (sta_info->lock && os_semphr_take(sta_info->lock, 0) != TRUE) {
wpa_printf(MSG_INFO, "Ignore assoc request as softap is busy with sae calculation for station "MACSTR, MAC2STR(bssid)); wpa_printf(MSG_INFO, "Ignore assoc request as softap is busy with sae calculation for station "MACSTR, MAC2STR(bssid));
if (esp_send_assoc_resp(hapd, sta_info, bssid, WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY, rsnxe ? false : true, subtype) != WLAN_STATUS_SUCCESS) {
goto fail;
}
return false; return false;
} }
#endif /* CONFIG_SAE */ #endif /* CONFIG_SAE */
@ -357,10 +360,7 @@ static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len,u8
} }
fail: fail:
if (sta_info) { esp_wifi_ap_deauth_internal(bssid, WLAN_REASON_PREV_AUTH_NOT_VALID);
ap_free_sta(hapd, sta_info);
}
return false; return false;
} }
#endif #endif