jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

WNM: Fix AP logic on when to include GTK/IGTK in WNM-Sleep Mode exit

Browse source 
Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2012-12-16 19:27:09 +02:00
parent 615a5d559d
commit 4da10640a7
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/ap/wnm_ap.c
View file

@ -104,7 +104,7 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd,
mgmt->u.action.u.wnm_sleep_resp.dialogtoken = dialog_token; mgmt->u.action.u.wnm_sleep_resp.dialogtoken = dialog_token;
pos = (u8 *)mgmt->u.action.u.wnm_sleep_resp.variable; pos = (u8 *)mgmt->u.action.u.wnm_sleep_resp.variable;
/* add key data if MFP is enabled */ /* add key data if MFP is enabled */
if (wpa_auth_uses_mfp(sta->wpa_sm) || if (!wpa_auth_uses_mfp(sta->wpa_sm) ||
action_type != WNM_SLEEP_MODE_EXIT) { action_type != WNM_SLEEP_MODE_EXIT) {
mgmt->u.action.u.wnm_sleep_resp.keydata_len = 0; mgmt->u.action.u.wnm_sleep_resp.keydata_len = 0;
} else { } else {
@ -162,13 +162,14 @@ static int ieee802_11_send_wnmsleep_resp(struct hostapd_data *hapd,
* 2. start GTK/IGTK update if MFP is not used * 2. start GTK/IGTK update if MFP is not used
* 3. unpause the node in driver * 3. unpause the node in driver
*/ */
if (wnmsleep_ie.status == WNM_STATUS_SLEEP_ACCEPT && if ((wnmsleep_ie.status == WNM_STATUS_SLEEP_ACCEPT ||
wnmsleep_ie.status ==
WNM_STATUS_SLEEP_EXIT_ACCEPT_GTK_UPDATE) &&
wnmsleep_ie.action_type == WNM_SLEEP_MODE_EXIT) { wnmsleep_ie.action_type == WNM_SLEEP_MODE_EXIT) {
wpa_set_wnmsleep(sta->wpa_sm, 0); wpa_set_wnmsleep(sta->wpa_sm, 0);
hostapd_drv_wnm_oper(hapd, WNM_SLEEP_EXIT_CONFIRM, hostapd_drv_wnm_oper(hapd, WNM_SLEEP_EXIT_CONFIRM,
addr, NULL, NULL); addr, NULL, NULL);
if (wpa_auth_uses_mfp(sta->wpa_sm) && if (!wpa_auth_uses_mfp(sta->wpa_sm))
action_type == WNM_SLEEP_MODE_EXIT)
wpa_wnmsleep_rekey_gtk(sta->wpa_sm); wpa_wnmsleep_rekey_gtk(sta->wpa_sm);
} }
} else } else