fix problems with the use of a passphrase, add option to use a key instead of passphrase

SVN-Revision: 10450
master
Travis Kemen 17 years ago
parent 855a8bf930
commit 80f0eec0aa
  1. 18
      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
;;

Loading…
Cancel
Save