1Bug: https://bugs.gentoo.org/937452
2Bug: https://bugzilla.redhat.com/show_bug.cgi?id=2302577
3
4From 071336247683d82a74f3567abf67a0b37db856ae Mon Sep 17 00:00:00 2001
5From: Christopher Byrne <salah.coronya@gmail.com>
6Date: Fri, 21 Feb 2025 18:58:19 -0600
7Subject: [PATCH] Revert "Mark authorization completed on driver indication
8 during 4-way HS offload"
9
10This reverts commit 41638606054a09867fe3f9a2b5523aa4678cbfa5.
11---
12 wpa_supplicant/events.c | 25 ++++++++-----------------
13 1 file changed, 8 insertions(+), 17 deletions(-)
14
15diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
16index 49917f7aa..bbb3a3eda 100644
17--- a/wpa_supplicant/events.c
18+++ b/wpa_supplicant/events.c
19@@ -4327,23 +4327,14 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
20 eapol_sm_notify_eap_success(wpa_s->eapol, true);
21 } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) &&
22 wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) {
23- if (already_authorized) {
24- /*
25- * We are done; the driver will take care of RSN 4-way
26- * handshake.
27- */
28- wpa_supplicant_cancel_auth_timeout(wpa_s);
29- wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
30- eapol_sm_notify_portValid(wpa_s->eapol, true);
31- eapol_sm_notify_eap_success(wpa_s->eapol, true);
32- } else {
33- /* Update port, WPA_COMPLETED state from the
34- * EVENT_PORT_AUTHORIZED handler when the driver is done
35- * with the 4-way handshake.
36- */
37- wpa_msg(wpa_s, MSG_DEBUG,
38- "ASSOC INFO: wait for driver port authorized indication");
39- }
40+ /*
41+ * We are done; the driver will take care of RSN 4-way
42+ * handshake.
43+ */
44+ wpa_supplicant_cancel_auth_timeout(wpa_s);
45+ wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
46+ eapol_sm_notify_portValid(wpa_s->eapol, true);
47+ eapol_sm_notify_eap_success(wpa_s->eapol, true);
48 } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) &&
49 wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) {
50 /*
51--
522.45.3
53