eapol: do not parse RSN for WPA1 in 1 of 4
PATCH 1/1 eapol: do not parse RSN for WPA1 in 1 of 4
A recent change checked the return value of ie_parse_rsne_from_data inside the ptk 1/4 handler. This seemed safe, but actually caused the eapol unit test to fail.
The reason was because eapol was parsing the IEs assuming they were an RSN, when they could be a WPA IE (WPA1 not WPA2). The WPA case does not end up using the rsn_info at all, so having rsn_info uninitialized did not pose a problem. After adding the return value check it was found this fails every time for WPA1.
Since the rsn_info is not needed for WPA1 we can only do the RSN parse for WPA2 and leave rsn_info uninitialized.
--- src/eapol.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
src/eapol.c +5 -2
@@ -1106,8 +1106,11 @@ static void eapol_handle_ptk_1_of_4(struct eapol_sm *sm, pmkid =handshake_util_find_pmkid_kde (EAPOL_KEY_DATA (ek, sm->mic_len),EAPOL_KEY_DATA_LEN (ek, sm->mic_len)); -if (ie_parse_rsne_from_data (own_ie, own_ie[1 ] +2 , &rsn_info) <0 ) - goto error_unspecified; +if (!sm->handshake->wpa_ie) { +if (ie_parse_rsne_from_data (own_ie, own_ie[1 ] +2 , + &rsn_info) <0 ) + goto error_unspecified; + }/* * Require the PMKID KDE whenever we've sent a list of PMKIDs in
Signature · 1 line
2.17.1
Denis Kenzior
AppliedHi James,
Quoted 10 lines · James Prestwood
A recent change checked the return value of
ie_parse_rsne_from_datainside the ptk 1/4 handler. This seemed safe, but actually caused the eapol unit test to fail.The reason was because eapol was parsing the IEs assuming they were an RSN, when they could be a WPA IE (WPA1 not WPA2). The WPA case does not end up using the
rsn_infoat all, so havingrsn_infouninitialized did not pose a problem. After adding the return value check it was found this fails every time for WPA1.
Quoted 6 lines
Since the
rsn_infois not needed for WPA1 we can only do the RSN parse for WPA2 and leaversn_infouninitialized.--- src/eapol.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
applied, thanks.
Regards,
-Denis