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

Fix group key rekeying when reauth happens during pending group key update

Browse source 
We need to cancel the group key update for a STA if a reauthentication
request is received while the STA is in pending group key update. When
canceling the update, we will also need to make sure that the PTK Group Key
state machine ends up in the correct state (IDLE) to allow future updates
in case of WPA2.
This commit is contained in:
Jouni Malinen 2008-10-21 13:54:54 +03:00 committed by Jouni Malinen
parent 244e07c54d
commit 9663596fac
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
hostapd/wpa.c
View file

@ -1109,6 +1109,15 @@ void wpa_auth_sm_event(struct wpa_state_machine *sm, wpa_event event)
break;
case WPA_REAUTH:
case WPA_REAUTH_EAPOL:
if (sm->GUpdateStationKeys) {
/*
* Reauthentication cancels the pending group key
* update for this STA.
*/
sm->group->GKeyDoneStations--;
sm->GUpdateStationKeys = FALSE;
sm->PtkGroupInit = TRUE;
}
sm->ReAuthenticationRequest = TRUE;
break;
case WPA_ASSOC_FT:
@ -1760,9 +1769,10 @@ SM_STATE(WPA_PTK_GROUP, KEYERROR)
SM_STEP(WPA_PTK_GROUP)
{
if (sm->Init)
if (sm->Init || sm->PtkGroupInit) {
SM_ENTER(WPA_PTK_GROUP, IDLE);
else switch (sm->wpa_ptk_group_state) {
sm->PtkGroupInit = FALSE;
} else switch (sm->wpa_ptk_group_state) {
case WPA_PTK_GROUP_IDLE:
if (sm->GUpdateStationKeys ||
(sm->wpa == WPA_VERSION_WPA && sm->PInitAKeys))
@ -1844,8 +1854,18 @@ static int wpa_group_update_sta(struct wpa_state_machine *sm, void *ctx)
"Not in PTKINITDONE; skip Group Key update");
return 0;
}
sm->group->GKeyDoneStations++;
sm->GUpdateStationKeys = TRUE;
if (sm->GUpdateStationKeys) {
/*
* This should not really happen, but just in case, make sure
* we do not count the same STA twice in GKeyDoneStations.
*/
wpa_auth_logger(sm->wpa_auth, sm->addr, LOGGER_DEBUG,
"GUpdateStationKeys already set - do not "
"increment GKeyDoneStations");
} else {
sm->group->GKeyDoneStations++;
sm->GUpdateStationKeys = TRUE;
}
wpa_sm_step(sm);
return 0;
}

1
hostapd/wpa_auth_i.h
View file

@ -71,6 +71,7 @@ struct wpa_state_machine {
Boolean PInitAKeys; /* WPA only, not in IEEE 802.11i */
Boolean PTKRequest; /* not in IEEE 802.11i state machine */
Boolean has_GTK;
Boolean PtkGroupInit; /* init request for PTK Group state machine */
u8 *last_rx_eapol_key; /* starting from IEEE 802.1X header */
size_t last_rx_eapol_key_len;