scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-30 01:52:51 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

hostapd: fix wpa3 regression

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2023-12-01 11:50:25 +01:00
parent 371b287db4
commit c4bdf03787
3 changed files with 61 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
feeds/ipq807x_v5.4/hostapd/files/hostapd.sh
View File

@@ -745,11 +745,11 @@ hostapd_set_bss_options() {
} }
case "$auth_type" in case "$auth_type" in
sae|owe|eap192|eap256) sae|owe|eap192|eap2)
set_default ieee80211w 2 set_default ieee80211w 2
set_default sae_require_mfp 1 set_default sae_require_mfp 1
;; ;;
psk-sae|psk2-radius|eap-eap256) psk-sae|psk2-radius|eap-eap2)
set_default ieee80211w 1 set_default ieee80211w 1
set_default sae_require_mfp 1 set_default sae_require_mfp 1
;; ;;
@@ -796,7 +796,7 @@ hostapd_set_bss_options() {
vlan_possible=1 vlan_possible=1
wps_possible=1 wps_possible=1
;; ;;
eap|eap192|eap-eap256|eap256) eap|eap192|eap-eap2|eap2)
append_radius_server append_radius_server
# radius can provide VLAN ID for clients # radius can provide VLAN ID for clients
vlan_possible=1 vlan_possible=1
@@ -1342,10 +1342,10 @@ wpa_supplicant_add_network() {
default_disabled default_disabled
case "$auth_type" in case "$auth_type" in
sae|owe|eap-eap256) sae|owe|eap-eap2)
set_default ieee80211w 2 set_default ieee80211w 2
;; ;;
psk-sae|eap192|eap256) psk-sae|eap192|eap2)
set_default ieee80211w 1 set_default ieee80211w 1
;; ;;
esac esac
@@ -1423,7 +1423,7 @@ wpa_supplicant_add_network() {
fi fi
append network_data "$passphrase" "$N$T" append network_data "$passphrase" "$N$T"
;; ;;
eap|eap192|eap-eap256|eap256) eap|eap192|eap-eap2|eap2)
hostapd_append_wpa_key_mgmt hostapd_append_wpa_key_mgmt
key_mgmt="$wpa_key_mgmt" key_mgmt="$wpa_key_mgmt"

12
feeds/wifi-ax/hostapd/files/hostapd.sh
View File

@@ -745,11 +745,11 @@ hostapd_set_bss_options() {
} }
case "$auth_type" in case "$auth_type" in
sae|owe|eap192|eap256) sae|owe|eap192|eap2)
set_default ieee80211w 2 set_default ieee80211w 2
set_default sae_require_mfp 1 set_default sae_require_mfp 1
;; ;;
psk-sae|psk2-radius|eap-eap256) psk-sae|psk2-radius|eap-eap2)
set_default ieee80211w 1 set_default ieee80211w 1
set_default sae_require_mfp 1 set_default sae_require_mfp 1
;; ;;
@@ -796,7 +796,7 @@ hostapd_set_bss_options() {
vlan_possible=1 vlan_possible=1
wps_possible=1 wps_possible=1
;; ;;
eap|eap192|eap-eap256|eap256) eap|eap192|eap-eap2|eap2)
append_radius_server append_radius_server
# radius can provide VLAN ID for clients # radius can provide VLAN ID for clients
vlan_possible=1 vlan_possible=1
@@ -1342,10 +1342,10 @@ wpa_supplicant_add_network() {
default_disabled default_disabled
case "$auth_type" in case "$auth_type" in
sae|owe|eap-eap256) sae|owe|eap-eap2)
set_default ieee80211w 2 set_default ieee80211w 2
;; ;;
psk-sae|eap192|eap256) psk-sae|eap192|eap2)
set_default ieee80211w 1 set_default ieee80211w 1
;; ;;
esac esac
@@ -1423,7 +1423,7 @@ wpa_supplicant_add_network() {
fi fi
append network_data "$passphrase" "$N$T" append network_data "$passphrase" "$N$T"
;; ;;
eap|eap192|eap-eap256|eap256) eap|eap192|eap-eap2|eap2)
hostapd_append_wpa_key_mgmt hostapd_append_wpa_key_mgmt
key_mgmt="$wpa_key_mgmt" key_mgmt="$wpa_key_mgmt"

53
patches/0069-hostapd-sync-builtin-patches.patch
View File

