Author: rpaulo
Date: Sun Jun 13 20:32:04 2010
New Revision: 209139
URL: http://svn.freebsd.org/changeset/base/209139
Log:
Import wpa_supplicant & hostapd 0.6.9.
Added:
vendor/wpa/dist/hostapd/Makefile
vendor/wpa/dist/hostapd/driver_atheros.c
vendor/wpa/dist/hostapd/driver_bsd.c
vendor/wpa/dist/hostapd/driver_hostap.c
vendor/wpa/dist/hostapd/driver_madwifi.c
vendor/wpa/dist/hostapd/driver_nl80211.c
vendor/wpa/dist/hostapd/driver_none.c
vendor/wpa/dist/hostapd/driver_prism54.c
vendor/wpa/dist/hostapd/driver_test.c
vendor/wpa/dist/hostapd/driver_wired.c
vendor/wpa/dist/hostapd/prism54.h
vendor/wpa/dist/hostapd/priv_netlink.h
vendor/wpa/dist/hostapd/radiotap.c
vendor/wpa/dist/hostapd/radiotap.h
vendor/wpa/dist/hostapd/radiotap_iter.h
vendor/wpa/dist/src/common/nl80211_copy.h
vendor/wpa/dist/src/common/wireless_copy.h
vendor/wpa/dist/src/drivers/Apple80211.h
vendor/wpa/dist/src/drivers/Makefile
vendor/wpa/dist/src/drivers/MobileApple80211.c
vendor/wpa/dist/src/drivers/MobileApple80211.h
vendor/wpa/dist/src/drivers/driver_atmel.c
vendor/wpa/dist/src/drivers/driver_broadcom.c
vendor/wpa/dist/src/drivers/driver_bsd.c
vendor/wpa/dist/src/drivers/driver_hostap.c
vendor/wpa/dist/src/drivers/driver_hostap.h
vendor/wpa/dist/src/drivers/driver_iphone.m
vendor/wpa/dist/src/drivers/driver_ipw.c
vendor/wpa/dist/src/drivers/driver_madwifi.c
vendor/wpa/dist/src/drivers/driver_ndis_.c
vendor/wpa/dist/src/drivers/driver_ndiswrapper.c
vendor/wpa/dist/src/drivers/driver_nl80211.c
vendor/wpa/dist/src/drivers/driver_osx.m
vendor/wpa/dist/src/drivers/driver_prism54.c
vendor/wpa/dist/src/drivers/driver_privsep.c
vendor/wpa/dist/src/drivers/driver_ps3.c
vendor/wpa/dist/src/drivers/driver_ralink.c
vendor/wpa/dist/src/drivers/driver_ralink.h
vendor/wpa/dist/src/drivers/driver_roboswitch.c
vendor/wpa/dist/src/drivers/driver_test.c
vendor/wpa/dist/src/drivers/driver_wext.c
vendor/wpa/dist/src/drivers/driver_wext.h
vendor/wpa/dist/src/drivers/driver_wired.c
vendor/wpa/dist/src/drivers/ndis_events.c
vendor/wpa/dist/src/drivers/priv_netlink.h
vendor/wpa/dist/src/drivers/radiotap.c
vendor/wpa/dist/src/drivers/radiotap.h
vendor/wpa/dist/src/drivers/radiotap_iter.h
vendor/wpa/dist/src/l2_packet/Makefile
vendor/wpa/dist/src/l2_packet/l2_packet_freebsd.c
vendor/wpa/dist/src/l2_packet/l2_packet_linux.c
vendor/wpa/dist/src/l2_packet/l2_packet_ndis.c
vendor/wpa/dist/src/l2_packet/l2_packet_none.c
vendor/wpa/dist/src/l2_packet/l2_packet_pcap.c
vendor/wpa/dist/src/l2_packet/l2_packet_privsep.c
vendor/wpa/dist/src/l2_packet/l2_packet_winpcap.c
vendor/wpa/dist/src/utils/eloop_none.c
vendor/wpa/dist/src/utils/eloop_win.c
vendor/wpa/dist/src/utils/os_none.c
vendor/wpa/dist/src/utils/os_win32.c
vendor/wpa/dist/wpa_supplicant/Makefile
vendor/wpa/dist/wpa_supplicant/README-Windows.txt
vendor/wpa/dist/wpa_supplicant/config_winreg.c
vendor/wpa/dist/wpa_supplicant/ctrl_iface_named_pipe.c
vendor/wpa/dist/wpa_supplicant/main_none.c
vendor/wpa/dist/wpa_supplicant/main_symbian.cpp
vendor/wpa/dist/wpa_supplicant/main_winmain.c
vendor/wpa/dist/wpa_supplicant/main_winsvc.c
vendor/wpa/dist/wpa_supplicant/nmake.mak
vendor/wpa/dist/wpa_supplicant/symbian/
vendor/wpa/dist/wpa_supplicant/symbian/README.symbian
vendor/wpa/dist/wpa_supplicant/symbian/bld.inf
vendor/wpa/dist/wpa_supplicant/symbian/wpa_supplicant.mmp
vendor/wpa/dist/wpa_supplicant/vs2005/
vendor/wpa/dist/wpa_supplicant/vs2005/eapol_test/
vendor/wpa/dist/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
(contents, props changed)
vendor/wpa/dist/wpa_supplicant/vs2005/win_if_list/
vendor/wpa/dist/wpa_supplicant/vs2005/win_if_list/win_if_list.vcproj
(contents, props changed)
vendor/wpa/dist/wpa_supplicant/vs2005/wpa_cli/
vendor/wpa/dist/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj (contents,
props changed)
vendor/wpa/dist/wpa_supplicant/vs2005/wpa_passphrase/
vendor/wpa/dist/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
(contents, props changed)
vendor/wpa/dist/wpa_supplicant/vs2005/wpa_supplicant/
vendor/wpa/dist/wpa_supplicant/vs2005/wpa_supplicant.sln (contents, props
changed)
vendor/wpa/dist/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
(contents, props changed)
vendor/wpa/dist/wpa_supplicant/vs2005/wpasvc/
vendor/wpa/dist/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj (contents, props
changed)
vendor/wpa/dist/wpa_supplicant/win_example.reg (contents, props changed)
vendor/wpa/dist/wpa_supplicant/win_if_list.c
vendor/wpa/dist/wpa_supplicant/wpa_gui/
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/addinterface.cpp
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/addinterface.h
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/eventhistory.h
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/eventhistory.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/icons/
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/icons.qrc
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/icons/Makefile
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/icons/README
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/icons/wpa_gui.svg
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/icons_png.qrc
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/main.cpp
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/networkconfig.h
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/networkconfig.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/scanresults.h
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/scanresults.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/userdatarequest.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpagui.h
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpagui.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpamsg.h
vendor/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui/eventhistory.ui.h
vendor/wpa/dist/wpa_supplicant/wpa_gui/main.cpp
vendor/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui/networkconfig.ui.h
vendor/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui/scanresults.ui.h
vendor/wpa/dist/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling
(contents, props changed)
vendor/wpa/dist/wpa_supplicant/wpa_gui/userdatarequest.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui/userdatarequest.ui.h
vendor/wpa/dist/wpa_supplicant/wpa_gui/wpa_gui.pro
vendor/wpa/dist/wpa_supplicant/wpa_gui/wpagui.ui
vendor/wpa/dist/wpa_supplicant/wpa_gui/wpagui.ui.h
vendor/wpa/dist/wpa_supplicant/wpa_gui/wpamsg.h
Deleted:
vendor/wpa/dist/hostapd/.gitignore
vendor/wpa/dist/hostapd/doc/.gitignore
vendor/wpa/dist/src/common/.gitignore
vendor/wpa/dist/src/crypto/.gitignore
vendor/wpa/dist/src/eap_common/.gitignore
vendor/wpa/dist/src/eap_peer/.gitignore
vendor/wpa/dist/src/eap_server/.gitignore
vendor/wpa/dist/src/eapol_supp/.gitignore
vendor/wpa/dist/src/hlr_auc_gw/.gitignore
vendor/wpa/dist/src/radius/.gitignore
vendor/wpa/dist/src/rsn_supp/.gitignore
vendor/wpa/dist/src/tls/.gitignore
vendor/wpa/dist/src/utils/.gitignore
vendor/wpa/dist/src/wps/.gitignore
vendor/wpa/dist/wpa_supplicant/.gitignore
vendor/wpa/dist/wpa_supplicant/doc/.gitignore
vendor/wpa/dist/wpa_supplicant/doc/docbook/.gitignore
Modified:
vendor/wpa/dist/hostapd/ChangeLog
vendor/wpa/dist/hostapd/README-WPS
vendor/wpa/dist/hostapd/ap.h
vendor/wpa/dist/hostapd/beacon.c
vendor/wpa/dist/hostapd/config.c
vendor/wpa/dist/hostapd/config.h
vendor/wpa/dist/hostapd/ctrl_iface.c
vendor/wpa/dist/hostapd/drivers.c
vendor/wpa/dist/hostapd/hostapd.8
vendor/wpa/dist/hostapd/hostapd.c
vendor/wpa/dist/hostapd/hostapd.conf
vendor/wpa/dist/hostapd/hostapd_cli.1
vendor/wpa/dist/hostapd/hostapd_cli.c
vendor/wpa/dist/hostapd/hw_features.c
vendor/wpa/dist/hostapd/ieee802_11.c
vendor/wpa/dist/hostapd/ieee802_1x.c
vendor/wpa/dist/hostapd/preauth.c
vendor/wpa/dist/hostapd/wme.c
vendor/wpa/dist/hostapd/wme.h
vendor/wpa/dist/hostapd/wpa.c
vendor/wpa/dist/hostapd/wpa.h
vendor/wpa/dist/hostapd/wpa_auth_i.h
vendor/wpa/dist/hostapd/wpa_auth_ie.c
vendor/wpa/dist/hostapd/wpa_ft.c
vendor/wpa/dist/hostapd/wps_hostapd.c
vendor/wpa/dist/hostapd/wps_hostapd.h
vendor/wpa/dist/src/common/ieee802_11_common.c
vendor/wpa/dist/src/common/ieee802_11_common.h
vendor/wpa/dist/src/common/ieee802_11_defs.h
vendor/wpa/dist/src/common/version.h
vendor/wpa/dist/src/common/wpa_common.c
vendor/wpa/dist/src/crypto/crypto_cryptoapi.c
vendor/wpa/dist/src/crypto/crypto_gnutls.c
vendor/wpa/dist/src/crypto/crypto_internal.c
vendor/wpa/dist/src/crypto/dh_groups.c
vendor/wpa/dist/src/crypto/ms_funcs.c
vendor/wpa/dist/src/crypto/rc4.c
vendor/wpa/dist/src/crypto/rc4.h
vendor/wpa/dist/src/crypto/sha1.c
vendor/wpa/dist/src/crypto/sha256.c
vendor/wpa/dist/src/crypto/tls.h
vendor/wpa/dist/src/crypto/tls_gnutls.c
vendor/wpa/dist/src/crypto/tls_openssl.c
vendor/wpa/dist/src/drivers/driver.h
vendor/wpa/dist/src/drivers/driver_ndis.c
vendor/wpa/dist/src/eap_common/eap_defs.h
vendor/wpa/dist/src/eap_common/eap_fast_common.h
vendor/wpa/dist/src/eap_common/eap_tlv_common.h
vendor/wpa/dist/src/eap_peer/eap_fast.c
vendor/wpa/dist/src/eap_peer/eap_gpsk.c
vendor/wpa/dist/src/eap_peer/eap_methods.h
vendor/wpa/dist/src/eap_peer/eap_sim.c
vendor/wpa/dist/src/eap_peer/eap_tls_common.c
vendor/wpa/dist/src/eap_peer/eap_tnc.c
vendor/wpa/dist/src/eap_peer/eap_ttls.c
vendor/wpa/dist/src/eap_peer/eap_wsc.c
vendor/wpa/dist/src/eap_peer/tncc.c
vendor/wpa/dist/src/eap_server/eap.c
vendor/wpa/dist/src/eap_server/eap_fast.c
vendor/wpa/dist/src/eap_server/eap_gpsk.c
vendor/wpa/dist/src/eap_server/eap_i.h
vendor/wpa/dist/src/eap_server/eap_tls_common.c
vendor/wpa/dist/src/eap_server/eap_tnc.c
vendor/wpa/dist/src/eap_server/eap_ttls.c
vendor/wpa/dist/src/eapol_supp/eapol_supp_sm.c
vendor/wpa/dist/src/hlr_auc_gw/hlr_auc_gw.c
vendor/wpa/dist/src/radius/radius_client.c
vendor/wpa/dist/src/radius/radius_server.c
vendor/wpa/dist/src/rsn_supp/wpa.c
vendor/wpa/dist/src/rsn_supp/wpa_ft.c
vendor/wpa/dist/src/rsn_supp/wpa_i.h
vendor/wpa/dist/src/tls/rsa.c
vendor/wpa/dist/src/tls/tlsv1_client.c
vendor/wpa/dist/src/tls/tlsv1_server_read.c
vendor/wpa/dist/src/utils/base64.c
vendor/wpa/dist/src/utils/common.c
vendor/wpa/dist/src/utils/common.h
vendor/wpa/dist/src/utils/os_unix.c
vendor/wpa/dist/src/utils/wpa_debug.c
vendor/wpa/dist/src/utils/wpa_debug.h
vendor/wpa/dist/src/utils/wpabuf.c
vendor/wpa/dist/src/wps/httpread.c
vendor/wpa/dist/src/wps/wps.h
vendor/wpa/dist/src/wps/wps_attr_parse.c
vendor/wpa/dist/src/wps/wps_common.c
vendor/wpa/dist/src/wps/wps_enrollee.c
vendor/wpa/dist/src/wps/wps_i.h
vendor/wpa/dist/src/wps/wps_registrar.c
vendor/wpa/dist/src/wps/wps_upnp.c
vendor/wpa/dist/src/wps/wps_upnp_event.c
vendor/wpa/dist/src/wps/wps_upnp_i.h
vendor/wpa/dist/src/wps/wps_upnp_ssdp.c
vendor/wpa/dist/src/wps/wps_upnp_web.c
vendor/wpa/dist/wpa_supplicant/ChangeLog
vendor/wpa/dist/wpa_supplicant/README
vendor/wpa/dist/wpa_supplicant/README-WPS
vendor/wpa/dist/wpa_supplicant/ctrl_iface_dbus.c
vendor/wpa/dist/wpa_supplicant/ctrl_iface_dbus.h
vendor/wpa/dist/wpa_supplicant/ctrl_iface_dbus_handlers.c
vendor/wpa/dist/wpa_supplicant/ctrl_iface_dbus_handlers.h
vendor/wpa/dist/wpa_supplicant/ctrl_iface_unix.c
vendor/wpa/dist/wpa_supplicant/defconfig
vendor/wpa/dist/wpa_supplicant/doc/docbook/wpa_background.8
vendor/wpa/dist/wpa_supplicant/doc/docbook/wpa_cli.8
vendor/wpa/dist/wpa_supplicant/doc/docbook/wpa_gui.8
vendor/wpa/dist/wpa_supplicant/doc/docbook/wpa_passphrase.8
vendor/wpa/dist/wpa_supplicant/doc/docbook/wpa_priv.8
vendor/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.8
vendor/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
vendor/wpa/dist/wpa_supplicant/doc/porting.doxygen
vendor/wpa/dist/wpa_supplicant/eapol_test.c
vendor/wpa/dist/wpa_supplicant/events.c
vendor/wpa/dist/wpa_supplicant/mlme.c
vendor/wpa/dist/wpa_supplicant/scan.c
vendor/wpa/dist/wpa_supplicant/wpa_priv.c
vendor/wpa/dist/wpa_supplicant/wpa_supplicant.c
vendor/wpa/dist/wpa_supplicant/wpa_supplicant_i.h
vendor/wpa/dist/wpa_supplicant/wpas_glue.c
vendor/wpa/dist/wpa_supplicant/wps_supplicant.c
Modified: vendor/wpa/dist/hostapd/ChangeLog
==============================================================================
--- vendor/wpa/dist/hostapd/ChangeLog Sun Jun 13 20:29:55 2010
(r209138)
+++ vendor/wpa/dist/hostapd/ChangeLog Sun Jun 13 20:32:04 2010
(r209139)
@@ -1,5 +1,37 @@
ChangeLog for hostapd
+2010-01-12 - v0.6.10
+ * fixed SHA-256 based key derivation function to match with the
+ standard when using CCMP (for IEEE 802.11r and IEEE 802.11w)
+ (note: this breaks interoperability with previous version) [Bug 307]
+ * fixed WPS selected registrar expiration for internal PIN registrar
+ * disable PMTU discovery for RADIUS packets
+ * fixed WPS UPnP SSDP on 32-bit targets
+ * fixed WPS AP reconfiguration with drivers that do not use hostapd
+ MLME
+ * fixed RSN parameter setting for multi-BSS case
+ * added WPS workarounds for known interoperability issues with broken,
+ deployed implementation
+ * update IEEE 802.11w implementation to match with the published
+ standard
+ * fixed OpCode when proxying WSC_ACK or WSC_NACK from WPS ER
+ * fixed proxying of WSC_NACK to WPS ER
+ * fixed compilation with newer GnuTLS versions
+ * added support for defining timeout for WPS PINs
+ * fixed WPS Probe Request processing to handle missing required
+ attribute
+ * fixed PKCS#12 use with OpenSSL 1.0.0
+
+2009-03-23 - v0.6.9
+ * driver_nl80211: fixed STA accounting data collection (TX/RX bytes
+ reported correctly; TX/RX packets not yet available from kernel)
+ * fixed EAPOL/EAP reauthentication when using an external RADIUS
+ authentication server
+ * driver_prism54: fixed segmentation fault on initialization
+ * fixed TNC with EAP-TTLS
+ * fixed IEEE 802.11r key derivation function to match with the standard
+ (note: this breaks interoperability with previous version) [Bug 303]
+
2009-02-15 - v0.6.8
* increased hostapd_cli ping interval to 5 seconds and made this
configurable with a new command line options (-G<seconds>)
Added: vendor/wpa/dist/hostapd/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ vendor/wpa/dist/hostapd/Makefile Sun Jun 13 20:32:04 2010
(r209139)
@@ -0,0 +1,635 @@
+ifndef CC
+CC=gcc
+endif
+
+ifndef CFLAGS
+CFLAGS = -MMD -O2 -Wall -g
+endif
+
+# define HOSTAPD_DUMP_STATE to include SIGUSR1 handler for dumping state to
+# a file (undefine it, if you want to save in binary size)
+CFLAGS += -DHOSTAPD_DUMP_STATE
+
+CFLAGS += -I../src
+CFLAGS += -I../src/crypto
+CFLAGS += -I../src/utils
+CFLAGS += -I../src/common
+
+# Uncomment following line and set the path to your kernel tree include
+# directory if your C library does not include all header files.
+# CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include
+
+-include .config
+
+ifndef CONFIG_OS
+ifdef CONFIG_NATIVE_WINDOWS
+CONFIG_OS=win32
+else
+CONFIG_OS=unix
+endif
+endif
+
+ifeq ($(CONFIG_OS), internal)
+CFLAGS += -DOS_NO_C_LIB_DEFINES
+endif
+
+ifdef CONFIG_NATIVE_WINDOWS
+CFLAGS += -DCONFIG_NATIVE_WINDOWS
+LIBS += -lws2_32
+endif
+
+OBJS = hostapd.o ieee802_1x.o eapol_sm.o \
+ ieee802_11.o config.o ieee802_11_auth.o accounting.o \
+ sta_info.o wpa.o ctrl_iface.o \
+ drivers.o preauth.o pmksa_cache.o beacon.o \
+ hw_features.o wme.o ap_list.o \
+ mlme.o vlan_init.o wpa_auth_ie.o
+
+OBJS += ../src/utils/eloop.o
+OBJS += ../src/utils/common.o
+OBJS += ../src/utils/wpa_debug.o
+OBJS += ../src/utils/wpabuf.o
+OBJS += ../src/utils/os_$(CONFIG_OS).o
+OBJS += ../src/utils/ip_addr.o
+
+OBJS += ../src/common/ieee802_11_common.o
+OBJS += ../src/common/wpa_common.o
+
+OBJS += ../src/radius/radius.o
+OBJS += ../src/radius/radius_client.o
+
+OBJS += ../src/crypto/md5.o
+OBJS += ../src/crypto/rc4.o
+OBJS += ../src/crypto/md4.o
+OBJS += ../src/crypto/sha1.o
+OBJS += ../src/crypto/des.o
+OBJS += ../src/crypto/aes_wrap.o
+OBJS += ../src/crypto/aes.o
+
+HOBJS=../src/hlr_auc_gw/hlr_auc_gw.o ../src/utils/common.o
../src/utils/wpa_debug.o ../src/utils/os_$(CONFIG_OS).o
../src/hlr_auc_gw/milenage.o ../src/crypto/aes_wrap.o ../src/crypto/aes.o
+
+CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX
+
+ifdef CONFIG_IAPP
+CFLAGS += -DCONFIG_IAPP
+OBJS += iapp.o
+endif
+
+ifdef CONFIG_RSN_PREAUTH
+CFLAGS += -DCONFIG_RSN_PREAUTH
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_PEERKEY
+CFLAGS += -DCONFIG_PEERKEY
+OBJS += peerkey.o
+endif
+
+ifdef CONFIG_IEEE80211W
+CFLAGS += -DCONFIG_IEEE80211W
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_IEEE80211R
+CFLAGS += -DCONFIG_IEEE80211R
+OBJS += wpa_ft.o
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_IEEE80211N
+CFLAGS += -DCONFIG_IEEE80211N
+endif
+
+ifdef CONFIG_DRIVER_HOSTAP
+CFLAGS += -DCONFIG_DRIVER_HOSTAP
+OBJS += driver_hostap.o
+endif
+
+ifdef CONFIG_DRIVER_WIRED
+CFLAGS += -DCONFIG_DRIVER_WIRED
+OBJS += driver_wired.o
+endif
+
+ifdef CONFIG_DRIVER_MADWIFI
+CFLAGS += -DCONFIG_DRIVER_MADWIFI
+OBJS += driver_madwifi.o
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_DRIVER_ATHEROS
+CFLAGS += -DCONFIG_DRIVER_ATHEROS
+OBJS += driver_atheros.o
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_DRIVER_PRISM54
+CFLAGS += -DCONFIG_DRIVER_PRISM54
+OBJS += driver_prism54.o
+endif
+
+ifdef CONFIG_DRIVER_NL80211
+CFLAGS += -DCONFIG_DRIVER_NL80211
+OBJS += driver_nl80211.o radiotap.o
+LIBS += -lnl
+ifdef CONFIG_LIBNL20
+LIBS += -lnl-genl
+CFLAGS += -DCONFIG_LIBNL20
+endif
+endif
+
+ifdef CONFIG_DRIVER_BSD
+CFLAGS += -DCONFIG_DRIVER_BSD
+OBJS += driver_bsd.o
+CONFIG_L2_PACKET=y
+CONFIG_DNET_PCAP=y
+CONFIG_L2_FREEBSD=y
+endif
+
+ifdef CONFIG_DRIVER_TEST
+CFLAGS += -DCONFIG_DRIVER_TEST
+OBJS += driver_test.o
+endif
+
+ifdef CONFIG_DRIVER_NONE
+CFLAGS += -DCONFIG_DRIVER_NONE
+OBJS += driver_none.o
+endif
+
+ifdef CONFIG_L2_PACKET
+ifdef CONFIG_DNET_PCAP
+ifdef CONFIG_L2_FREEBSD
+LIBS += -lpcap
+OBJS += ../src/l2_packet/l2_packet_freebsd.o
+else
+LIBS += -ldnet -lpcap
+OBJS += ../src/l2_packet/l2_packet_pcap.o
+endif
+else
+OBJS += ../src/l2_packet/l2_packet_linux.o
+endif
+else
+OBJS += ../src/l2_packet/l2_packet_none.o
+endif
+
+
+ifdef CONFIG_EAP_MD5
+CFLAGS += -DEAP_MD5
+OBJS += ../src/eap_server/eap_md5.o
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_TLS
+CFLAGS += -DEAP_TLS
+OBJS += ../src/eap_server/eap_tls.o
+TLS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_PEAP
+CFLAGS += -DEAP_PEAP
+OBJS += ../src/eap_server/eap_peap.o
+OBJS += ../src/eap_common/eap_peap_common.o
+TLS_FUNCS=y
+CONFIG_EAP_MSCHAPV2=y
+endif
+
+ifdef CONFIG_EAP_TTLS
+CFLAGS += -DEAP_TTLS
+OBJS += ../src/eap_server/eap_ttls.o
+TLS_FUNCS=y
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_MSCHAPV2
+CFLAGS += -DEAP_MSCHAPv2
+OBJS += ../src/eap_server/eap_mschapv2.o
+MS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_GTC
+CFLAGS += -DEAP_GTC
+OBJS += ../src/eap_server/eap_gtc.o
+endif
+
+ifdef CONFIG_EAP_SIM
+CFLAGS += -DEAP_SIM
+OBJS += ../src/eap_server/eap_sim.o
+CONFIG_EAP_SIM_COMMON=y
+endif
+
+ifdef CONFIG_EAP_AKA
+CFLAGS += -DEAP_AKA
+OBJS += ../src/eap_server/eap_aka.o
+CONFIG_EAP_SIM_COMMON=y
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_EAP_AKA_PRIME
+CFLAGS += -DEAP_AKA_PRIME
+endif
+
+ifdef CONFIG_EAP_SIM_COMMON
+OBJS += ../src/eap_common/eap_sim_common.o
+# Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be
+# replaced with another file implementating the interface specified in
+# eap_sim_db.h.
+OBJS += ../src/eap_server/eap_sim_db.o
+NEED_FIPS186_2_PRF=y
+endif
+
+ifdef CONFIG_EAP_PAX
+CFLAGS += -DEAP_PAX
+OBJS += ../src/eap_server/eap_pax.o ../src/eap_common/eap_pax_common.o
+endif
+
+ifdef CONFIG_EAP_PSK
+CFLAGS += -DEAP_PSK
+OBJS += ../src/eap_server/eap_psk.o ../src/eap_common/eap_psk_common.o
+endif
+
+ifdef CONFIG_EAP_SAKE
+CFLAGS += -DEAP_SAKE
+OBJS += ../src/eap_server/eap_sake.o ../src/eap_common/eap_sake_common.o
+endif
+
+ifdef CONFIG_EAP_GPSK
+CFLAGS += -DEAP_GPSK
+OBJS += ../src/eap_server/eap_gpsk.o ../src/eap_common/eap_gpsk_common.o
+ifdef CONFIG_EAP_GPSK_SHA256
+CFLAGS += -DEAP_GPSK_SHA256
+endif
+NEED_SHA256=y
+endif
+
+ifdef CONFIG_EAP_VENDOR_TEST
+CFLAGS += -DEAP_VENDOR_TEST
+OBJS += ../src/eap_server/eap_vendor_test.o
+endif
+
+ifdef CONFIG_EAP_FAST
+CFLAGS += -DEAP_FAST
+OBJS += ../src/eap_server/eap_fast.o
+OBJS += ../src/eap_common/eap_fast_common.o
+TLS_FUNCS=y
+NEED_T_PRF=y
+endif
+
+ifdef CONFIG_WPS
+CFLAGS += -DCONFIG_WPS -DEAP_WSC
+OBJS += ../src/utils/uuid.o
+OBJS += wps_hostapd.o
+OBJS += ../src/eap_server/eap_wsc.o ../src/eap_common/eap_wsc_common.o
+OBJS += ../src/wps/wps.o
+OBJS += ../src/wps/wps_common.o
+OBJS += ../src/wps/wps_attr_parse.o
+OBJS += ../src/wps/wps_attr_build.o
+OBJS += ../src/wps/wps_attr_process.o
+OBJS += ../src/wps/wps_dev_attr.o
+OBJS += ../src/wps/wps_enrollee.o
+OBJS += ../src/wps/wps_registrar.o
+NEED_DH_GROUPS=y
+NEED_SHA256=y
+NEED_CRYPTO=y
+NEED_BASE64=y
+
+ifdef CONFIG_WPS_UPNP
+CFLAGS += -DCONFIG_WPS_UPNP
+OBJS += ../src/wps/wps_upnp.o
+OBJS += ../src/wps/wps_upnp_ssdp.o
+OBJS += ../src/wps/wps_upnp_web.o
+OBJS += ../src/wps/wps_upnp_event.o
+OBJS += ../src/wps/httpread.o
+endif
+
+endif
+
+ifdef CONFIG_EAP_IKEV2
+CFLAGS += -DEAP_IKEV2
+OBJS += ../src/eap_server/eap_ikev2.o ../src/eap_server/ikev2.o
+OBJS += ../src/eap_common/eap_ikev2_common.o ../src/eap_common/ikev2_common.o
+NEED_DH_GROUPS=y
+NEED_DH_GROUPS_ALL=y
+endif
+
+ifdef CONFIG_EAP_TNC
+CFLAGS += -DEAP_TNC
+OBJS += ../src/eap_server/eap_tnc.o
+OBJS += ../src/eap_server/tncs.o
+NEED_BASE64=y
+ifndef CONFIG_DRIVER_BSD
+LIBS += -ldl
+endif
+endif
+
+# Basic EAP functionality is needed for EAPOL
+OBJS += ../src/eap_server/eap.o
+OBJS += ../src/eap_common/eap_common.o
+OBJS += ../src/eap_server/eap_methods.o
+OBJS += ../src/eap_server/eap_identity.o
+
+ifdef CONFIG_EAP
+CFLAGS += -DEAP_SERVER
+endif
+
+ifndef CONFIG_TLS
+CONFIG_TLS=openssl
+endif
+
+ifeq ($(CONFIG_TLS), internal)
+ifndef CONFIG_CRYPTO
+CONFIG_CRYPTO=internal
+endif
+endif
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+CFLAGS += -DCONFIG_INTERNAL_X509
+endif
+ifeq ($(CONFIG_CRYPTO), internal)
+CFLAGS += -DCONFIG_INTERNAL_X509
+endif
+
+
+ifdef TLS_FUNCS
+# Shared TLS functions (needed for EAP_TLS, EAP_PEAP, and EAP_TTLS)
+CFLAGS += -DEAP_TLS_FUNCS
+OBJS += ../src/eap_server/eap_tls_common.o
+NEED_TLS_PRF=y
+ifeq ($(CONFIG_TLS), openssl)
+OBJS += ../src/crypto/tls_openssl.o
+LIBS += -lssl -lcrypto
+LIBS_p += -lcrypto
+LIBS_h += -lcrypto
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+OBJS += ../src/crypto/tls_gnutls.o
+LIBS += -lgnutls -lgcrypt -lgpg-error
+LIBS_p += -lgcrypt
+LIBS_h += -lgcrypt
+endif
+ifdef CONFIG_GNUTLS_EXTRA
+CFLAGS += -DCONFIG_GNUTLS_EXTRA
+LIBS += -lgnutls-extra
+endif
+ifeq ($(CONFIG_TLS), internal)
+OBJS += ../src/crypto/tls_internal.o
+OBJS += ../src/tls/tlsv1_common.o ../src/tls/tlsv1_record.o
+OBJS += ../src/tls/tlsv1_cred.o ../src/tls/tlsv1_server.o
+OBJS += ../src/tls/tlsv1_server_write.o ../src/tls/tlsv1_server_read.o
+OBJS += ../src/tls/asn1.o ../src/tls/x509v3.o
+OBJS_p += ../src/tls/asn1.o
+OBJS_p += ../src/crypto/rc4.o ../src/crypto/aes_wrap.o ../src/crypto/aes.o
+NEED_BASE64=y
+CFLAGS += -DCONFIG_TLS_INTERNAL
+CFLAGS += -DCONFIG_TLS_INTERNAL_SERVER
+ifeq ($(CONFIG_CRYPTO), internal)
+ifdef CONFIG_INTERNAL_LIBTOMMATH
+CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
+else
+LIBS += -ltommath
+LIBS_p += -ltommath
+endif
+endif
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+LIBS += -ltomcrypt -ltfm
+LIBS_p += -ltomcrypt -ltfm
+endif
+endif
+NEED_CRYPTO=y
+else
+OBJS += ../src/crypto/tls_none.o
+endif
+
+ifdef CONFIG_PKCS12
+CFLAGS += -DPKCS12_FUNCS
+endif
+
+ifdef MS_FUNCS
+OBJS += ../src/crypto/ms_funcs.o
+NEED_CRYPTO=y
+endif
+
+ifdef CHAP
+OBJS += ../src/eap_common/chap.o
+endif
+
+ifdef NEED_CRYPTO
+ifndef TLS_FUNCS
+ifeq ($(CONFIG_TLS), openssl)
+LIBS += -lcrypto
+LIBS_p += -lcrypto
+LIBS_h += -lcrypto
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+LIBS += -lgcrypt
+LIBS_p += -lgcrypt
+LIBS_h += -lgcrypt
+endif
+ifeq ($(CONFIG_TLS), internal)
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+LIBS += -ltomcrypt -ltfm
+LIBS_p += -ltomcrypt -ltfm
+endif
+endif
+endif
+ifeq ($(CONFIG_TLS), openssl)
+OBJS += ../src/crypto/crypto_openssl.o
+OBJS_p += ../src/crypto/crypto_openssl.o
+HOBJS += ../src/crypto/crypto_openssl.o
+CONFIG_INTERNAL_SHA256=y
+endif
+ifeq ($(CONFIG_TLS), gnutls)
+OBJS += ../src/crypto/crypto_gnutls.o
+OBJS_p += ../src/crypto/crypto_gnutls.o
+HOBJS += ../src/crypto/crypto_gnutls.o
+CONFIG_INTERNAL_SHA256=y
+endif
+ifeq ($(CONFIG_TLS), internal)
+ifeq ($(CONFIG_CRYPTO), libtomcrypt)
+OBJS += ../src/crypto/crypto_libtomcrypt.o
+OBJS_p += ../src/crypto/crypto_libtomcrypt.o
+CONFIG_INTERNAL_SHA256=y
+endif
+ifeq ($(CONFIG_CRYPTO), internal)
+OBJS += ../src/crypto/crypto_internal.o ../src/tls/rsa.o ../src/tls/bignum.o
+OBJS_p += ../src/crypto/crypto_internal.o ../src/tls/rsa.o ../src/tls/bignum.o
+CFLAGS += -DCONFIG_CRYPTO_INTERNAL
+ifdef CONFIG_INTERNAL_LIBTOMMATH
+CFLAGS += -DCONFIG_INTERNAL_LIBTOMMATH
+ifdef CONFIG_INTERNAL_LIBTOMMATH_FAST
+CFLAGS += -DLTM_FAST
+endif
+else
+LIBS += -ltommath
+LIBS_p += -ltommath
+endif
+CONFIG_INTERNAL_AES=y
+CONFIG_INTERNAL_DES=y
+CONFIG_INTERNAL_SHA1=y
+CONFIG_INTERNAL_MD4=y
+CONFIG_INTERNAL_MD5=y
+CONFIG_INTERNAL_SHA256=y
+endif
+endif
+else
+CONFIG_INTERNAL_AES=y
+CONFIG_INTERNAL_SHA1=y
+CONFIG_INTERNAL_MD5=y
+CONFIG_INTERNAL_SHA256=y
+endif
+
+ifdef CONFIG_INTERNAL_AES
+CFLAGS += -DINTERNAL_AES
+endif
+ifdef CONFIG_INTERNAL_SHA1
+CFLAGS += -DINTERNAL_SHA1
+endif
+ifdef CONFIG_INTERNAL_SHA256
+CFLAGS += -DINTERNAL_SHA256
+endif
+ifdef CONFIG_INTERNAL_MD5
+CFLAGS += -DINTERNAL_MD5
+endif
+ifdef CONFIG_INTERNAL_MD4
+CFLAGS += -DINTERNAL_MD4
+endif
+ifdef CONFIG_INTERNAL_DES
+CFLAGS += -DINTERNAL_DES
+endif
+
+ifdef NEED_SHA256
+OBJS += ../src/crypto/sha256.o
+endif
+
+ifdef NEED_DH_GROUPS
+OBJS += ../src/crypto/dh_groups.o
+ifdef NEED_DH_GROUPS_ALL
+CFLAGS += -DALL_DH_GROUPS
+endif
+endif
+
+ifndef NEED_FIPS186_2_PRF
+CFLAGS += -DCONFIG_NO_FIPS186_2_PRF
+endif
+
+ifndef NEED_T_PRF
+CFLAGS += -DCONFIG_NO_T_PRF
+endif
+
+ifndef NEED_TLS_PRF
+CFLAGS += -DCONFIG_NO_TLS_PRF
+endif
+
+ifdef CONFIG_RADIUS_SERVER
+CFLAGS += -DRADIUS_SERVER
+OBJS += ../src/radius/radius_server.o
+endif
+
+ifdef CONFIG_IPV6
+CFLAGS += -DCONFIG_IPV6
+endif
+
+ifdef CONFIG_DRIVER_RADIUS_ACL
+CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
+endif
+
+ifdef CONFIG_FULL_DYNAMIC_VLAN
+# define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
+# and vlan interfaces for the vlan feature.
+CFLAGS += -DCONFIG_FULL_DYNAMIC_VLAN
+endif
+
+ifdef NEED_BASE64
+OBJS += ../src/utils/base64.o
+endif
+
+ifdef CONFIG_NO_STDOUT_DEBUG
+CFLAGS += -DCONFIG_NO_STDOUT_DEBUG
+endif
+
+ifdef CONFIG_NO_AES_EXTRAS
+CFLAGS += -DCONFIG_NO_AES_UNWRAP
+CFLAGS += -DCONFIG_NO_AES_CTR -DCONFIG_NO_AES_OMAC1
+CFLAGS += -DCONFIG_NO_AES_EAX -DCONFIG_NO_AES_CBC
+CFLAGS += -DCONFIG_NO_AES_DECRYPT
+CFLAGS += -DCONFIG_NO_AES_ENCRYPT_BLOCK
+endif
+
+ALL=hostapd hostapd_cli
+
+all: verify_config $(ALL)
+
+Q=@
+E=echo
+ifeq ($(V), 1)
+Q=
+E=true
+endif
+
+%.o: %.c
+ $(Q)$(CC) -c -o $@ $(CFLAGS) $<
+ @$(E) " CC " $<
+
+verify_config:
+ @if [ ! -r .config ]; then \
+ echo 'Building hostapd requires a configuration file'; \
+ echo '(.config). See README for more instructions. You can'; \
+ echo 'run "cp defconfig .config" to create an example'; \
+ echo 'configuration.'; \
+ exit 1; \
+ fi
+
+install: all
+ for i in $(ALL); do cp $$i /usr/local/bin/$$i; done
+
+hostapd: $(OBJS)
+ $(CC) -o hostapd $(OBJS) $(LIBS)
+
+OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o
+hostapd_cli: $(OBJS_c)
+ $(CC) -o hostapd_cli $(OBJS_c)
+
+NOBJS = nt_password_hash.o ../src/crypto/ms_funcs.o ../src/crypto/sha1.o
../src/crypto/rc4.o ../src/crypto/md5.o
+NOBJS += ../src/crypto/crypto_openssl.o ../src/utils/os_$(CONFIG_OS).o
+ifdef TLS_FUNCS
+LIBS_n += -lcrypto
+endif
+
+nt_password_hash: $(NOBJS)
+ $(CC) -o nt_password_hash $(NOBJS) $(LIBS_n)
+
+hlr_auc_gw: $(HOBJS)
+ $(CC) -o hlr_auc_gw $(HOBJS) $(LIBS_h)
+
+clean:
+ $(MAKE) -C ../src clean
+ rm -f core *~ *.o hostapd hostapd_cli nt_password_hash hlr_auc_gw
+ rm -f *.d
+
+%.eps: %.fig
+ fig2dev -L eps $*.fig $*.eps
+
+%.png: %.fig
+ fig2dev -L png -m 3 $*.fig | pngtopnm | pnmscale 0.4 | pnmtopng \
+ > $*.png
+
+docs-pics: doc/hostapd.png doc/hostapd.eps
+
+docs: docs-pics
+ (cd ..; doxygen hostapd/doc/doxygen.full; cd hostapd)
+ $(MAKE) -C doc/latex
+ cp doc/latex/refman.pdf hostapd-devel.pdf
+
+docs-fast: docs-pics
+ (cd ..; doxygen hostapd/doc/doxygen.fast; cd hostapd)
+
+clean-docs:
+ rm -rf doc/latex doc/html
+ rm -f doc/hostapd.{eps,png} hostapd-devel.pdf
+
+TEST_SRC_MILENAGE = ../src/hlr_auc_gw/milenage.c ../src/crypto/aes_wrap.c
../src/crypto/aes.c ../src/utils/common.c ../src/utils/wpa_debug.o
../src/utils/os_$(CONFIG_OS).c
+test-milenage: $(TEST_SRC_MILENAGE)
+ $(CC) -o test-milenage -Wall -Werror $(TEST_SRC_MILENAGE) \
+ -DTEST_MAIN_MILENAGE -I. -DINTERNAL_AES \
+ -I../src/crypto -I../src/utils
+ ./test-milenage
+ rm test-milenage
+
+-include $(OBJS:%.o=%.d)
Modified: vendor/wpa/dist/hostapd/README-WPS
==============================================================================
--- vendor/wpa/dist/hostapd/README-WPS Sun Jun 13 20:29:55 2010
(r209138)
+++ vendor/wpa/dist/hostapd/README-WPS Sun Jun 13 20:32:04 2010
(r209139)
@@ -165,10 +165,17 @@ Example command to add a PIN (12345670)
hostapd_cli wps_pin 53b63a98-d29e-4457-a2ed-094d7e6a669c 12345670
If the UUID-E is not available (e.g., Enrollee waits for the Registrar
-to be selected before connecting), wildcard UUID may be used to allow the PIN
to be used once with any UUID:
+to be selected before connecting), wildcard UUID may be used to allow
+the PIN to be used once with any UUID:
hostapd_cli wps_pin any 12345670
+To reduce likelihood of PIN being used with other devices or of
+forgetting an active PIN available for potential attackers, expiration
+time can be set for the new PIN:
+
+hostapd_cli wps_pin any 12345670 300
+
After this, the Enrollee can connect to the AP again and complete WPS
negotiation. At that point, a new, random WPA PSK is generated for the
Modified: vendor/wpa/dist/hostapd/ap.h
==============================================================================
--- vendor/wpa/dist/hostapd/ap.h Sun Jun 13 20:29:55 2010
(r209138)
+++ vendor/wpa/dist/hostapd/ap.h Sun Jun 13 20:32:04 2010
(r209139)
@@ -30,7 +30,7 @@
#define WLAN_STA_PENDING_POLL BIT(6) /* pending activity poll not ACKed */
#define WLAN_STA_SHORT_PREAMBLE BIT(7)
#define WLAN_STA_PREAUTH BIT(8)
-#define WLAN_STA_WME BIT(9)
+#define WLAN_STA_WMM BIT(9)
#define WLAN_STA_MFP BIT(10)
#define WLAN_STA_HT BIT(11)
#define WLAN_STA_WPS BIT(12)
Modified: vendor/wpa/dist/hostapd/beacon.c
==============================================================================
--- vendor/wpa/dist/hostapd/beacon.c Sun Jun 13 20:29:55 2010
(r209138)
+++ vendor/wpa/dist/hostapd/beacon.c Sun Jun 13 20:32:04 2010
(r209139)
@@ -298,8 +298,8 @@ void handle_probe_req(struct hostapd_dat
pos = hostapd_eid_wpa(hapd, pos, epos - pos, sta);
- /* Wi-Fi Wireless Multimedia Extensions */
- pos = hostapd_eid_wme(hapd, pos);
+ /* Wi-Fi Alliance WMM */
+ pos = hostapd_eid_wmm(hapd, pos);
pos = hostapd_eid_ht_capabilities_info(hapd, pos);
pos = hostapd_eid_ht_operation(hapd, pos);
@@ -395,8 +395,8 @@ void ieee802_11_set_beacon(struct hostap
tailpos = hostapd_eid_wpa(hapd, tailpos, tail + BEACON_TAIL_BUF_SIZE -
tailpos, NULL);
- /* Wi-Fi Wireless Multimedia Extensions */
- tailpos = hostapd_eid_wme(hapd, tailpos);
+ /* Wi-Fi Alliance WMM */
+ tailpos = hostapd_eid_wmm(hapd, tailpos);
#ifdef CONFIG_IEEE80211N
if (hapd->iconf->ieee80211n) {
Modified: vendor/wpa/dist/hostapd/config.c
==============================================================================
--- vendor/wpa/dist/hostapd/config.c Sun Jun 13 20:29:55 2010
(r209138)
+++ vendor/wpa/dist/hostapd/config.c Sun Jun 13 20:32:04 2010
(r209139)
@@ -201,15 +201,15 @@ static struct hostapd_config * hostapd_c
struct hostapd_config *conf;
struct hostapd_bss_config *bss;
int i;
- const int aCWmin = 15, aCWmax = 1024;
- const struct hostapd_wme_ac_params ac_bk =
+ const int aCWmin = 4, aCWmax = 10;
+ const struct hostapd_wmm_ac_params ac_bk =
{ aCWmin, aCWmax, 7, 0, 0 }; /* background traffic */
- const struct hostapd_wme_ac_params ac_be =
+ const struct hostapd_wmm_ac_params ac_be =
{ aCWmin, aCWmax, 3, 0, 0 }; /* best effort traffic */
- const struct hostapd_wme_ac_params ac_vi = /* video traffic */
- { aCWmin >> 1, aCWmin, 2, 3000 / 32, 1 };
- const struct hostapd_wme_ac_params ac_vo = /* voice traffic */
- { aCWmin >> 2, aCWmin >> 1, 2, 1500 / 32, 1 };
+ const struct hostapd_wmm_ac_params ac_vi = /* video traffic */
+ { aCWmin - 1, aCWmin, 2, 3000 / 32, 1 };
+ const struct hostapd_wmm_ac_params ac_vo = /* voice traffic */
+ { aCWmin - 2, aCWmin - 1, 2, 1500 / 32, 1 };
conf = os_zalloc(sizeof(*conf));
bss = os_zalloc(sizeof(*bss));
@@ -251,10 +251,10 @@ static struct hostapd_config * hostapd_c
for (i = 0; i < NUM_TX_QUEUES; i++)
conf->tx_queue[i].aifs = -1; /* use hw default */
- conf->wme_ac_params[0] = ac_be;
- conf->wme_ac_params[1] = ac_bk;
- conf->wme_ac_params[2] = ac_vi;
- conf->wme_ac_params[3] = ac_vo;
+ conf->wmm_ac_params[0] = ac_be;
+ conf->wmm_ac_params[1] = ac_bk;
+ conf->wmm_ac_params[2] = ac_vi;
+ conf->wmm_ac_params[3] = ac_vo;
#ifdef CONFIG_IEEE80211N
conf->ht_capab = HT_CAP_INFO_SMPS_DISABLED;
@@ -1166,14 +1166,14 @@ static int hostapd_config_tx_queue(struc
}
-static int hostapd_config_wme_ac(struct hostapd_config *conf, char *name,
- char *val)
+static int hostapd_config_wmm_ac(struct hostapd_config *conf, char *name,
+ char *val)
{
int num, v;
char *pos;
- struct hostapd_wme_ac_params *ac;
+ struct hostapd_wmm_ac_params *ac;
- /* skip 'wme_ac_' prefix */
+ /* skip 'wme_ac_' or 'wmm_ac_' prefix */
pos = name + 7;
if (os_strncmp(pos, "be_", 3) == 0) {
num = 0;
@@ -1188,11 +1188,11 @@ static int hostapd_config_wme_ac(struct
num = 3;
pos += 3;
} else {
- wpa_printf(MSG_ERROR, "Unknown wme name '%s'", pos);
+ wpa_printf(MSG_ERROR, "Unknown WMM name '%s'", pos);
return -1;
}
- ac = &conf->wme_ac_params[num];
+ ac = &conf->wmm_ac_params[num];
if (os_strcmp(pos, "aifs") == 0) {
v = atoi(val);
@@ -1221,7 +1221,7 @@ static int hostapd_config_wme_ac(struct
wpa_printf(MSG_ERROR, "Invalid txop value %d", v);
return -1;
}
- ac->txopLimit = v;
+ ac->txop_limit = v;
} else if (os_strcmp(pos, "acm") == 0) {
v = atoi(val);
if (v < 0 || v > 1) {
@@ -1230,7 +1230,7 @@ static int hostapd_config_wme_ac(struct
}
ac->admission_control_mandatory = v;
} else {
- wpa_printf(MSG_ERROR, "Unknown wme_ac_ field '%s'", pos);
+ wpa_printf(MSG_ERROR, "Unknown wmm_ac_ field '%s'", pos);
return -1;
}
@@ -1452,13 +1452,13 @@ struct hostapd_config * hostapd_config_r
} else if (os_strcmp(buf, "bridge") == 0) {
os_strlcpy(bss->bridge, pos, sizeof(bss->bridge));
} else if (os_strcmp(buf, "driver") == 0) {
- int i;
+ int j;
/* clear to get error below if setting is invalid */
conf->driver = NULL;
- for (i = 0; hostapd_drivers[i]; i++) {
- if (os_strcmp(pos, hostapd_drivers[i]->name) ==
+ for (j = 0; hostapd_drivers[j]; j++) {
+ if (os_strcmp(pos, hostapd_drivers[j]->name) ==
0) {
- conf->driver = hostapd_drivers[i];
+ conf->driver = hostapd_drivers[j];
break;
}
}
@@ -2070,11 +2070,13 @@ struct hostapd_config * hostapd_config_r
"queue item", line);
errors++;
}
- } else if (os_strcmp(buf, "wme_enabled") == 0) {
- bss->wme_enabled = atoi(pos);
- } else if (os_strncmp(buf, "wme_ac_", 7) == 0) {
- if (hostapd_config_wme_ac(conf, buf, pos)) {
- wpa_printf(MSG_ERROR, "Line %d: invalid wme "
+ } else if (os_strcmp(buf, "wme_enabled") == 0 ||
+ os_strcmp(buf, "wmm_enabled") == 0) {
+ bss->wmm_enabled = atoi(pos);
+ } else if (os_strncmp(buf, "wme_ac_", 7) == 0 ||
+ os_strncmp(buf, "wmm_ac_", 7) == 0) {
+ if (hostapd_config_wmm_ac(conf, buf, pos)) {
+ wpa_printf(MSG_ERROR, "Line %d: invalid WMM "
"ac item", line);
errors++;
}
@@ -2255,29 +2257,30 @@ struct hostapd_config * hostapd_config_r
fclose(f);
- if (bss->individual_wep_key_len == 0) {
- /* individual keys are not use; can use key idx0 for broadcast
- * keys */
- bss->broadcast_key_idx_min = 0;
- }
-
- /* Select group cipher based on the enabled pairwise cipher suites */
- pairwise = 0;
- if (bss->wpa & 1)
- pairwise |= bss->wpa_pairwise;
- if (bss->wpa & 2) {
- if (bss->rsn_pairwise == 0)
- bss->rsn_pairwise = bss->wpa_pairwise;
- pairwise |= bss->rsn_pairwise;
- }
- if (pairwise & WPA_CIPHER_TKIP)
- bss->wpa_group = WPA_CIPHER_TKIP;
- else
- bss->wpa_group = WPA_CIPHER_CCMP;
-
for (i = 0; i < conf->num_bss; i++) {
bss = &conf->bss[i];
+ if (bss->individual_wep_key_len == 0) {
+ /* individual keys are not use; can use key idx0 for
+ * broadcast keys */
+ bss->broadcast_key_idx_min = 0;
+ }
+
+ /* Select group cipher based on the enabled pairwise cipher
+ * suites */
+ pairwise = 0;
+ if (bss->wpa & 1)
+ pairwise |= bss->wpa_pairwise;
+ if (bss->wpa & 2) {
+ if (bss->rsn_pairwise == 0)
+ bss->rsn_pairwise = bss->wpa_pairwise;
+ pairwise |= bss->rsn_pairwise;
+ }
+ if (pairwise & WPA_CIPHER_TKIP)
+ bss->wpa_group = WPA_CIPHER_TKIP;
+ else
+ bss->wpa_group = WPA_CIPHER_CCMP;
+
bss->radius->auth_server = bss->radius->auth_servers;
bss->radius->acct_server = bss->radius->acct_servers;
@@ -2476,6 +2479,8 @@ void hostapd_config_free(struct hostapd_
for (i = 0; i < conf->num_bss; i++)
hostapd_config_free_bss(&conf->bss[i]);
os_free(conf->bss);
+ os_free(conf->supported_rates);
+ os_free(conf->basic_rates);
os_free(conf);
}
Modified: vendor/wpa/dist/hostapd/config.h
==============================================================================
--- vendor/wpa/dist/hostapd/config.h Sun Jun 13 20:29:55 2010
(r209138)
+++ vendor/wpa/dist/hostapd/config.h Sun Jun 13 20:32:04 2010
(r209139)
@@ -135,11 +135,11 @@ struct hostapd_tx_queue_params {
int configured;
};
-struct hostapd_wme_ac_params {
+struct hostapd_wmm_ac_params {
int cwmin;
int cwmax;
int aifs;
- int txopLimit; /* in units of 32us */
+ int txop_limit; /* in units of 32us */
int admission_control_mandatory;
};
@@ -271,7 +271,7 @@ struct hostapd_bss_config {
int ap_max_inactivity;
int ignore_broadcast_ssid;
- int wme_enabled;
+ int wmm_enabled;
struct hostapd_vlan *vlan, *vlan_tail;
@@ -371,13 +371,13 @@ struct hostapd_config {
struct hostapd_tx_queue_params tx_queue[NUM_TX_QUEUES];
/*
- * WME AC parameters, in same order as 802.1D, i.e.
+ * WMM AC parameters, in same order as 802.1D, i.e.
* 0 = BE (best effort)
* 1 = BK (background)
* 2 = VI (video)
* 3 = VO (voice)
*/
- struct hostapd_wme_ac_params wme_ac_params[4];
+ struct hostapd_wmm_ac_params wmm_ac_params[4];
enum {
INTERNAL_BRIDGE_DO_NOT_CONTROL = -1,
Modified: vendor/wpa/dist/hostapd/ctrl_iface.c
==============================================================================
--- vendor/wpa/dist/hostapd/ctrl_iface.c Sun Jun 13 20:29:55 2010
(r209138)
+++ vendor/wpa/dist/hostapd/ctrl_iface.c Sun Jun 13 20:32:04 2010
(r209139)
@@ -18,6 +18,7 @@
#include <sys/un.h>
#include <sys/stat.h>
+#include <stddef.h>
#include "hostapd.h"
#include "eloop.h"
@@ -60,7 +61,8 @@ static int hostapd_ctrl_iface_attach(str
dst->next = hapd->ctrl_dst;
hapd->ctrl_dst = dst;
wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor attached",
- (u8 *) from->sun_path, fromlen);
+ (u8 *) from->sun_path,
+ fromlen - offsetof(struct sockaddr_un, sun_path));
return 0;
}
@@ -74,15 +76,18 @@ static int hostapd_ctrl_iface_detach(str
dst = hapd->ctrl_dst;
while (dst) {
if (fromlen == dst->addrlen &&
- os_memcmp(from->sun_path, dst->addr.sun_path, fromlen) ==
- 0) {
+ os_memcmp(from->sun_path, dst->addr.sun_path,
+ fromlen - offsetof(struct sockaddr_un, sun_path))
+ == 0) {
if (prev == NULL)
hapd->ctrl_dst = dst->next;
else
prev->next = dst->next;
os_free(dst);
wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor detached",
- (u8 *) from->sun_path, fromlen);
+ (u8 *) from->sun_path,
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
