aboutsummaryrefslogtreecommitdiffstats
path: root/package/madwifi
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2007-10-18 20:51:21 +0000
committerJohn Crispin <blogic@openwrt.org>2007-10-18 20:51:21 +0000
commit192269eb1711d60135c3eed699dd0d0b0fdc0579 (patch)
treecf705171cfa1ba6c14933a62d9fb68eb572832ec /package/madwifi
parent9a5e7200422477bb084e6e05391e74d36a3749d3 (diff)
downloadupstream-192269eb1711d60135c3eed699dd0d0b0fdc0579.tar.gz
upstream-192269eb1711d60135c3eed699dd0d0b0fdc0579.tar.bz2
upstream-192269eb1711d60135c3eed699dd0d0b0fdc0579.zip
fixed wpa2 support for madwifi/wpa_supplicant
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9355 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/madwifi')
-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
;;