From b1f222f3f3f2f12b5a4800a0c4f9b6238f8a746d Mon Sep 17 00:00:00 2001
From: thepeople <thepeople@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 13 Feb 2008 03:40:45 +0000
Subject: fix problems with the use of a passphrase, add option to use a key
 instead of passphrase

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10450 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 package/madwifi/files/lib/wifi/madwifi.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to '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 400cb77ad..fef63cbcc 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
 					;;
-- 
cgit v1.2.3