From 2449791b8e811a046e106842840046109afc79c6 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Thu, 3 Sep 2015 20:45:02 +0300 Subject: [PATCH] FILS: Update EAPOL-Key Descriptor Version RX rules (AP) Signed-off-by: Jouni Malinen --- src/ap/wpa_auth.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c index d702e231e..4fed5ba05 100644 --- a/src/ap/wpa_auth.c +++ b/src/ap/wpa_auth.c @@ -1008,6 +1008,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth, } if (!wpa_use_aes_cmac(sm) && + !wpa_key_mgmt_fils(sm->wpa_key_mgmt) && ver != WPA_KEY_INFO_TYPE_HMAC_SHA1_AES) { wpa_auth_logger(wpa_auth, sm->addr, LOGGER_WARNING, @@ -1017,7 +1018,8 @@ void wpa_receive(struct wpa_authenticator *wpa_auth, } } - if (wpa_key_mgmt_suite_b(sm->wpa_key_mgmt) && + if ((wpa_key_mgmt_suite_b(sm->wpa_key_mgmt) || + wpa_key_mgmt_fils(sm->wpa_key_mgmt)) && ver != WPA_KEY_INFO_TYPE_AKM_DEFINED) { wpa_auth_logger(wpa_auth, sm->addr, LOGGER_WARNING, "did not use EAPOL-Key descriptor version 0 as required for AKM-defined cases");