qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 21:34:04 +02:00
Code

Fix a bug when parsing ca_cert and eap_type with wpa_supplicant, this should only be set for 802.1x setups

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12292 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-08-13 13:30:27 +00:00
parent 6abeb0b191
commit 54a7242228
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/wpa_supplicant/files/wpa_supplicant.sh
View File

@ -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