Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-12-22 21:22:37 +01:00
Code Releases Activity

eapol: After EAP skip the RSNE PMKID check in step 1/4

Browse Source 
Skip the matching of the PMKID KDE to the PMKID list in the RSNE if
we've seen a new EAP authentication before the step 1/4 was received.
That would mean that the server had not accepted the PMKIDs we submitted
and we performed a new 8021X authentication, producing a new PMKSA which
won't be on the list in the RSNE.
This commit is contained in:
Andrew Zaborowski 2017-05-03 19:53:50 +02:00 committed by Denis Kenzior
parent 681f9355ad
commit faba9d509a
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/eapol.c
View File

@ -731,6 +731,7 @@ struct eapol_sm {
bool have_replay:1; bool have_replay:1;
bool started:1; bool started:1;
bool use_eapol_start:1; bool use_eapol_start:1;
bool eap_exchanged:1;
struct eap_state *eap; struct eap_state *eap;
struct eapol_buffer *early_frame; struct eapol_buffer *early_frame;
}; };
@ -852,11 +853,13 @@ static void eapol_handle_ptk_1_of_4(struct eapol_sm *sm,
/* /*
* Require the PMKID KDE whenever we've sent a list of PMKIDs in * Require the PMKID KDE whenever we've sent a list of PMKIDs in
* our RSNE, otherwise treat it as optional and only validate it * our RSNE and we've haven't seen any EAPOL-EAP frame since
* against our PMK. Some 802.11-2012 sections show message 1/4 * (sm->eap_exchanged is false), otherwise treat it as optional and
* without a PMKID KDE and there are APs that send no PMKID KDE. * only validate it against our PMK. Some 802.11-2012 sections
* show message 1/4 without a PMKID KDE and there are APs that
* send no PMKID KDE.
*/ */
if (!sm->handshake->wpa_ie && if (!sm->eap_exchanged && !sm->handshake->wpa_ie &&
ie_parse_rsne_from_data(own_ie, own_ie[1] + 2, ie_parse_rsne_from_data(own_ie, own_ie[1] + 2,
&rsn_info) >= 0 && &rsn_info) >= 0 &&
rsn_info.num_pmkids) { rsn_info.num_pmkids) {
@ -1573,6 +1576,8 @@ static void eapol_rx_packet(struct eapol_sm *sm,
eapol_eap_results_cb); eapol_eap_results_cb);
} }
sm->eap_exchanged = true;
eap_rx_packet(sm->eap, frame + 4, eap_rx_packet(sm->eap, frame + 4,
L_BE16_TO_CPU(eh->packet_len)); L_BE16_TO_CPU(eh->packet_len));