diff --git a/wpa_supplicant-Revert-Mark-authorization-completed-on-driver-indica.patch b/wpa_supplicant-Revert-Mark-authorization-completed-on-driver-indica.patch new file mode 100644 index 0000000000000000000000000000000000000000..b42cba1088ddd6379d0fa85c8f94415804171e34 --- /dev/null +++ b/wpa_supplicant-Revert-Mark-authorization-completed-on-driver-indica.patch @@ -0,0 +1,50 @@ +From 2514856652f9a393e505d542cb8f039f8bac10f5 Mon Sep 17 00:00:00 2001 +From: Janne Grunau +Date: Sun, 4 Aug 2024 13:24:42 +0200 +Subject: [PATCH 1/1] Revert "Mark authorization completed on driver indication + during 4-way HS offload" + +This reverts commit 41638606054a09867fe3f9a2b5523aa4678cbfa5. +--- + wpa_supplicant/events.c | 25 ++++++++----------------- + 1 file changed, 8 insertions(+), 17 deletions(-) + +diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c +index 46e7cf1ab..7b3ef7205 100644 +--- a/wpa_supplicant/events.c ++++ b/wpa_supplicant/events.c +@@ -4441,23 +4441,14 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s, + eapol_sm_notify_eap_success(wpa_s->eapol, true); + } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_PSK) && + wpa_key_mgmt_wpa_psk(wpa_s->key_mgmt)) { +- if (already_authorized) { +- /* +- * We are done; the driver will take care of RSN 4-way +- * handshake. +- */ +- wpa_supplicant_cancel_auth_timeout(wpa_s); +- wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); +- eapol_sm_notify_portValid(wpa_s->eapol, true); +- eapol_sm_notify_eap_success(wpa_s->eapol, true); +- } else { +- /* Update port, WPA_COMPLETED state from the +- * EVENT_PORT_AUTHORIZED handler when the driver is done +- * with the 4-way handshake. +- */ +- wpa_msg(wpa_s, MSG_DEBUG, +- "ASSOC INFO: wait for driver port authorized indication"); +- } ++ /* ++ * We are done; the driver will take care of RSN 4-way ++ * handshake. ++ */ ++ wpa_supplicant_cancel_auth_timeout(wpa_s); ++ wpa_supplicant_set_state(wpa_s, WPA_COMPLETED); ++ eapol_sm_notify_portValid(wpa_s->eapol, true); ++ eapol_sm_notify_eap_success(wpa_s->eapol, true); + } else if ((wpa_s->drv_flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE_8021X) && + wpa_key_mgmt_wpa_ieee8021x(wpa_s->key_mgmt)) { + /* +-- +2.45.2 + diff --git a/wpa_supplicant.spec b/wpa_supplicant.spec index 59869bf310c23ac6ebf6722718fc7d7845af5d43..1e909729d088f794020be8069df10aeb5cf541fa 100644 --- a/wpa_supplicant.spec +++ b/wpa_supplicant.spec @@ -1,10 +1,10 @@ -%define anolis_release 1 +%define anolis_release 2 %global _hardened_build 1 Summary: WPA/WPA2/IEEE 802.1X Supplicant Name: wpa_supplicant Epoch: 1 -Version: 2.11 +Version: 2.11 Release: %{anolis_release}%{?dist} License: BSD Source0: http://w1.fi/releases/%{name}-%{version}.tar.gz @@ -41,6 +41,7 @@ Patch9: wpa_supplicant-allow-legacy-renegotiation.patch #Patch11: wpa_supplicant-sae-pass-sae-password-on-connect-for-sae-authentication-offload-support.patch # Enable IPv6 (#2095296) Patch12: wpa_supplicant-defconfig-enable-ipv6.patch +Patch13: wpa_supplicant-Revert-Mark-authorization-completed-on-driver-indica.patch # support macsec HW offload #Patch13: wpa_supplicant-MACsec-Support-GCM-AES-256-cipher-suite.patch @@ -180,6 +181,8 @@ chmod -R 0644 wpa_supplicant/examples/*.py %doc wpa_supplicant/todo.txt %changelog +* Thu Aug 21 2025 wenyuzifang - 1:2.11-2 +- Ensures reliable connection state by avoiding driver event dependency. * Fri Dec 06 2024 mgb01105731 - 1:2.11-1 - update to 2.11 fix CVE-2023-52424