aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorTravis Kemen <thepeople@openwrt.org>2008-02-13 03:40:45 +0000
committerTravis Kemen <thepeople@openwrt.org>2008-02-13 03:40:45 +0000
commit80f0eec0aad257b5d020eaf8abc35d437dadfe73 (patch)
tree055ce702a2f77e0161848c33a0dcd50bed5f9bda /package
parent855a8bf930d4b235c4c6d780cd6eaace1ab33b20 (diff)
downloadupstream-80f0eec0aad257b5d020eaf8abc35d437dadfe73.tar.gz
upstream-80f0eec0aad257b5d020eaf8abc35d437dadfe73.tar.bz2
upstream-80f0eec0aad257b5d020eaf8abc35d437dadfe73.zip
fix problems with the use of a passphrase, add option to use a key instead of passphrase
SVN-Revision: 10450
Diffstat (limited to 'package')
-rwxr-xr-xpackage/madwifi/files/lib/wifi/madwifi.sh18
1 files changed, 13 insertions, 5 deletions
diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 400cb77adc..fef63cbcc2 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -266,26 +266,34 @@ enable_atheros() {
fi
;;
wds|sta)
- case "$enc" in
+ config_get_bool usepassphrase "$vif" passphrase 1
+ case "$enc" in
PSK|psk|PSK2|psk2)
case "$enc" in
PSK|psk)
proto='proto=WPA'
- passphrase="${key}"
+ if [ "$usepassphrase" = "1" ]; then
+ passphrase="psk=\"${key}\""
+ else
+ passphrase="psk=${key}"
+ fi
;;
PSK2|psk2)
proto='proto=RSN'
- passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
+ if [ "$usepassphrase" = "1" ]; then
+ passphrase="psk=\"${key}\""
+ else
+ passphrase="psk=${key}"
+ fi
;;
esac
-
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
network={
scan_ssid=1
ssid="$ssid"
key_mgmt=WPA-PSK
$proto
- psk=$passphrase
+ $passphrase
}
EOF
;;