Fresh pull from upstream

[librecmc/librecmc.git] / package / network / services / hostapd / files / netifd.sh

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index a24a5c30d5d60cbbe9c4f854b613f3d67fa733df..fb23e52e679f076f575ff45e3a0df32de6c27003 100644 (file)
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -36,6 +36,14 @@ hostapd_append_wep_key() {
        esac
 }
 
+hostapd_append_wpa_key_mgmt() {
+       local auth_type="$(echo $auth_type | tr 'a-z' 'A-Z')"
+
+       append wpa_key_mgmt "WPA-$auth_type"
+       [ "$ieee80211r" -gt 0 ] && append wpa_key_mgmt "FT-${auth_type}"
+       [ "$ieee80211w" -gt 0 ] && append wpa_key_mgmt "WPA-${auth_type}-SHA256"
+}
+
 hostapd_add_log_config() {
        config_add_boolean \
                log_80211 \
@@ -187,7 +195,7 @@ hostapd_set_bss_options() {
                wps_device_type wps_device_name wps_manufacturer wps_pin \
                macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
                iapp_interface eapol_version acct_server acct_secret acct_port \
-               dynamic_vlan
+               dynamic_vlan ieee80211w
 
        set_default isolate 0
        set_default maxassoc 0
@@ -256,7 +264,6 @@ hostapd_set_bss_options() {
                        [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
 
                        wps_possible=1
-                       append wpa_key_mgmt "WPA-PSK"
                ;;
                eap)
                        json_get_vars \
@@ -291,7 +298,6 @@ hostapd_set_bss_options() {
                        [ -n "$ownip" ] && append bss_conf "own_ip_addr=$ownip" "$N"
                        append bss_conf "eapol_key_index_workaround=1" "$N"
                        append bss_conf "ieee8021x=1" "$N"
-                       append wpa_key_mgmt "WPA-EAP"
 
                        [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
                ;;
@@ -376,11 +382,9 @@ hostapd_set_bss_options() {
                        for kh in $r1kh; do
                                append bss_conf "r1kh=${kh//,/ }" "$N"
                        done
-
-                       [ "$wpa_key_mgmt" != "${wpa_key_mgmt/EAP/}" ] && append wpa_key_mgmt "FT-EAP"
-                       [ "$wpa_key_mgmt" != "${wpa_key_mgmt/PSK/}" ] && append wpa_key_mgmt "FT-PSK"
                fi
 
+               hostapd_append_wpa_key_mgmt
                [ -n "$wpa_key_mgmt" ] && append bss_conf "wpa_key_mgmt=$wpa_key_mgmt" "$N"
        fi
 
@@ -397,7 +401,6 @@ hostapd_set_bss_options() {
                [ "$auth_cache" = 0 ] && append bss_conf "disable_pmksa_caching=1" "$N"
 
                # RSN -> allow management frame protection
-               json_get_var ieee80211w ieee80211w
                case "$ieee80211w" in
                        [012])
                                json_get_vars ieee80211w_max_timeout ieee80211w_retry_timeout
@@ -573,11 +576,8 @@ wpa_supplicant_add_network() {
        local network_data=
        local T="       "
 
-       local wpa_key_mgmt="WPA-PSK"
        local scan_ssid="scan_ssid=1"
-       local freq
-
-       [ "$ieee80211r" -gt 0 ] && wpa_key_mgmt="FT-PSK $wpa_key_mgmt"
+       local freq wpa_key_mgmt
 
        [[ "$_w_mode" = "adhoc" ]] && {
                append network_data "mode=1" "$N$T"
@@ -589,7 +589,7 @@ wpa_supplicant_add_network() {
 
                scan_ssid="scan_ssid=0"
 
-               [ "$_w_driver" = "nl80211" ] || wpa_key_mgmt="WPA-NONE"
+               [ "$_w_driver" = "nl80211" ] || append wpa_key_mgmt "WPA-NONE"
        }
 
        [[ "$_w_mode" = "mesh" ]] && {
@@ -601,7 +601,7 @@ wpa_supplicant_add_network() {
                        freq="$(get_freq "$phy" "$channel")"
                        append network_data "frequency=$freq" "$N$T"
                }
-               wpa_key_mgmt="SAE"
+               append wpa_key_mgmt "SAE"
                scan_ssid=""
        }
 
@@ -617,7 +617,12 @@ wpa_supplicant_add_network() {
                psk)
                        local passphrase
 
+                       if [ "$_w_mode" != "mesh" ]; then
+                               hostapd_append_wpa_key_mgmt
+                       fi
+
                        key_mgmt="$wpa_key_mgmt"
+
                        if [ ${#key} -eq 64 ]; then
                                passphrase="psk=${key}"
                        else
@@ -626,8 +631,8 @@ wpa_supplicant_add_network() {
                        append network_data "$passphrase" "$N$T"
                ;;
                eap)
-                       key_mgmt='WPA-EAP'
-                       [ "$ieee80211r" -gt 0 ] && key_mgmt="FT-EAP $key_mgmt"
+                       hostapd_append_wpa_key_mgmt
+                       key_mgmt="$wpa_key_mgmt"
 
                        json_get_vars eap_type identity anonymous_identity ca_cert
                        [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"