fixed wpa2 support for madwifi/wpa_supplicant
SVN-Revision: 9355
This commit is contained in:
parent
9b467b5b28
commit
78edb9c7bb
2 changed files with 9 additions and 21 deletions
|
@ -225,10 +225,15 @@ enable_atheros() {
|
|||
PSK|psk|PSK2|psk2)
|
||||
case "$enc" in
|
||||
PSK|psk)
|
||||
proto='proto=WPA';;
|
||||
proto='proto=WPA'
|
||||
passphrase="${key}"
|
||||
;;
|
||||
PSK2|psk2)
|
||||
proto='proto=RSN';;
|
||||
proto='proto=RSN'
|
||||
passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
|
||||
;;
|
||||
esac
|
||||
|
||||
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
|
||||
ctrl_interface=/var/run/wpa_supplicant
|
||||
network={
|
||||
|
@ -236,7 +241,7 @@ network={
|
|||
ssid="$ssid"
|
||||
key_mgmt=WPA-PSK
|
||||
$proto
|
||||
psk="$key"
|
||||
psk="$passphrase"
|
||||
}
|
||||
EOF
|
||||
;;
|
||||
|
|
|
@ -41,17 +41,6 @@ define Package/wpa-cli/Description
|
|||
|
||||
endef
|
||||
|
||||
define Package/wpa-passphrase
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
DEPENDS:=wpa-supplicant
|
||||
TITLE:=Set WPA passphrase for a SSID
|
||||
endef
|
||||
|
||||
define Package/wpa-passphrase/Description
|
||||
|
||||
endef
|
||||
|
||||
define Build/Configure
|
||||
cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
|
||||
endef
|
||||
|
@ -72,7 +61,7 @@ endef
|
|||
|
||||
define Package/wpa-supplicant/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(CP) $(PKG_BUILD_DIR)/wpa_supplicant $(1)/usr/sbin/
|
||||
$(CP) $(PKG_BUILD_DIR)/wpa_{supplicant,passphrase} $(1)/usr/sbin/
|
||||
endef
|
||||
|
||||
define Package/wpa-cli/install
|
||||
|
@ -80,11 +69,5 @@ define Package/wpa-cli/install
|
|||
$(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
|
||||
endef
|
||||
|
||||
define Package/wpa-passphrase/install
|
||||
$(INSTALL_DIR) $(1)/usr/sbin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/wpa_passphrase $(1)/usr/sbin/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,wpa-supplicant))
|
||||
$(eval $(call BuildPackage,wpa-cli))
|
||||
$(eval $(call BuildPackage,wpa-passphrase))
|
||||
|
|
Loading…
Reference in a new issue