aboutsummaryrefslogtreecommitdiffstats
path: root/package
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-07-05 12:25:29 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-07-05 12:25:29 +0000
commitdfedcc2bede098a03b614b2c5bd62dd77237d512 (patch)
tree49f9639ab332a31bde0cf3f158171d2001f8899e /package
parenta9e60e6959d0c2885d473b11565f0d18f844c9f6 (diff)
downloadupstream-dfedcc2bede098a03b614b2c5bd62dd77237d512.tar.gz
upstream-dfedcc2bede098a03b614b2c5bd62dd77237d512.tar.bz2
upstream-dfedcc2bede098a03b614b2c5bd62dd77237d512.zip
[package] hostapd: change wpa_supplicant.sh to pass 64 byte hex psk unquoted and remove the undocumented usepasspharse option, this makes it match the logic of the hostapd setup
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32614 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-rw-r--r--package/hostapd/files/wpa_supplicant.sh7
1 files changed, 3 insertions, 4 deletions
diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 8caad77c20..ed6597c259 100644
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -63,11 +63,10 @@ wpa_supplicant_setup_vif() {
key_mgmt='WPA-NONE'
driver='wext'
}
- config_get_bool usepassphrase "$vif" usepassphrase 1
- if [ "$usepassphrase" = "1" ]; then
- passphrase="psk=\"${key}\""
- else
+ if [ ${#key} -eq 64 ]; then
passphrase="psk=${key}"
+ else
+ passphrase="psk=\"${key}\""
fi
case "$enc" in
*psk2*)