From 0d50975152c5cc4de1af6e42aa94e218a3dc1960 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 29 Jun 2022 09:35:18 +0200 Subject: [PATCH] hostapd: backport OWE patches Fixes: WIFI-9811 Signed-off-by: John Crispin --- feeds/wifi-ax/hostapd/files/hostapd.sh | 4 +- ...34-hostapd-add-owe_transition_ifname.patch | 66 +++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 patches/backports/0034-hostapd-add-owe_transition_ifname.patch diff --git a/feeds/wifi-ax/hostapd/files/hostapd.sh b/feeds/wifi-ax/hostapd/files/hostapd.sh index 9a517cf40..ba9cf8b64 100644 --- a/feeds/wifi-ax/hostapd/files/hostapd.sh +++ b/feeds/wifi-ax/hostapd/files/hostapd.sh @@ -355,6 +355,7 @@ hostapd_common_add_bss_config() { config_add_int sae_pwe config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string' + config_add_string owe_transition_ifname config_add_boolean iw_enabled iw_internet iw_asra iw_esr iw_uesa config_add_int iw_access_network_type iw_venue_group iw_venue_type @@ -718,10 +719,11 @@ hostapd_set_bss_options() { case "$auth_type" in none|owe) - json_get_vars owe_transition_bssid owe_transition_ssid + json_get_vars owe_transition_bssid owe_transition_ssid owe_transition_ifname [ -n "$owe_transition_ssid" ] && append bss_conf "owe_transition_ssid=\"$owe_transition_ssid\"" "$N" [ -n "$owe_transition_bssid" ] && append bss_conf "owe_transition_bssid=$owe_transition_bssid" "$N" + [ -n "$owe_transition_ifname" ] && append bss_conf "owe_transition_ifname=$owe_transition_ifname" "$N" wps_possible=1 # Here we make the assumption that if we're in open mode diff --git a/patches/backports/0034-hostapd-add-owe_transition_ifname.patch b/patches/backports/0034-hostapd-add-owe_transition_ifname.patch new file mode 100644 index 000000000..edb1177a4 --- /dev/null +++ b/patches/backports/0034-hostapd-add-owe_transition_ifname.patch @@ -0,0 +1,66 @@ +From 574539ee2cdbb3dd54086423c6dfdd19bb1c06a6 Mon Sep 17 00:00:00 2001 +From: David Bauer +Date: Thu, 16 Jun 2022 01:55:26 +0200 +Subject: [PATCH] hostapd: add owe_transition_ifname + +Add the owe_transition_ifname config option to wifi-ifaces. + +This allows to configure OWE transition VAPs without adding SSID / BSSID +to the uci conifg but instead autodiscovering these parameters from +other networks on the same PHY. + +The following configuration creates a OWE transition mode network +constellation. + +config wifi-iface 'open0' + option device 'radio0' + option ifname 'open0' + option network 'lan' + option mode 'ap' + option ssid 'FreeNet' + option encryption 'none' + option owe_transition_ifname 'owe0' + +config wifi-iface 'owe0' + option device 'radio0' + option ifname 'owe0' + option network 'lan' + option mode 'ap' + option ssid 'owe_tm.FreeNet' + option encryption 'owe' + option hidden '1' + option owe_transition_ifname 'open0' + +Signed-off-by: David Bauer +--- + package/network/services/hostapd/files/hostapd.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh +index e5f816a55b..fa344bd2dd 100644 +--- a/package/network/services/hostapd/files/hostapd.sh ++++ b/package/network/services/hostapd/files/hostapd.sh +@@ -335,6 +335,7 @@ hostapd_common_add_bss_config() { + config_add_int sae_pwe + + config_add_string 'owe_transition_bssid:macaddr' 'owe_transition_ssid:string' ++ config_add_string owe_transition_ifname + + config_add_boolean iw_enabled iw_internet iw_asra iw_esr iw_uesa + config_add_int iw_access_network_type iw_venue_group iw_venue_type +@@ -635,10 +636,11 @@ hostapd_set_bss_options() { + + case "$auth_type" in + none|owe) +- json_get_vars owe_transition_bssid owe_transition_ssid ++ json_get_vars owe_transition_bssid owe_transition_ssid owe_transition_ifname + + [ -n "$owe_transition_ssid" ] && append bss_conf "owe_transition_ssid=\"$owe_transition_ssid\"" "$N" + [ -n "$owe_transition_bssid" ] && append bss_conf "owe_transition_bssid=$owe_transition_bssid" "$N" ++ [ -n "$owe_transition_ifname" ] && append bss_conf "owe_transition_ifname=$owe_transition_ifname" "$N" + + wps_possible=1 + # Here we make the assumption that if we're in open mode +-- +2.25.1 +