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

fix(esp_wifi): Prevent flushing of FT data mistakenly

Browse Source
This commit is contained in:
Kapil Gupta 2025-03-04 20:25:18 +05:30
parent 4f127f57e2
commit 1ee5551004
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/wpa_supplicant/esp_supplicant/src/esp_common.c
View File

@ -178,7 +178,7 @@ static int handle_assoc_frame(u8 *frame, size_t len,
return 0; return 0;
} }
static void wpa_sta_clear_ft_auth_ie(void) void wpa_sta_clear_ft_auth_ie(void)
{ {
struct wpa_sm *sm = &gWpaSm; struct wpa_sm *sm = &gWpaSm;
wpa_printf(MSG_DEBUG, "Clearing all FT IE parameters and keys"); wpa_printf(MSG_DEBUG, "Clearing all FT IE parameters and keys");
@ -341,8 +341,7 @@ void supplicant_sta_conn_handler(uint8_t *bssid)
void supplicant_sta_disconn_handler(uint8_t reason_code) void supplicant_sta_disconn_handler(uint8_t reason_code)
{ {
#if defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) #if defined(CONFIG_IEEE80211KV)
struct wpa_sm *sm = &gWpaSm;
struct wpa_supplicant *wpa_s = &g_wpa_supp; struct wpa_supplicant *wpa_s = &g_wpa_supp;
#if defined(CONFIG_RRM) #if defined(CONFIG_RRM)
@ -358,13 +357,7 @@ void supplicant_sta_disconn_handler(uint8_t reason_code)
if (wpa_s->current_bss) { if (wpa_s->current_bss) {
wpa_s->current_bss = NULL; wpa_s->current_bss = NULL;
} }
#if defined(CONFIG_IEEE80211R) #endif /* defined(CONFIG_IEEE80211KV) */
if (!sm->cur_pmksa) {
/* clear all ft auth related IEs so that next will be open auth */
wpa_sta_clear_ft_auth_ie();
}
#endif
#endif /* defined(CONFIG_IEEE80211KV) || defined(CONFIG_IEEE80211R) */
} }
#if defined(CONFIG_RRM) #if defined(CONFIG_RRM)

1
components/wpa_supplicant/esp_supplicant/src/esp_common_i.h
View File

@ -34,3 +34,4 @@ void esp_set_assoc_ie(uint8_t *bssid, const u8 *ies, size_t ies_len, bool add_md
void supplicant_sta_conn_handler(uint8_t* bssid); void supplicant_sta_conn_handler(uint8_t* bssid);
void supplicant_sta_disconn_handler(uint8_t reason_code); void supplicant_sta_disconn_handler(uint8_t reason_code);
#endif #endif
void wpa_sta_clear_ft_auth_ie(void);

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

@ -297,6 +297,10 @@ static void wpa_sta_disconnected_cb(uint8_t reason_code)
case WIFI_REASON_INVALID_FTE: case WIFI_REASON_INVALID_FTE:
wpa_sta_clear_curr_pmksa(); wpa_sta_clear_curr_pmksa();
wpa_sm_notify_disassoc(&gWpaSm); wpa_sm_notify_disassoc(&gWpaSm);
#if defined(CONFIG_IEEE80211R)
/* clear all ft auth related IEs so that next will be open auth */
wpa_sta_clear_ft_auth_ie();
#endif
break; break;
default: default:
if (g_wpa_pmk_caching_disabled) { if (g_wpa_pmk_caching_disabled) {