diff options
| author | Felix Fietkau | 2026-01-31 16:56:53 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2026-02-01 19:41:57 +0000 |
| commit | b99c19835ce2971577ce53ff231dbe56d6f8cf34 (patch) | |
| tree | e2c95adec848f150c4cf383f8126dca52b590efd | |
| parent | ba7cb3771b9a77f5dea8657e25345b40787a7b8c (diff) | |
| download | openwrt-b99c19835ce2971577ce53ff231dbe56d6f8cf34.tar.gz | |
wifi-scripts: fix ieee80211w override for psk-sae/sae-mixed
The ucode wifi-scripts unconditionally set ieee80211w=1 for psk-sae
and eap-eap2 auth types, ignoring any user-configured value. This
caused ieee80211w=2 (MFP required) to be silently downgraded to 1
(MFP optional) when using sae-mixed encryption.
Change the logic to only set the default of 1 when ieee80211w is not
already configured by the user.
Fixes: https://github.com/openwrt/openwrt/issues/21751
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 1bbb60184d1f25b369b26802d199ac4c85af3111)
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc | 3 | ||||
| -rw-r--r-- | package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc index 4585998d30..5771e0e2df 100644 --- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc +++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/ap.uc @@ -90,7 +90,8 @@ function iface_auth_type(config) { } if (config.auth_type in [ 'psk-sae', 'eap-eap2' ]) { - config.ieee80211w = 1; + if (!config.ieee80211w) + config.ieee80211w = 1; if (config.rsn_override) config.rsn_override_mfp = 2; config.sae_require_mfp = 1; diff --git a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc index 6d65b5b248..a1daf041a1 100644 --- a/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc +++ b/package/network/config/wifi-scripts/files-ucode/usr/share/ucode/wifi/supplicant.uc @@ -60,7 +60,7 @@ function setup_sta(data, config) { if (config.auth_type in [ 'sae', 'owe', 'eap2', 'eap192' ]) config.ieee80211w = 2; - else if (config.auth_type in [ 'psk-sae' ]) + else if (config.auth_type in [ 'psk-sae' ] && !config.ieee80211w) config.ieee80211w = 1; if ((wildcard(data.htmode, 'EHT*') || wildcard(data.htmode, 'HE*')) && config.rsn_override) |