Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-10-05 19:08:52 +02:00
Code Releases Activity

eapol: Further relax gtk 1/2 msg key length check

Browse Source 
Accept any of 0, 16, 32 with WPA or WPA2, update comment.
This commit is contained in:
Andrew Zaborowski 2017-03-14 16:11:32 +01:00 committed by Denis Kenzior
parent 3b8f9ba176
commit 1392a80d34
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/eapol.c
View File

@ -547,12 +547,14 @@ bool eapol_verify_gtk_1_of_2(const struct eapol_key *ek, bool is_wpa)
return false;
/*
* Key Length should be 16 for WPA (P802.11i/D3.0) but since
* 802.11i-2004 there's inconsistency in the field's value and
* both 16 and 0 are in use.
* In P802.11i/D3.0 the Key Length should be 16 for WPA but hostapd
* uses 16 for CCMP and 32 for TKIP. Since 802.11i-2004 there's
* inconsistency in the required value, for example 0 is clearly
* specified in 802.11-2012 11.6.7.2 but 11.6.2 doesn't list 0 and
* makes the value depend on the pairwise key type.
*/
key_len = L_BE16_TO_CPU(ek->key_length);
if (is_wpa && key_len != 16)
if (key_len != 0 && key_len != 16 && key_len != 32)
return false;
VERIFY_IS_ZERO(ek->reserved);