DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Jouni Malinen 2024-01-16 21:14:52 +02:00 committed by Jouni Malinen
parent 1a38056930
commit 5ff6a2749b
1 changed files with 1 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/ap/wpa_auth.c
View file

@ -1107,17 +1107,12 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
const u8 *key_data; const u8 *key_data;
size_t keyhdrlen, mic_len; size_t keyhdrlen, mic_len;
u8 *mic; u8 *mic;
bool is_mld = false;
u8 *key_data_buf = NULL; u8 *key_data_buf = NULL;
size_t key_data_buf_len = 0; size_t key_data_buf_len = 0;
if (!wpa_auth || !wpa_auth->conf.wpa || !sm) if (!wpa_auth || !wpa_auth->conf.wpa || !sm)
return; 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); wpa_hexdump(MSG_MSGDUMP, "WPA: RX EAPOL data", data, data_len);
mic_len = wpa_mic_len(sm->wpa_key_mgmt, sm->pmk_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); 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) { if (key_info & WPA_KEY_INFO_REQUEST) {
msg = REQUEST; msg = REQUEST;
msgtxt = "Request"; msgtxt = "Request";
@ -1229,9 +1219,7 @@ void wpa_receive(struct wpa_authenticator *wpa_auth,
(key_info & WPA_KEY_INFO_SECURE) && (key_info & WPA_KEY_INFO_SECURE) &&
!get_ie(key_data, key_data_length, WLAN_EID_RSN)) || !get_ie(key_data, key_data_length, WLAN_EID_RSN)) ||
(mic_len == 0 && (key_info & WPA_KEY_INFO_ENCR_KEY_DATA) && (mic_len == 0 && (key_info & WPA_KEY_INFO_ENCR_KEY_DATA) &&
key_data_length == AES_BLOCK_SIZE) || key_data_length == AES_BLOCK_SIZE)) {
(is_mld && (key_info & WPA_KEY_INFO_SECURE) &&
sm->wpa_ptk_state == WPA_PTK_PTKINITNEGOTIATING)) {
msg = PAIRWISE_4; msg = PAIRWISE_4;
msgtxt = "4/4 Pairwise"; msgtxt = "4/4 Pairwise";
} else { } else {