summaryrefslogtreecommitdiffstats
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
commit17f5287b0ef1201854f67da45535b97deb720e26 (patch)
treebcd1ecf1e4aa4e7710732684b55613291592520d
parentb2f04768710459c1c88de47ad292bc41a14e1f12 (diff)
downloadmaster-31e0f0ae-17f5287b0ef1201854f67da45535b97deb720e26.tar.gz
master-31e0f0ae-17f5287b0ef1201854f67da45535b97deb720e26.tar.bz2
master-31e0f0ae-17f5287b0ef1201854f67da45535b97deb720e26.zip
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
SVN-Revision: 32614
-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*)