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

FILS: Fix BSSID in reassociation case

Browse source 
The RSN supplicant implementation needs to be updated to use the new
BSSID whenever doing FILS authentication. Previously, this was only done
when notifying association and that was too late for the case of
reassociation. Fix this by providing the new BSSID when calling
fils_process_auth(). This makes PTK derivation use the correct BSSID.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2017-02-21 12:25:02 +02:00 committed by Jouni Malinen
parent 7eace3787c
commit ba9774bd76
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/rsn_supp/wpa.c
View file

@ -3328,7 +3328,8 @@ fail:
} }
int fils_process_auth(struct wpa_sm *sm, const u8 *data, size_t len) int fils_process_auth(struct wpa_sm *sm, const u8 *bssid, const u8 *data,
size_t len)
{ {
const u8 *pos, *end; const u8 *pos, *end;
struct ieee802_11_elems elems; struct ieee802_11_elems elems;
@ -3338,6 +3339,8 @@ int fils_process_auth(struct wpa_sm *sm, const u8 *data, size_t len)
size_t ick_len; size_t ick_len;
int res; int res;
os_memcpy(sm->bssid, bssid, ETH_ALEN);
wpa_hexdump(MSG_DEBUG, "FILS: Authentication frame fields", wpa_hexdump(MSG_DEBUG, "FILS: Authentication frame fields",
data, len); data, len);
pos = data; pos = data;

3
src/rsn_supp/wpa.h
View file

@ -435,7 +435,8 @@ int wpa_wnmsleep_install_key(struct wpa_sm *sm, u8 subelem_id, u8 *buf);
void wpa_sm_set_test_assoc_ie(struct wpa_sm *sm, struct wpabuf *buf); void wpa_sm_set_test_assoc_ie(struct wpa_sm *sm, struct wpabuf *buf);
struct wpabuf * fils_build_auth(struct wpa_sm *sm); struct wpabuf * fils_build_auth(struct wpa_sm *sm);
int fils_process_auth(struct wpa_sm *sm, const u8 *data, size_t len); int fils_process_auth(struct wpa_sm *sm, const u8 *bssid, const u8 *data,
size_t len);
struct wpabuf * fils_build_assoc_req(struct wpa_sm *sm, const u8 **kek, struct wpabuf * fils_build_assoc_req(struct wpa_sm *sm, const u8 **kek,
size_t *kek_len, const u8 **snonce, size_t *kek_len, const u8 **snonce,
const u8 **anonce, const u8 **anonce,

4
wpa_supplicant/sme.c
View file

@ -960,8 +960,8 @@ void sme_event_auth(struct wpa_supplicant *wpa_s, union wpa_event_data *data)
#ifdef CONFIG_FILS #ifdef CONFIG_FILS
if (data->auth.auth_type == WLAN_AUTH_FILS_SK) { if (data->auth.auth_type == WLAN_AUTH_FILS_SK) {
if (fils_process_auth(wpa_s->wpa, data->auth.ies, if (fils_process_auth(wpa_s->wpa, wpa_s->pending_bssid,
data->auth.ies_len) < 0) { data->auth.ies, data->auth.ies_len) < 0) {
wpa_dbg(wpa_s, MSG_DEBUG, wpa_dbg(wpa_s, MSG_DEBUG,
"SME: FILS Authentication response processing failed"); "SME: FILS Authentication response processing failed");
wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "bssid=" wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_DISCONNECTED "bssid="