@@ -1,11 +1,11 @@
From b09c1180c1ba4a30b70530b90748e7682931b91a Mon Sep 17 00:00:00 2001 From b9abe28ab24fbf333960078a9e2255d01cbf408b Mon Sep 17 00:00:00 2001
From: John Crispin <john@phrozen.org> From: John Crispin <john@phrozen.org>
Date: Mon, 20 Nov 2023 08:33:42 +0100 Date: Mon, 20 Nov 2023 08:33:42 +0100
Subject: [PATCH] hostapd: sync builtin patches Subject: [PATCH] hostapd: sync builtin patches
Signed-off-by: John Crispin <john@phrozen.org> Signed-off-by: John Crispin <john@phrozen.org>
--- ---
.../network/services/hostapd/files/hostapd.sh | 5 +- .../network/services/hostapd/files/hostapd.sh | 17 +-
.../hostapd/patches/760-acs_exclude_dfs.patch | 8 +- .../hostapd/patches/760-acs_exclude_dfs.patch | 8 +-
.../hostapd/patches/780-maxassoc.patch | 6 +- .../hostapd/patches/780-maxassoc.patch | 6 +-
.../patches/790-wired-dynamic-vlan.patch | 33 +++ .../patches/790-wired-dynamic-vlan.patch | 33 +++
@@ -16,7 +16,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
.../hostapd/patches/999-ssi_signal.patch | 81 +++++++ .../hostapd/patches/999-ssi_signal.patch | 81 +++++++
.../services/hostapd/src/src/ap/ubus.c | 229 ++++++++++++++++-- .../services/hostapd/src/src/ap/ubus.c | 229 ++++++++++++++++--
.../services/hostapd/src/src/ap/ubus.h | 1 + .../services/hostapd/src/src/ap/ubus.h | 1 +
11 files changed, 491 insertions(+), 55 deletions(-) 11 files changed, 497 insertions(+), 61 deletions(-)
create mode 100644 package/network/services/hostapd/patches/790-wired-dynamic-vlan.patch create mode 100644 package/network/services/hostapd/patches/790-wired-dynamic-vlan.patch
create mode 100644 package/network/services/hostapd/patches/900-coa.patch create mode 100644 package/network/services/hostapd/patches/900-coa.patch
create mode 100644 package/network/services/hostapd/patches/901-coa-ubus.patch create mode 100644 package/network/services/hostapd/patches/901-coa-ubus.patch
@@ -24,7 +24,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
create mode 100644 package/network/services/hostapd/patches/999-ssi_signal.patch create mode 100644 package/network/services/hostapd/patches/999-ssi_signal.patch
diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
index 145848189d..19d5138510 100644 index 145848189d..958d5a9ac6 100644
--- a/package/network/services/hostapd/files/hostapd.sh --- a/package/network/services/hostapd/files/hostapd.sh
+++ b/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh
@@ -48,15 +48,14 @@ hostapd_append_wpa_key_mgmt() { @@ -48,15 +48,14 @@ hostapd_append_wpa_key_mgmt() {
@@ -45,6 +45,51 @@ index 145848189d..19d5138510 100644
append wpa_key_mgmt "WPA-EAP-SHA256" append wpa_key_mgmt "WPA-EAP-SHA256"
[ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP" [ "${ieee80211r:-0}" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
;; ;;
@@ -746,11 +745,11 @@ hostapd_set_bss_options() {
}
case "$auth_type" in
- sae|owe|eap192|eap256)
+ sae|owe|eap192|eap2)
set_default ieee80211w 2
set_default sae_require_mfp 1
;;
- psk-sae|psk2-radius|eap-eap256)
+ psk-sae|psk2-radius|eap-eap2)
set_default ieee80211w 1
set_default sae_require_mfp 1
;;
@@ -798,7 +797,7 @@ hostapd_set_bss_options() {
vlan_possible=1
wps_possible=1
;;
- eap|eap192|eap-eap256|eap256)
+ eap|eap192|eap-eap2|eap2)
append_radius_server
# radius can provide VLAN ID for clients
vlan_possible=1
@@ -1344,10 +1343,10 @@ wpa_supplicant_add_network() {
default_disabled
case "$auth_type" in
- sae|owe|eap-eap256)
+ sae|owe|eap-eap2)
set_default ieee80211w 2
;;
- psk-sae|eap192|eap256)
+ psk-sae|eap192|eap2)
set_default ieee80211w 1
;;
esac
@@ -1425,7 +1424,7 @@ wpa_supplicant_add_network() {
fi
append network_data "$passphrase" "$N$T"
;;
- eap|eap192|eap-eap256|eap256)
+ eap|eap192|eap-eap2|eap2)
hostapd_append_wpa_key_mgmt
key_mgmt="$wpa_key_mgmt"
diff --git a/package/network/services/hostapd/patches/760-acs_exclude_dfs.patch b/package/network/services/hostapd/patches/760-acs_exclude_dfs.patch diff --git a/package/network/services/hostapd/patches/760-acs_exclude_dfs.patch b/package/network/services/hostapd/patches/760-acs_exclude_dfs.patch
index 52d63c5ff9..27b3a6161a 100644 index 52d63c5ff9..27b3a6161a 100644
--- a/package/network/services/hostapd/patches/760-acs_exclude_dfs.patch --- a/package/network/services/hostapd/patches/760-acs_exclude_dfs.patch