Fix a bug when parsing ca_cert and eap_type with wpa_supplicant, this should only be set for 802.1x setups
SVN-Revision: 12292
This commit is contained in:
parent
8c8b85b54c
commit
dbb59f014a
1 changed files with 4 additions and 3 deletions
|
@ -32,6 +32,7 @@ wpa_supplicant_setup_vif() {
|
||||||
proto='WPA2'
|
proto='WPA2'
|
||||||
key_mgmt='WPA-EAP'
|
key_mgmt='WPA-EAP'
|
||||||
config_get ca_cert "$vif" ca_cert
|
config_get ca_cert "$vif" ca_cert
|
||||||
|
ca_cert="ca_cert=\"$ca_cert\""
|
||||||
case "$eap_type" in
|
case "$eap_type" in
|
||||||
tls|TLS)
|
tls|TLS)
|
||||||
pairwise='pairwise=CCMP'
|
pairwise='pairwise=CCMP'
|
||||||
|
@ -50,12 +51,12 @@ wpa_supplicant_setup_vif() {
|
||||||
password="password=\"$password\""
|
password="password=\"$password\""
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
eap_type="eap_type=$(echo $eap_type | tr 'a-z' 'A-Z')"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
config_get ifname "$vif" ifname
|
config_get ifname "$vif" ifname
|
||||||
config_get bridge "$vif" bridge
|
config_get bridge "$vif" bridge
|
||||||
config_get ssid "$vif" ssid
|
config_get ssid "$vif" ssid
|
||||||
eap_type=$(echo $eap_type | tr 'a-z' 'A-Z')
|
|
||||||
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
|
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
|
||||||
network={
|
network={
|
||||||
scan_ssid=1
|
scan_ssid=1
|
||||||
|
@ -65,8 +66,8 @@ network={
|
||||||
$passphrase
|
$passphrase
|
||||||
$pairwise
|
$pairwise
|
||||||
$group
|
$group
|
||||||
eap=$eap_type
|
$eap_type
|
||||||
ca_cert="$ca_cert"
|
$ca_cert
|
||||||
$priv_key
|
$priv_key
|
||||||
$priv_key_pwd
|
$priv_key_pwd
|
||||||
$phase2
|
$phase2
|
||||||
|
|
Loading…
Reference in a new issue