Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-25 00:38:24 -05:00
Code Issues Projects Releases Wiki Activity

FILS: Update connect params after sending connection notification

Browse Source 
Update connect params will update auth_alg and fils_hlp_req in
wpa_supplicant structure before calling function
wpas_notify_state_changed(). This could have resulted in triggering
inconsistent state change events and messages in the Android framework.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Ankita Bajaj 2019-09-05 19:47:55 +05:30 committed by Jouni Malinen
parent 0df82a3daf
commit a8bfc6fff2
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wpa_supplicant/wpa_supplicant.c
View File

@ -840,6 +840,9 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
enum wpa_states state) enum wpa_states state)
{ {
enum wpa_states old_state = wpa_s->wpa_state; enum wpa_states old_state = wpa_s->wpa_state;
#if defined(CONFIG_FILS) && defined(IEEE8021X_EAPOL)
Boolean update_fils_connect_params = FALSE;
#endif /* CONFIG_FILS && IEEE8021X_EAPOL */
wpa_dbg(wpa_s, MSG_DEBUG, "State: %s -> %s", wpa_dbg(wpa_s, MSG_DEBUG, "State: %s -> %s",
wpa_supplicant_state_txt(wpa_s->wpa_state), wpa_supplicant_state_txt(wpa_s->wpa_state),
@ -937,7 +940,7 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
#if defined(CONFIG_FILS) && defined(IEEE8021X_EAPOL) #if defined(CONFIG_FILS) && defined(IEEE8021X_EAPOL)
if (!fils_hlp_sent && ssid && ssid->eap.erp) if (!fils_hlp_sent && ssid && ssid->eap.erp)
wpas_update_fils_connect_params(wpa_s); update_fils_connect_params = TRUE;
#endif /* CONFIG_FILS && IEEE8021X_EAPOL */ #endif /* CONFIG_FILS && IEEE8021X_EAPOL */
#ifdef CONFIG_OWE #ifdef CONFIG_OWE
if (ssid && (ssid->key_mgmt & WPA_KEY_MGMT_OWE)) if (ssid && (ssid->key_mgmt & WPA_KEY_MGMT_OWE))
@ -983,6 +986,10 @@ void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
old_state == WPA_COMPLETED) old_state == WPA_COMPLETED)
wpas_notify_auth_changed(wpa_s); wpas_notify_auth_changed(wpa_s);
} }
#if defined(CONFIG_FILS) && defined(IEEE8021X_EAPOL)
if (update_fils_connect_params)
wpas_update_fils_connect_params(wpa_s);
#endif /* CONFIG_FILS && IEEE8021X_EAPOL */
} }