aboutsummaryrefslogtreecommitdiffstats
path: root/package/madwifi/files/lib/wifi/madwifi.sh
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2007-10-18 20:51:21 +0000
committerJohn Crispin <john@openwrt.org>2007-10-18 20:51:21 +0000
commit78edb9c7bbd98454289a9a299e2aebb63840840b (patch)
treec8028209e01232ce5a064a9db463d2ccfd09ee9d /package/madwifi/files/lib/wifi/madwifi.sh
parent9b467b5b2815efe11e0d0951c8175040c86a13e5 (diff)
downloadupstream-78edb9c7bbd98454289a9a299e2aebb63840840b.tar.gz
upstream-78edb9c7bbd98454289a9a299e2aebb63840840b.tar.bz2
upstream-78edb9c7bbd98454289a9a299e2aebb63840840b.zip
fixed wpa2 support for madwifi/wpa_supplicant
SVN-Revision: 9355
Diffstat (limited to 'package/madwifi/files/lib/wifi/madwifi.sh')
-rwxr-xr-xpackage/madwifi/files/lib/wifi/madwifi.sh11
1 files changed, 8 insertions, 3 deletions
diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 3560880606..41a25a400f 100755
--- a/package/madwifi/files/lib/wifi/madwifi.sh
+++ b/package/madwifi/files/lib/wifi/madwifi.sh
@@ -225,10 +225,15 @@ enable_atheros() {
PSK|psk|PSK2|psk2)
case "$enc" in
PSK|psk)
- proto='proto=WPA';;
+ proto='proto=WPA'
+ passphrase="${key}"
+ ;;
PSK2|psk2)
- proto='proto=RSN';;
+ proto='proto=RSN'
+ passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
+ ;;
esac
+
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant
network={
@@ -236,7 +241,7 @@ network={
ssid="$ssid"
key_mgmt=WPA-PSK
$proto
- psk="$key"
+ psk="$passphrase"
}
EOF
;;