Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-04-30 20:37:28 +02:00
Code Releases Activity

eapol: Use the require_handshake flag for FILS

Browse Source 
In both FT or FILS EAPoL isn't used for the initial handshake and only
for the later re-keys.  For FT we added the
eapol_sm_set_require_handshake mechanism to tell EAPoL to not require
the initial handshake and we can re-use it for FILS.
This commit is contained in:
Andrew Zaborowski 2020-08-13 02:50:12 +02:00 committed by Denis Kenzior
parent a95cd4f0fa
commit 69259b3a3f
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/eapol.c
View File

@ -2399,16 +2399,6 @@ bool eapol_start(struct eapol_sm *sm)
sm->started = true; sm->started = true;
/*
* FILS only uses the 4-way for rekeys, so only started needs to be set,
* then we wait for a rekey.
*/
if (sm->handshake->akm_suite & (IE_RSN_AKM_SUITE_FILS_SHA256 |
IE_RSN_AKM_SUITE_FILS_SHA384 |
IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384 |
IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256))
return true;
if (sm->require_handshake) if (sm->require_handshake)
sm->timeout = l_timeout_create(eapol_4way_handshake_time, sm->timeout = l_timeout_create(eapol_4way_handshake_time,
eapol_timeout, sm, NULL); eapol_timeout, sm, NULL);

16
src/netdev.c
View File

@ -2071,6 +2071,12 @@ static void netdev_associate_event(struct l_genl_msg *msg,
if (netdev->ap) { if (netdev->ap) {
ret = auth_proto_rx_associate(netdev->ap, frame, frame_len); ret = auth_proto_rx_associate(netdev->ap, frame, frame_len);
if (ret == 0) { if (ret == 0) {
bool fils = !!(netdev->handshake->akm_suite &
(IE_RSN_AKM_SUITE_FILS_SHA256 |
IE_RSN_AKM_SUITE_FILS_SHA384 |
IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384 |
IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256));
auth_proto_free(netdev->ap); auth_proto_free(netdev->ap);
netdev->ap = NULL; netdev->ap = NULL;
@ -2081,15 +2087,15 @@ static void netdev_associate_event(struct l_genl_msg *msg,
netdev->ignore_connect_event = false; netdev->ignore_connect_event = false;
/* /*
* If in FT we need to prevent the 4-way handshake from * If in FT and/or FILS we don't force an initial 4-way
* happening, and instead just wait for rekeys * handshake and instead just keep the EAPoL state
* machine for the rekeys.
*/ */
if (netdev->in_ft) { if (netdev->in_ft || fils)
eapol_sm_set_require_handshake(netdev->sm, eapol_sm_set_require_handshake(netdev->sm,
false); false);
netdev->in_ft = false;
}
netdev->in_ft = false;
return; return;
} else if (ret == -EAGAIN) { } else if (ret == -EAGAIN) {
/* /*