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

ft: make Authenticate OCVC settable by caller

Browse Source 
The FT-over-DS action stage builds an FT-Request which contains an
RSNE. Since FT-over-DS will not support OCV add a boolean to
ft_build_authenticate_ies so the OCVC bit can be disabled rather
than relying on the handshake setting.
This commit is contained in:
James Prestwood 2021-09-28 08:46:57 -07:00 committed by Denis Kenzior
parent 8ce7dc3dbe
commit bc0375fb30
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ft.c
View File

@ -805,7 +805,7 @@ static bool ft_over_ds_start(struct auth_proto *ap)
return ft_tx_reassociate(ft) == 0; return ft_tx_reassociate(ft) == 0;
} }
bool ft_build_authenticate_ies(struct handshake_state *hs, bool ft_build_authenticate_ies(struct handshake_state *hs, bool ocvc,
const uint8_t *new_snonce, uint8_t *buf, const uint8_t *new_snonce, uint8_t *buf,
size_t *len) size_t *len)
{ {
@ -834,6 +834,7 @@ bool ft_build_authenticate_ies(struct handshake_state *hs,
rsn_info.num_pmkids = 1; rsn_info.num_pmkids = 1;
rsn_info.pmkids = hs->pmk_r0_name; rsn_info.pmkids = hs->pmk_r0_name;
rsn_info.ocvc = ocvc;
ie_build_rsne(&rsn_info, ptr); ie_build_rsne(&rsn_info, ptr);
ptr += ptr[1] + 2; ptr += ptr[1] + 2;
@ -884,7 +885,8 @@ static bool ft_start(struct auth_proto *ap)
uint8_t buf[512]; uint8_t buf[512];
size_t len; size_t len;
if (!ft_build_authenticate_ies(hs, hs->snonce, buf, &len)) if (!ft_build_authenticate_ies(hs, hs->supplicant_ocvc, hs->snonce,
buf, &len))
return false; return false;
iov.iov_base = buf; iov.iov_base = buf;

2
src/ft.h
View File

@ -44,7 +44,7 @@ struct ft_ds_info {
void ft_ds_info_free(struct ft_ds_info *info); void ft_ds_info_free(struct ft_ds_info *info);
bool ft_build_authenticate_ies(struct handshake_state *hs, bool ft_build_authenticate_ies(struct handshake_state *hs, bool ocvc,
const uint8_t *new_snonce, uint8_t *buf, const uint8_t *new_snonce, uint8_t *buf,
size_t *len); size_t *len);

4
src/netdev.c
View File

@ -4400,7 +4400,9 @@ int netdev_fast_transition_over_ds_action(struct netdev *netdev,
iovs[0].iov_base = ft_req; iovs[0].iov_base = ft_req;
iovs[0].iov_len = sizeof(ft_req); iovs[0].iov_len = sizeof(ft_req);
if (!ft_build_authenticate_ies(hs, info->super.snonce, buf, &len))
if (!ft_build_authenticate_ies(hs, false, info->super.snonce,
buf, &len))
goto failed; goto failed;
iovs[1].iov_base = buf; iovs[1].iov_base = buf;