Remove the MLD specific exception for distinguishing EAPOL-Key msg 2 and 4

Now that we have a more advanced check for the differences within the
Key Data field, nonzero Key Data Length case can be determined to be
EAPOL-Key msg 4/4 if there is no RSNE in the Key Data field.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>

diff --git a/src/ap/wpa_auth.c b/src/ap/wpa_auth.c
index e6fe8e9bbc0250b9bb77fd28335ce7cf9da43a48..b14920486d48bc39b6afcaa0714a5bd65dea413f 100644 (file)
--- a/src/ap/wpa_auth.c
+++ b/src/ap/wpa_auth.c
@@ -1107,17 +1107,12 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
        const u8 *key_data;
        size_t keyhdrlen, mic_len;
        u8 *mic;
-       bool is_mld = false;
        u8 *key_data_buf = NULL;
        size_t key_data_buf_len = 0;
 
        if (!wpa_auth || !wpa_auth->conf.wpa || !sm)
                return;
 
-#ifdef CONFIG_IEEE80211BE
-       is_mld = sm->mld_assoc_link_id >= 0;
-#endif /* CONFIG_IEEE80211BE */
-
        wpa_hexdump(MSG_MSGDUMP, "WPA: RX EAPOL data", data, data_len);
 
        mic_len = wpa_mic_len(sm->wpa_key_mgmt, sm->pmk_len);
@@ -1211,11 +1206,6 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
                                key_data, key_data_length);
        }
 
-       /* TODO: Make this more robust for distinguising EAPOL-Key msg 2/4 from
-        * 4/4. Secure=1 is used in msg 2/4 when doing PTK rekeying, so the
-        * MLD mechanism here does not work without the somewhat undesired check
-        * on wpa_ptk_state.. Would likely need to decrypt Key Data first to be
-        * able to know which message this is in MLO cases.. */
        if (key_info & WPA_KEY_INFO_REQUEST) {
                msg = REQUEST;
                msgtxt = "Request";
@@ -1229,9 +1219,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
                    (key_info & WPA_KEY_INFO_SECURE) &&
                    !get_ie(key_data, key_data_length, WLAN_EID_RSN)) ||
                   (mic_len == 0 && (key_info & WPA_KEY_INFO_ENCR_KEY_DATA) &&
-                   key_data_length == AES_BLOCK_SIZE) ||
-                  (is_mld && (key_info & WPA_KEY_INFO_SECURE) &&
-                   sm->wpa_ptk_state == WPA_PTK_PTKINITNEGOTIATING)) {
+                   key_data_length == AES_BLOCK_SIZE)) {
                msg = PAIRWISE_4;
                msgtxt = "4/4 Pairwise";
        } else {