Nanako/openwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wpa_supplicant: rework wpa_key_mgmt handling

Browse Source 
Rework wpa_key_mgmt handling for wpa_supplicant to be consistent with
how it is done for hostapd.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Tested-by: Sebastian Kemper <sebastian_ml@gmx.net>
This commit is contained in:
Stijn Tintel 2016-12-11 15:54:06 +01:00
parent b13e103d71
commit bdcffb9bb6
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/network/services/hostapd/files/netifd.sh
View File

@ -573,11 +573,8 @@ wpa_supplicant_add_network() {
local network_data= local network_data=
local T=" " local T=" "
local wpa_key_mgmt="WPA-PSK"
local scan_ssid="scan_ssid=1" local scan_ssid="scan_ssid=1"
local freq local freq wpa_key_mgmt
[ "$ieee80211r" -gt 0 ] && wpa_key_mgmt="FT-PSK $wpa_key_mgmt"
[[ "$_w_mode" = "adhoc" ]] && { [[ "$_w_mode" = "adhoc" ]] && {
append network_data "mode=1" "$N$T" append network_data "mode=1" "$N$T"
@ -589,7 +586,7 @@ wpa_supplicant_add_network() {
scan_ssid="scan_ssid=0" 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" ]] && { [[ "$_w_mode" = "mesh" ]] && {
@ -601,7 +598,7 @@ wpa_supplicant_add_network() {
freq="$(get_freq "$phy" "$channel")" freq="$(get_freq "$phy" "$channel")"
append network_data "frequency=$freq" "$N$T" append network_data "frequency=$freq" "$N$T"
} }
wpa_key_mgmt="SAE" append wpa_key_mgmt "SAE"
scan_ssid="" scan_ssid=""
} }
@ -617,7 +614,10 @@ wpa_supplicant_add_network() {
psk) psk)
local passphrase local passphrase
append wpa_key_mgmt "WPA-PSK"
[ "$ieee80211r" -gt 0 ] && append wpa_key_mgmt "FT-PSK"
key_mgmt="$wpa_key_mgmt" key_mgmt="$wpa_key_mgmt"
if [ ${#key} -eq 64 ]; then if [ ${#key} -eq 64 ]; then
passphrase="psk=${key}" passphrase="psk=${key}"
else else
@ -626,8 +626,9 @@ wpa_supplicant_add_network() {
append network_data "$passphrase" "$N$T" append network_data "$passphrase" "$N$T"
;; ;;
eap) eap)
key_mgmt='WPA-EAP' append wpa_key_mgmt "WPA-EAP"
[ "$ieee80211r" -gt 0 ] && key_mgmt="FT-EAP $key_mgmt" [ "$ieee80211r" -gt 0 ] && append wpa_key_mgmt "FT-EAP"
key_mgmt="$wpa_key_mgmt"
json_get_vars eap_type identity anonymous_identity ca_cert json_get_vars eap_type identity anonymous_identity ca_cert
[ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T" [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"