FT: Re-set PTK on reassociation

It turns out that this is needed for both FT-over-DS and FT-over-air
when using mac80211, so it looks easiest to just unconditionally
re-configure the keys after reassociation when FT is used.
This commit is contained in:
Jouni Malinen 2010-04-04 09:34:14 +03:00
parent 2220821113
commit 81a658d754
3 changed files with 4 additions and 7 deletions

View File

@ -1208,11 +1208,10 @@ int wpa_auth_sm_event(struct wpa_state_machine *sm, wpa_event event)
break; break;
case WPA_ASSOC_FT: case WPA_ASSOC_FT:
#ifdef CONFIG_IEEE80211R #ifdef CONFIG_IEEE80211R
if (!sm->pairwise_set || sm->ft_over_ds) { wpa_printf(MSG_DEBUG, "FT: Retry PTK configuration "
wpa_printf(MSG_DEBUG, "FT: Retry PTK configuration " "after association");
"after association"); wpa_ft_install_ptk(sm);
wpa_ft_install_ptk(sm);
}
/* Using FT protocol, not WPA auth state machine */ /* Using FT protocol, not WPA auth state machine */
sm->ft_completed = 1; sm->ft_completed = 1;
return 0; return 0;

View File

@ -1227,7 +1227,6 @@ static int wpa_ft_rrb_rx_request(struct wpa_authenticator *wpa_auth,
"RRB Request"); "RRB Request");
return -1; return -1;
} }
sm->ft_over_ds = 1;
wpa_hexdump(MSG_MSGDUMP, "FT: RRB Request Frame body", body, len); wpa_hexdump(MSG_MSGDUMP, "FT: RRB Request Frame body", body, len);

View File

@ -116,7 +116,6 @@ struct wpa_state_machine {
* Request */ * Request */
u8 r0kh_id[FT_R0KH_ID_MAX_LEN]; /* R0KH-ID from FT Auth Request */ u8 r0kh_id[FT_R0KH_ID_MAX_LEN]; /* R0KH-ID from FT Auth Request */
size_t r0kh_id_len; size_t r0kh_id_len;
int ft_over_ds;
#endif /* CONFIG_IEEE80211R */ #endif /* CONFIG_IEEE80211R */
}; };