From 555ff857dd6856281f0a55b89efc71d13d9d3033 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 2 Sep 2015 23:33:29 +0300 Subject: [PATCH] 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 --- wlantest/rx_eapol.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/wlantest/rx_eapol.c b/wlantest/rx_eapol.c index 89effc623..e04e5aa00 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: