Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-28 12:39:29 +01:00
Code Releases Activity

handshake: use authenticator_fte instead of 'fte'

Browse Source
This commit is contained in:
James Prestwood 2023-12-06 12:17:54 -08:00 committed by Denis Kenzior
parent a7fe6a9c12
commit 6b677e8db0
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/eapol.c
View File

@ -1299,7 +1299,8 @@ static void eapol_handle_ptk_1_of_4(struct eapol_sm *sm,
ies_len = ies[1] + 2; ies_len = ies[1] + 2;
ies_len += append_ie(ies + ies_len, sm->handshake->mde); ies_len += append_ie(ies + ies_len, sm->handshake->mde);
ies_len += append_ie(ies + ies_len, sm->handshake->fte); ies_len += append_ie(ies + ies_len,
sm->handshake->authenticator_fte);
} else { } else {
ies_len = append_ie(ies, own_ie); ies_len = append_ie(ies, own_ie);
} }
@ -1795,7 +1796,7 @@ static void eapol_handle_ptk_3_of_4(struct eapol_sm *sm,
if (eapol_ie_matches(decrypted_key_data, if (eapol_ie_matches(decrypted_key_data,
decrypted_key_data_size, decrypted_key_data_size,
IE_TYPE_FAST_BSS_TRANSITION, IE_TYPE_FAST_BSS_TRANSITION,
hs->fte) < 0) hs->authenticator_fte) < 0)
goto error_ie_different; goto error_ie_different;
} }

2
src/fils.c
View File

@ -445,7 +445,7 @@ static int fils_rx_authenticate(struct auth_proto *driver, const uint8_t *frame,
kck_len, &ft_info) < 0) kck_len, &ft_info) < 0)
goto invalid_ies; goto invalid_ies;
handshake_state_set_fte(fils->hs, fte); handshake_state_set_authenticator_fte(fils->hs, fte);
handshake_state_set_kh_ids(fils->hs, ft_info.r0khid, handshake_state_set_kh_ids(fils->hs, ft_info.r0khid,
ft_info.r0khid_len, ft_info.r0khid_len,
ft_info.r1khid); ft_info.r1khid);

2
src/ft.c
View File

@ -922,7 +922,7 @@ static void ft_prepare_handshake(struct ft_info *info,
memcpy(hs->snonce, info->snonce, sizeof(hs->snonce)); memcpy(hs->snonce, info->snonce, sizeof(hs->snonce));
handshake_state_set_fte(hs, info->fte); handshake_state_set_authenticator_fte(hs, info->fte);
handshake_state_set_anonce(hs, info->ft_info.anonce); handshake_state_set_anonce(hs, info->ft_info.anonce);

2
src/handshake.c
View File

@ -540,7 +540,7 @@ bool handshake_state_derive_ptk(struct handshake_state *s)
IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 | IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 |
IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 | IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 |
IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384)) && IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384)) &&
(!s->mde || !s->fte)) (!s->mde || !s->authenticator_fte))
return false; return false;
s->ptk_complete = false; s->ptk_complete = false;

2
src/netdev.c
View File

@ -2777,7 +2777,7 @@ process_resp_ies:
*/ */
if (ie_parse_fast_bss_transition_from_data(fte, if (ie_parse_fast_bss_transition_from_data(fte,
fte[1] + 2, kck_len, &ft_info) >= 0) { fte[1] + 2, kck_len, &ft_info) >= 0) {
handshake_state_set_fte(hs, fte); handshake_state_set_authenticator_fte(hs, fte);
handshake_state_set_kh_ids(hs, handshake_state_set_kh_ids(hs,
ft_info.r0khid, ft_info.r0khid,
ft_info.r0khid_len, ft_info.r0khid_len,