fixed wpa2 support for madwifi/wpa_supplicant

[openwrt/svn-archive/archive.git] / package / madwifi / files / lib / wifi / madwifi.sh

diff --git a/package/madwifi/files/lib/wifi/madwifi.sh b/package/madwifi/files/lib/wifi/madwifi.sh
index 356088060665fbab6007079c8ea146c34922c3b2..41a25a400f4810adca71abc24ede4f2630c8200d 100755 (executable)
--- 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
                                        ;;