mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2025-12-10 08:44:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wifi-scripts: ucode: create wpa_psk_file and sae_password_file when needed

Browse source 
This handles the case when 'wpad' or 'wpad-mini' package is used which is
missing WPA3 support. This makes it impossible to use ucode wifi-scripts
on such APs as it will raise an error:

   daemon.err hostapd: Line 87: unknown configuration item 'sae_password_file'

This also achieves parity with what is currently happening with old wifi-scripts.
The behavior now matches.

Fixes: https://github.com/openwrt/openwrt/issues/20781
Signed-off-by: Rany Hany <rany_hany@riseup.net>
Link: https://github.com/openwrt/openwrt/pull/20784
Signed-off-by: Robert Marko <robimarko@gmail.com>
This commit is contained in:
Rany Hany 2025-11-14 16:22:08 +00:00 • committed by Robert Marko
parent 27c9b706e7
commit 6df060ba4a
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,11 +135,15 @@ function iface_auth_type(config) {
netifd.setup_failed('INVALID_WPA_PSK'); netifd.setup_failed('INVALID_WPA_PSK');
} }
if (config.auth_type in [ 'psk', 'psk-sae' ]) {
set_default(config, 'wpa_psk_file', `/var/run/hostapd-${config.ifname}.psk`); set_default(config, 'wpa_psk_file', `/var/run/hostapd-${config.ifname}.psk`);
touch_file(config.wpa_psk_file); touch_file(config.wpa_psk_file);
}
if (config.auth_type in [ 'sae', 'psk-sae' ]) {
set_default(config, 'sae_password_file', `/var/run/hostapd-${config.ifname}.sae`); set_default(config, 'sae_password_file', `/var/run/hostapd-${config.ifname}.sae`);
touch_file(config.sae_password_file); touch_file(config.sae_password_file);
}
break; break;
case 'eap': case 'eap':
@ -464,9 +468,6 @@ function iface_interworking(config) {
export function generate(interface, data, config, vlans, stas, phy_features) { export function generate(interface, data, config, vlans, stas, phy_features) {
config.ctrl_interface = '/var/run/hostapd'; config.ctrl_interface = '/var/run/hostapd';
iface_wpa_stations(config, stas);
iface_sae_stations(config, stas);
config.start_disabled = data.ap_start_disabled; config.start_disabled = data.ap_start_disabled;
iface_setup(config); iface_setup(config);
@ -478,6 +479,11 @@ export function generate(interface, data, config, vlans, stas, phy_features) {
config.auth_type = 'eap2'; config.auth_type = 'eap2';
} }
if (config.auth_type in [ 'psk', 'psk-sae' ])
iface_wpa_stations(config, stas);
if (config.auth_type in [ 'sae', 'psk-sae' ])
iface_sae_stations(config, stas);
iface_auth_type(config); iface_auth_type(config);
iface_accounting_server(config); iface_accounting_server(config);