DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

FILS: Track completion with FILS shared key authentication offload

Browse source 
Update the internal fils_completed state when offloading FILS shared key
authentication to the driver.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Vidyullatha Kanchanapally 2017-03-22 16:10:05 +05:30 committed by Jouni Malinen
parent 8b0a6dba87
commit 5538fc9309
5 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/rsn_supp/wpa.c
View file

@ -3909,6 +3909,13 @@ fail:
return -1; return -1;
} }
void wpa_sm_set_reset_fils_completed(struct wpa_sm *sm, int set)
{
if (sm)
sm->fils_completed = !!set;
}
#endif /* CONFIG_FILS */ #endif /* CONFIG_FILS */

2
src/rsn_supp/wpa.h
View file

@ -451,4 +451,6 @@ struct wpabuf * owe_build_assoc_req(struct wpa_sm *sm);
int owe_process_assoc_resp(struct wpa_sm *sm, const u8 *resp_ies, int owe_process_assoc_resp(struct wpa_sm *sm, const u8 *resp_ies,
size_t resp_ies_len); size_t resp_ies_len);
void wpa_sm_set_reset_fils_completed(struct wpa_sm *sm, int set);
#endif /* WPA_H */ #endif /* WPA_H */

9
wpa_supplicant/events.c
View file

@ -2223,6 +2223,11 @@ static int wpa_supplicant_event_associnfo(struct wpa_supplicant *wpa_s,
return -1; return -1;
} }
#endif /* CONFIG_SME */ #endif /* CONFIG_SME */
/* Additional processing for FILS when SME is in driver */
if (wpa_s->auth_alg == WPA_AUTH_ALG_FILS &&
!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME))
wpa_sm_set_reset_fils_completed(wpa_s->wpa, 1);
#endif /* CONFIG_FILS */ #endif /* CONFIG_FILS */
#ifdef CONFIG_OWE #ifdef CONFIG_OWE
@ -3681,7 +3686,9 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event,
} }
#endif /* CONFIG_TESTING_OPTIONS */ #endif /* CONFIG_TESTING_OPTIONS */
wpa_supplicant_event_assoc(wpa_s, data); wpa_supplicant_event_assoc(wpa_s, data);
if (data && data->assoc_info.authorized) if ((data && data->assoc_info.authorized) ||
(!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_SME) &&
wpa_fils_is_completed(wpa_s->wpa)))
wpa_supplicant_event_assoc_auth(wpa_s, data); wpa_supplicant_event_assoc_auth(wpa_s, data);
if (data) { if (data) {
wpa_msg(wpa_s, MSG_INFO, wpa_msg(wpa_s, MSG_INFO,

4
wpa_supplicant/wpa_supplicant.c
View file

@ -2288,6 +2288,9 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
} }
#ifdef CONFIG_FILS #ifdef CONFIG_FILS
/* Clear FILS association */
wpa_sm_set_reset_fils_completed(wpa_s->wpa, 0);
if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_FILS_SK_OFFLOAD) && if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_FILS_SK_OFFLOAD) &&
ssid->eap.erp && wpa_key_mgmt_fils(ssid->key_mgmt) && ssid->eap.erp && wpa_key_mgmt_fils(ssid->key_mgmt) &&
eapol_sm_get_erp_info(wpa_s->eapol, &ssid->eap, &username, eapol_sm_get_erp_info(wpa_s->eapol, &ssid->eap, &username,
@ -2593,6 +2596,7 @@ static void wpas_start_assoc_cb(struct wpa_radio_work *work, int deinit)
params.key_mgmt_suite = wpa_s->key_mgmt; params.key_mgmt_suite = wpa_s->key_mgmt;
params.wpa_proto = wpa_s->wpa_proto; params.wpa_proto = wpa_s->wpa_proto;
params.auth_alg = algs; params.auth_alg = algs;
wpa_s->auth_alg = params.auth_alg;
params.mode = ssid->mode; params.mode = ssid->mode;
params.bg_scan_period = ssid->bg_scan_period; params.bg_scan_period = ssid->bg_scan_period;
for (i = 0; i < NUM_WEP_KEYS; i++) { for (i = 0; i < NUM_WEP_KEYS; i++) {

1
wpa_supplicant/wpa_supplicant_i.h
View file

@ -748,6 +748,7 @@ struct wpa_supplicant {
int sta_uapsd; int sta_uapsd;
int set_ap_uapsd; int set_ap_uapsd;
int ap_uapsd; int ap_uapsd;
int auth_alg;
#ifdef CONFIG_SME #ifdef CONFIG_SME
struct { struct {