Remove always true check on EAPOL-Key message in authenticator

This was practically dead code since no other msg value exist anymore.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index e0c9f30c17db9813366edf92b0680a62c62d5914..03fd12ee3f87fda8f9f49c7bee7b75ab12ced6ca 100644 (file)
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -1229,38 +1229,35 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
                msgtxt = "2/4 Pairwise";
        }
 
-       if (msg == REQUEST || msg == PAIRWISE_2 || msg == PAIRWISE_4 ||
-           msg == GROUP_2) {
-               if (sm->pairwise == WPA_CIPHER_CCMP ||
-                   sm->pairwise == WPA_CIPHER_GCMP) {
-                       if (wpa_use_cmac(sm->wpa_key_mgmt) &&
-                           !wpa_use_akm_defined(sm->wpa_key_mgmt) &&
-                           ver != WPA_KEY_INFO_TYPE_AES_128_CMAC) {
-                               wpa_auth_logger(wpa_auth, wpa_auth_get_spa(sm),
-                                               LOGGER_WARNING,
-                                               "advertised support for AES-128-CMAC, but did not use it");
-                               goto out;
-                       }
-
-                       if (!wpa_use_cmac(sm->wpa_key_mgmt) &&
-                           !wpa_use_akm_defined(sm->wpa_key_mgmt) &&
-                           ver != WPA_KEY_INFO_TYPE_HMAC_SHA1_AES) {
-                               wpa_auth_logger(wpa_auth, wpa_auth_get_spa(sm),
-                                               LOGGER_WARNING,
-                                               "did not use HMAC-SHA1-AES with CCMP/GCMP");
-                               goto out;
-                       }
+       if (sm->pairwise == WPA_CIPHER_CCMP ||
+           sm->pairwise == WPA_CIPHER_GCMP) {
+               if (wpa_use_cmac(sm->wpa_key_mgmt) &&
+                   !wpa_use_akm_defined(sm->wpa_key_mgmt) &&
+                   ver != WPA_KEY_INFO_TYPE_AES_128_CMAC) {
+                       wpa_auth_logger(wpa_auth, wpa_auth_get_spa(sm),
+                                       LOGGER_WARNING,
+                                       "advertised support for AES-128-CMAC, but did not use it");
+                       goto out;
                }
 
-               if (wpa_use_akm_defined(sm->wpa_key_mgmt) &&
-                   ver != WPA_KEY_INFO_TYPE_AKM_DEFINED) {
+               if (!wpa_use_cmac(sm->wpa_key_mgmt) &&
+                   !wpa_use_akm_defined(sm->wpa_key_mgmt) &&
+                   ver != WPA_KEY_INFO_TYPE_HMAC_SHA1_AES) {
                        wpa_auth_logger(wpa_auth, wpa_auth_get_spa(sm),
                                        LOGGER_WARNING,
-                                       "did not use EAPOL-Key descriptor version 0 as required for AKM-defined cases");
+                                       "did not use HMAC-SHA1-AES with CCMP/GCMP");
                        goto out;
                }
        }
 
+       if (wpa_use_akm_defined(sm->wpa_key_mgmt) &&
+           ver != WPA_KEY_INFO_TYPE_AKM_DEFINED) {
+               wpa_auth_logger(wpa_auth, wpa_auth_get_spa(sm),
+                               LOGGER_WARNING,
+                               "did not use EAPOL-Key descriptor version 0 as required for AKM-defined cases");
+               goto out;
+       }
+
        if (key_info & WPA_KEY_INFO_REQUEST) {
                if (sm->req_replay_counter_used &&
                    os_memcmp(key->replay_counter, sm->req_replay_counter,