mirror of
https://git.kernel.org/pub/scm/network/wireless/iwd.git
synced 2025-02-16 15:20:42 +01:00
eapol: Handle the use_eapol_start flag on authenticator
Reuse this flag on the authenticator side with a slightly different meaning: when it's true we're forced to wait for the EAPoL-Start before sending the first EAPoL-EAP frame to the supplicant, such as is required in a WSC enrollee registration when the Association Request didn't have a v2.0 WSC IE.
This commit is contained in:
parent
66e9d4fca9
commit
2231179b97
13
src/eapol.c
13
src/eapol.c
@ -2417,7 +2417,7 @@ bool eapol_start(struct eapol_sm *sm)
|
|||||||
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);
|
||||||
|
|
||||||
if (sm->use_eapol_start) {
|
if (!sm->handshake->authenticator && sm->use_eapol_start) {
|
||||||
/*
|
/*
|
||||||
* We start a short timeout, if EAP packets are not received
|
* We start a short timeout, if EAP packets are not received
|
||||||
* from AP, then we send the EAPoL-Start
|
* from AP, then we send the EAPoL-Start
|
||||||
@ -2442,9 +2442,14 @@ bool eapol_start(struct eapol_sm *sm)
|
|||||||
if (!sm->protocol_version)
|
if (!sm->protocol_version)
|
||||||
sm->protocol_version = EAPOL_PROTOCOL_VERSION_2004;
|
sm->protocol_version = EAPOL_PROTOCOL_VERSION_2004;
|
||||||
|
|
||||||
if (sm->handshake->settings_8021x)
|
if (sm->handshake->settings_8021x) {
|
||||||
eap_start(sm->eap);
|
/*
|
||||||
else {
|
* If we're allowed to, send EAP Identity request
|
||||||
|
* immediately, otherwise wait for an EAPoL-Start.
|
||||||
|
*/
|
||||||
|
if (!sm->use_eapol_start)
|
||||||
|
eap_start(sm->eap);
|
||||||
|
} else {
|
||||||
if (L_WARN_ON(!sm->handshake->have_pmk))
|
if (L_WARN_ON(!sm->handshake->have_pmk))
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user