From: David Bauer Date: Sun, 5 Jan 2020 23:13:58 +0000 (+0100) Subject: hostapd: disable ft_psk_generate_local for non-PSK networks X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=ab16adf80b61aa5b12229ee15fe836872621d5e7;p=openwrt%2Fstaging%2Fblocktrron.git hostapd: disable ft_psk_generate_local for non-PSK networks Without this commit, ft_psk_generate_local is enabled for non-PSK networks by default. This breaks 802.11r for EAP networks. Disable ft_psk_generate_local by default for non-PSK networks resolves this misbehavior. Reported-by: Martin Weinelt Signed-off-by: David Bauer Tested-by: Martin Weinelt --- diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh index 4bf6a6c971..3d4e57db25 100644 --- a/package/network/services/hostapd/files/hostapd.sh +++ b/package/network/services/hostapd/files/hostapd.sh @@ -510,10 +510,18 @@ hostapd_set_bss_options() { json_get_vars mobility_domain ft_psk_generate_local ft_over_ds reassociation_deadline set_default mobility_domain "$(echo "$ssid" | md5sum | head -c 4)" - set_default ft_psk_generate_local 1 set_default ft_over_ds 1 set_default reassociation_deadline 1000 + case "$auth_type" in + psk|sae|psk-sae) + set_default ft_psk_generate_local 1 + ;; + *) + set_default ft_psk_generate_local 0 + ;; + esac + append bss_conf "mobility_domain=$mobility_domain" "$N" append bss_conf "ft_psk_generate_local=$ft_psk_generate_local" "$N" append bss_conf "ft_over_ds=$ft_over_ds" "$N"