aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2008-08-26 17:19:00 +0000
committerFlorian Fainelli <florian@openwrt.org>2008-08-26 17:19:00 +0000
commit3f7faf2347632e97dc9880c64f60558179a24915 (patch)
tree7ee4dbd3cccd009c94e422cccdad378a96805d2b
parent7426e98c67a96e159045fae02bf1355089224ffc (diff)
downloadupstream-3f7faf2347632e97dc9880c64f60558179a24915.tar.gz
upstream-3f7faf2347632e97dc9880c64f60558179a24915.tar.bz2
upstream-3f7faf2347632e97dc9880c64f60558179a24915.zip
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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12394 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/hostapd/files/hostapd.sh6
1 files changed, 5 insertions, 1 deletions
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?