Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wifi-scripts: fix corner case in RSN override support

Browse source 
When used, all relevant parameters need to be set

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2025-06-25 10:48:34 +02:00
parent d324d6f07e
commit 8ad5416d99
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc
View file

@ -173,8 +173,7 @@ function iface_auth_type(config) {
'eapol_version', 'dynamic_vlan', 'radius_request_cui', 'eap_reauth_period',
'radius_das_client', 'radius_das_port', 'own_ip_addr', 'dynamic_own_ip_addr',
'wpa_disable_eapol_key_retries', 'auth_algs', 'wpa', 'wpa_pairwise',
'erp_domain', 'fils_realm', 'erp_send_reauth_start', 'fils_cache_id',
'rsn_override_pairwise', 'rsn_override_mfp'
'erp_domain', 'fils_realm', 'erp_send_reauth_start', 'fils_cache_id'
]);
}
@ -479,9 +478,19 @@ export function generate(interface, data, config, vlans, stas, phy_features) {
iface.wpa_key_mgmt(config);
append_vars(config, [
'wpa_key_mgmt',
'rsn_override_key_mgmt'
]);
if (config.rsn_override_key_mgmt || config.rsn_override_pairwise) {
config.rsn_override_mfp ??= config.ieee80211w;
config.rsn_override_key_mgmt ??= config.wpa_key_mgmt;
config.rsn_override_pairwise ??= config.wpa_pairwise;
append_vars(config, [
'rsn_override_key_mgmt',
'rsn_override_pairwise',
'rsn_override_mfp'
]);
}
/* raw options */
for (let raw in config.hostapd_options)
append_raw(raw);

7
package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh
View file

@ -862,7 +862,6 @@ hostapd_set_bss_options() {
append bss_conf "auth_algs=${auth_algs:-1}" "$N"
append bss_conf "wpa=$wpa" "$N"
[ -n "$wpa_pairwise" ] && append bss_conf "wpa_pairwise=$wpa_pairwise" "$N"
[ -n "$rsn_override_pairwise" ] && append bss_conf "rsn_override_pairwise=$rsn_override_pairwise" "$N"
set_default wps_pushbutton 0
set_default wps_label 0
@ -975,7 +974,11 @@ hostapd_set_bss_options() {
hostapd_append_wpa_key_mgmt
[ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
[ -n "$rsn_override_key_mgmt" ] && append bss_conf "rsn_override_key_mgmt=$rsn_override_key_mgmt" "$N"
[ -n "$rsn_override_key_mgmt" -o -n "$rsn_override_pairwise" ] && {
append bss_conf "rsn_override_key_mgmt=${rsn_override_key_mgmt:-$wpa_key_mgmt}" "$N"
append bss_conf "rsn_override_pairwise=${rsn_override_pairwise:-$wpa_pairwise}" "$N"
append bss_conf "rsn_override_mfp=$ieee80211w" "$N"
}
fi
if [ "$wpa" -ge "2" ]; then