aboutsummaryrefslogtreecommitdiffstats
path: root/wlantest
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2015-09-02 20:33:29 (GMT)
committerJouni Malinen <j@w1.fi>2016-10-10 18:11:46 (GMT)
commit555ff857dd6856281f0a55b89efc71d13d9d3033 (patch)
tree5dae227a15a4928fccf6a6a4782de6b4d17182ba /wlantest
parent6d014ffc6e654e7e802263c55ce568df153a1e1c (diff)
downloadhostap-555ff857dd6856281f0a55b89efc71d13d9d3033.zip
hostap-555ff857dd6856281f0a55b89efc71d13d9d3033.tar.gz
hostap-555ff857dd6856281f0a55b89efc71d13d9d3033.tar.bz2
wlantest: Recognize EAPOL-Key frames without MIC bit for FILS
The new AEAD AKM option in FILS sets the MIC bit in EAPOL-Key frames to 0 for some ciphers, so the determination of EAPOL-Key frame types needs changes to work with these cases. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wlantest')
-rw-r--r--wlantest/rx_eapol.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/wlantest/rx_eapol.c b/wlantest/rx_eapol.c
index 89effc6..e04e5aa 100644
--- a/wlantest/rx_eapol.c
+++ b/wlantest/rx_eapol.c
@@ -1122,9 +1122,12 @@ static void rx_data_eapol_key(struct wlantest *wt, const u8 *bssid,
break;
case WPA_KEY_INFO_SECURE | WPA_KEY_INFO_MIC |
WPA_KEY_INFO_ACK | WPA_KEY_INFO_INSTALL:
+ case WPA_KEY_INFO_SECURE |
+ WPA_KEY_INFO_ACK | WPA_KEY_INFO_INSTALL:
rx_data_eapol_key_3_of_4(wt, dst, src, data, len);
break;
case WPA_KEY_INFO_SECURE | WPA_KEY_INFO_MIC:
+ case WPA_KEY_INFO_SECURE:
if (key_data_length == 0)
rx_data_eapol_key_4_of_4(wt, dst, src, data,
len);
@@ -1143,9 +1146,11 @@ static void rx_data_eapol_key(struct wlantest *wt, const u8 *bssid,
WPA_KEY_INFO_ACK)) {
case WPA_KEY_INFO_SECURE | WPA_KEY_INFO_MIC |
WPA_KEY_INFO_ACK:
+ case WPA_KEY_INFO_SECURE | WPA_KEY_INFO_ACK:
rx_data_eapol_key_1_of_2(wt, dst, src, data, len);
break;
case WPA_KEY_INFO_SECURE | WPA_KEY_INFO_MIC:
+ case WPA_KEY_INFO_SECURE:
rx_data_eapol_key_2_of_2(wt, dst, src, data, len);
break;
default: