From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 26 Aug 2008 17:19:00 +0000 (+0000)
Subject: A WPA(2) pre-shared key can either be specified as a 8 to 63 character passphrase... 
X-Git-Tag: reboot~25715
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6b04ad55f9c589bfea33b0817410d05765793aae;p=oweals%2Fopenwrt.git

A WPA(2) pre-shared key can either be specified as a 8 to 63 character passphrase which is hashed to a 256 bit key together with the SSID, or a 64 character hex key. Currently, the latter option is supported by the broadcom wifi type, but no by hostapd. The attached patch allows using a 64 character hex key. (#3935)

Signed-off-by: thomas@archlinux.org

SVN-Revision: 12394
---

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 147736bdc6..49b30cfd57 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -39,7 +39,11 @@ hostapd_setup_vif() {
 	case "$enc" in
 		*psk*|*PSK*)
 			config_get psk "$vif" key
-			append hostapd_cfg "wpa_passphrase=$psk" "$N"
+			if [ ${#psk} -eq 64 ]; then
+				append hostapd_cfg "wpa_psk=$psk" "$N"
+			else
+				append hostapd_cfg "wpa_passphrase=$psk" "$N"
+			fi
 		;;
 		*wpa*|*WPA*)
 		        # required fields? formats?