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

FT: Supplicant side FTE generation for FT-SAE-EXT-KEY

Browse source 
Add the SHA512-based variant.

Signed-off-by: Jouni Malinen <quic_jouni@quicinc.com>
This commit is contained in:
Jouni Malinen 2022-10-16 16:38:27 +03:00 • committed by Jouni Malinen
parent 883e33594d
commit a1eb1bb0e0
1 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/rsn_supp/wpa_ft.c
View file

@ -11,6 +11,7 @@
#include "common.h" #include "common.h"
#include "crypto/aes_wrap.h" #include "crypto/aes_wrap.h"
#include "crypto/sha384.h" #include "crypto/sha384.h"
#include "crypto/sha512.h"
#include "crypto/random.h" #include "crypto/random.h"
#include "common/ieee802_11_defs.h" #include "common/ieee802_11_defs.h"
#include "common/ieee802_11_common.h" #include "common/ieee802_11_common.h"
@ -218,7 +219,7 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
sm->ft_reassoc_completed = 0; sm->ft_reassoc_completed = 0;
buf_len = 2 + sizeof(struct rsn_mdie) + 2 + buf_len = 2 + sizeof(struct rsn_mdie) + 2 +
sizeof(struct rsn_ftie_sha384) + sizeof(struct rsn_ftie_sha512) +
2 + sm->r0kh_id_len + ric_ies_len + 100; 2 + sm->r0kh_id_len + ric_ies_len + 100;
buf = os_zalloc(buf_len); buf = os_zalloc(buf_len);
if (buf == NULL) if (buf == NULL)
@ -344,7 +345,21 @@ static u8 * wpa_ft_gen_req_ies(struct wpa_sm *sm, size_t *len,
rsnxe_used); rsnxe_used);
} }
#endif /* CONFIG_TESTING_OPTIONS */ #endif /* CONFIG_TESTING_OPTIONS */
if (wpa_key_mgmt_sha384(sm->key_mgmt)) { if (sm->key_mgmt == WPA_KEY_MGMT_FT_SAE_EXT_KEY &&
sm->pmk_r0_len == SHA512_MAC_LEN) {
struct rsn_ftie_sha512 *ftie;
ftie = (struct rsn_ftie_sha512 *) pos;
ftie->mic_control[0] = !!rsnxe_used;
fte_mic = ftie->mic;
elem_count = &ftie->mic_control[1];
pos += sizeof(*ftie);
os_memcpy(ftie->snonce, sm->snonce, WPA_NONCE_LEN);
if (anonce)
os_memcpy(ftie->anonce, anonce, WPA_NONCE_LEN);
} else if ((sm->key_mgmt == WPA_KEY_MGMT_FT_SAE_EXT_KEY &&
sm->pmk_r0_len == SHA384_MAC_LEN) ||
wpa_key_mgmt_sha384(sm->key_mgmt)) {
struct rsn_ftie_sha384 *ftie; struct rsn_ftie_sha384 *ftie;
ftie = (struct rsn_ftie_sha384 *) pos; ftie = (struct rsn_ftie_sha384 *) pos;