From: Travis Kemen <thepeople@openwrt.org>
Date: Wed, 13 Feb 2008 03:40:45 +0000 (+0000)
Subject: fix problems with the use of a passphrase, add option to use a key instead of passphrase
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=936d435293ffa68c496359dc89427b9868f60d2e

fix problems with the use of a passphrase, add option to use a key instead of passphrase

SVN-Revision: 10450
---

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