qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-27 16:21:06 +02:00
Code

fixed wpa2 support for madwifi/wpa_supplicant

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@9355 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
blogic 2007-10-18 20:51:21 +00:00
parent aefe181806
commit d7385210e9
2 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/madwifi/files/lib/wifi/madwifi.sh
View File

@ -225,10 +225,15 @@ enable_atheros() {
PSK|psk|PSK2|psk2) PSK|psk|PSK2|psk2)
case "$enc" in case "$enc" in
PSK|psk) PSK|psk)
proto='proto=WPA';; proto='proto=WPA'
passphrase="${key}"
;;
PSK2|psk2) PSK2|psk2)
proto='proto=RSN';; proto='proto=RSN'
passphrase=`wpa_passphrase ${ssid} "${key}" | grep psk | grep -v \#| cut -d= -f2`
;;
esac esac
cat > /var/run/wpa_supplicant-$ifname.conf <<EOF cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
ctrl_interface=/var/run/wpa_supplicant ctrl_interface=/var/run/wpa_supplicant
network={ network={
@ -236,7 +241,7 @@ network={
ssid="$ssid" ssid="$ssid"
key_mgmt=WPA-PSK key_mgmt=WPA-PSK
$proto $proto
psk="$key" psk="$passphrase"
} }
EOF EOF
;; ;;

19
package/wpa_supplicant/Makefile
View File

@ -41,17 +41,6 @@ define Package/wpa-cli/Description
endef 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 define Build/Configure
cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config cp ./files/config.$(ARCH) $(PKG_BUILD_DIR)/.config
endef endef
@ -72,7 +61,7 @@ endef
define Package/wpa-supplicant/install define Package/wpa-supplicant/install
$(INSTALL_DIR) $(1)/usr/sbin $(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 endef
define Package/wpa-cli/install define Package/wpa-cli/install
@ -80,11 +69,5 @@ define Package/wpa-cli/install
$(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/ $(CP) $(PKG_BUILD_DIR)/wpa_cli $(1)/usr/sbin/
endef 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-supplicant))
$(eval $(call BuildPackage,wpa-cli)) $(eval $(call BuildPackage,wpa-cli))
$(eval $(call BuildPackage,wpa-passphrase))