svn commit: r214734 - in head/contrib/wpa: hostapd hostapd/logwatch patches src src/ap src/common src/crypto src/drivers src/eap_common src/eap_peer src/eap_server src/eapol_auth src/eapol_supp src...

Wed Nov 3 10:43:39 UTC 2010

Author: rpaulo
Date: Wed Nov  3 10:43:38 2010
New Revision: 214734
URL: http://svn.freebsd.org/changeset/base/214734

Log:
  Merge wpa_supplicant and hostapd 0.7.3.

Added:
  head/contrib/wpa/patches/
     - copied from r214505, vendor/wpa/dist/patches/
  head/contrib/wpa/src/ap/
     - copied from r214505, vendor/wpa/dist/src/ap/
  head/contrib/wpa/src/crypto/.gitignore
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/.gitignore
  head/contrib/wpa/src/crypto/aes-cbc.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-cbc.c
  head/contrib/wpa/src/crypto/aes-ctr.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-ctr.c
  head/contrib/wpa/src/crypto/aes-eax.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-eax.c
  head/contrib/wpa/src/crypto/aes-encblock.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-encblock.c
  head/contrib/wpa/src/crypto/aes-internal-dec.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-internal-dec.c
  head/contrib/wpa/src/crypto/aes-internal-enc.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-internal-enc.c
  head/contrib/wpa/src/crypto/aes-internal.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-internal.c
  head/contrib/wpa/src/crypto/aes-omac1.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-omac1.c
  head/contrib/wpa/src/crypto/aes-unwrap.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-unwrap.c
  head/contrib/wpa/src/crypto/aes-wrap.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes-wrap.c
  head/contrib/wpa/src/crypto/aes_i.h
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/aes_i.h
  head/contrib/wpa/src/crypto/crypto_internal-cipher.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/crypto_internal-cipher.c
  head/contrib/wpa/src/crypto/crypto_internal-modexp.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/crypto_internal-modexp.c
  head/contrib/wpa/src/crypto/crypto_internal-rsa.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/crypto_internal-rsa.c
  head/contrib/wpa/src/crypto/crypto_nss.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/crypto_nss.c
  head/contrib/wpa/src/crypto/des-internal.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/des-internal.c
  head/contrib/wpa/src/crypto/des_i.h
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/des_i.h
  head/contrib/wpa/src/crypto/dh_group5.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/dh_group5.c
  head/contrib/wpa/src/crypto/dh_group5.h
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/dh_group5.h
  head/contrib/wpa/src/crypto/fips_prf_cryptoapi.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/fips_prf_cryptoapi.c
  head/contrib/wpa/src/crypto/fips_prf_gnutls.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/fips_prf_gnutls.c
  head/contrib/wpa/src/crypto/fips_prf_internal.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/fips_prf_internal.c
  head/contrib/wpa/src/crypto/fips_prf_nss.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/fips_prf_nss.c
  head/contrib/wpa/src/crypto/fips_prf_openssl.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/fips_prf_openssl.c
  head/contrib/wpa/src/crypto/md4-internal.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/md4-internal.c
  head/contrib/wpa/src/crypto/md5-internal.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/md5-internal.c
  head/contrib/wpa/src/crypto/md5-non-fips.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/md5-non-fips.c
  head/contrib/wpa/src/crypto/md5_i.h
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/md5_i.h
  head/contrib/wpa/src/crypto/milenage.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/milenage.c
  head/contrib/wpa/src/crypto/milenage.h
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/milenage.h
  head/contrib/wpa/src/crypto/sha1-internal.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/sha1-internal.c
  head/contrib/wpa/src/crypto/sha1-pbkdf2.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/sha1-pbkdf2.c
  head/contrib/wpa/src/crypto/sha1-tlsprf.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/sha1-tlsprf.c
  head/contrib/wpa/src/crypto/sha1-tprf.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/sha1-tprf.c
  head/contrib/wpa/src/crypto/sha1_i.h
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/sha1_i.h
  head/contrib/wpa/src/crypto/sha256-internal.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/sha256-internal.c
  head/contrib/wpa/src/crypto/tls_nss.c
     - copied unchanged from r214505, vendor/wpa/dist/src/crypto/tls_nss.c
  head/contrib/wpa/src/drivers/.gitignore
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/.gitignore
  head/contrib/wpa/src/drivers/driver_atheros.c
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/driver_atheros.c
  head/contrib/wpa/src/drivers/driver_none.c
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/driver_none.c
  head/contrib/wpa/src/drivers/drivers.mak
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/drivers.mak
  head/contrib/wpa/src/drivers/linux_ioctl.c
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/linux_ioctl.c
  head/contrib/wpa/src/drivers/linux_ioctl.h
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/linux_ioctl.h
  head/contrib/wpa/src/drivers/netlink.c
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/netlink.c
  head/contrib/wpa/src/drivers/netlink.h
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/netlink.h
  head/contrib/wpa/src/drivers/nl80211_copy.h
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/nl80211_copy.h
  head/contrib/wpa/src/drivers/wireless_copy.h
     - copied unchanged from r214505, vendor/wpa/dist/src/drivers/wireless_copy.h
  head/contrib/wpa/src/eap_server/eap_server.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server.c
  head/contrib/wpa/src/eap_server/eap_server_aka.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_aka.c
  head/contrib/wpa/src/eap_server/eap_server_fast.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_fast.c
  head/contrib/wpa/src/eap_server/eap_server_gpsk.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_gpsk.c
  head/contrib/wpa/src/eap_server/eap_server_gtc.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_gtc.c
  head/contrib/wpa/src/eap_server/eap_server_identity.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_identity.c
  head/contrib/wpa/src/eap_server/eap_server_ikev2.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_ikev2.c
  head/contrib/wpa/src/eap_server/eap_server_md5.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_md5.c
  head/contrib/wpa/src/eap_server/eap_server_methods.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_methods.c
  head/contrib/wpa/src/eap_server/eap_server_mschapv2.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_mschapv2.c
  head/contrib/wpa/src/eap_server/eap_server_pax.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_pax.c
  head/contrib/wpa/src/eap_server/eap_server_peap.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_peap.c
  head/contrib/wpa/src/eap_server/eap_server_psk.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_psk.c
  head/contrib/wpa/src/eap_server/eap_server_sake.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_sake.c
  head/contrib/wpa/src/eap_server/eap_server_sim.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_sim.c
  head/contrib/wpa/src/eap_server/eap_server_tls.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_tls.c
  head/contrib/wpa/src/eap_server/eap_server_tls_common.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_tls_common.c
  head/contrib/wpa/src/eap_server/eap_server_tnc.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_tnc.c
  head/contrib/wpa/src/eap_server/eap_server_ttls.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_ttls.c
  head/contrib/wpa/src/eap_server/eap_server_vendor_test.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_vendor_test.c
  head/contrib/wpa/src/eap_server/eap_server_wsc.c
     - copied unchanged from r214505, vendor/wpa/dist/src/eap_server/eap_server_wsc.c
  head/contrib/wpa/src/eapol_auth/
     - copied from r214505, vendor/wpa/dist/src/eapol_auth/
  head/contrib/wpa/src/lib.rules
     - copied unchanged from r214505, vendor/wpa/dist/src/lib.rules
  head/contrib/wpa/src/radius/.gitignore
     - copied unchanged from r214505, vendor/wpa/dist/src/radius/.gitignore
  head/contrib/wpa/src/tls/.gitignore
     - copied unchanged from r214505, vendor/wpa/dist/src/tls/.gitignore
  head/contrib/wpa/src/tls/pkcs1.c
     - copied unchanged from r214505, vendor/wpa/dist/src/tls/pkcs1.c
  head/contrib/wpa/src/tls/pkcs1.h
     - copied unchanged from r214505, vendor/wpa/dist/src/tls/pkcs1.h
  head/contrib/wpa/src/tls/pkcs5.c
     - copied unchanged from r214505, vendor/wpa/dist/src/tls/pkcs5.c
  head/contrib/wpa/src/tls/pkcs5.h
     - copied unchanged from r214505, vendor/wpa/dist/src/tls/pkcs5.h
  head/contrib/wpa/src/tls/pkcs8.c
     - copied unchanged from r214505, vendor/wpa/dist/src/tls/pkcs8.c
  head/contrib/wpa/src/tls/pkcs8.h
     - copied unchanged from r214505, vendor/wpa/dist/src/tls/pkcs8.h
  head/contrib/wpa/src/utils/.gitignore
     - copied unchanged from r214505, vendor/wpa/dist/src/utils/.gitignore
  head/contrib/wpa/src/utils/list.h
     - copied unchanged from r214505, vendor/wpa/dist/src/utils/list.h
  head/contrib/wpa/src/utils/radiotap.c
     - copied unchanged from r214505, vendor/wpa/dist/src/utils/radiotap.c
  head/contrib/wpa/src/utils/radiotap.h
     - copied unchanged from r214505, vendor/wpa/dist/src/utils/radiotap.h
  head/contrib/wpa/src/utils/radiotap_iter.h
     - copied unchanged from r214505, vendor/wpa/dist/src/utils/radiotap_iter.h
  head/contrib/wpa/src/utils/trace.c
     - copied unchanged from r214505, vendor/wpa/dist/src/utils/trace.c
  head/contrib/wpa/src/utils/trace.h
     - copied unchanged from r214505, vendor/wpa/dist/src/utils/trace.h
  head/contrib/wpa/src/wps/http.h
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/http.h
  head/contrib/wpa/src/wps/http_client.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/http_client.c
  head/contrib/wpa/src/wps/http_client.h
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/http_client.h
  head/contrib/wpa/src/wps/http_server.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/http_server.c
  head/contrib/wpa/src/wps/http_server.h
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/http_server.h
  head/contrib/wpa/src/wps/ndef.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/ndef.c
  head/contrib/wpa/src/wps/upnp_xml.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/upnp_xml.c
  head/contrib/wpa/src/wps/upnp_xml.h
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/upnp_xml.h
  head/contrib/wpa/src/wps/wps_er.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/wps_er.c
  head/contrib/wpa/src/wps/wps_er.h
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/wps_er.h
  head/contrib/wpa/src/wps/wps_er_ssdp.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/wps_er_ssdp.c
  head/contrib/wpa/src/wps/wps_nfc.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/wps_nfc.c
  head/contrib/wpa/src/wps/wps_nfc_pn531.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/wps_nfc_pn531.c
  head/contrib/wpa/src/wps/wps_ufd.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/wps_ufd.c
  head/contrib/wpa/src/wps/wps_upnp_ap.c
     - copied unchanged from r214505, vendor/wpa/dist/src/wps/wps_upnp_ap.c
  head/contrib/wpa/wpa_supplicant/.gitignore
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/.gitignore
  head/contrib/wpa/wpa_supplicant/ap.c
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/ap.c
  head/contrib/wpa/wpa_supplicant/ap.h
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/ap.h
  head/contrib/wpa/wpa_supplicant/bgscan.c
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/bgscan.c
  head/contrib/wpa/wpa_supplicant/bgscan.h
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/bgscan.h
  head/contrib/wpa/wpa_supplicant/bgscan_simple.c
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/bgscan_simple.c
  head/contrib/wpa/wpa_supplicant/bss.c
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/bss.c
  head/contrib/wpa/wpa_supplicant/bss.h
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/bss.h
  head/contrib/wpa/wpa_supplicant/dbus/
     - copied from r214505, vendor/wpa/dist/wpa_supplicant/dbus/
  head/contrib/wpa/wpa_supplicant/doc/docbook/.gitignore
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/doc/docbook/.gitignore
  head/contrib/wpa/wpa_supplicant/driver_i.h
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/driver_i.h
  head/contrib/wpa/wpa_supplicant/eap_register.c
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/eap_register.c
  head/contrib/wpa/wpa_supplicant/examples/60_wpa_supplicant
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/examples/60_wpa_supplicant
  head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/examples/wpas-dbus-new-getall.py
  head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/examples/wpas-dbus-new-signals.py
  head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/examples/wpas-dbus-new-wps.py
  head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/examples/wpas-dbus-new.py
  head/contrib/wpa/wpa_supplicant/ibss_rsn.c
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/ibss_rsn.c
  head/contrib/wpa/wpa_supplicant/ibss_rsn.h
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/ibss_rsn.h
  head/contrib/wpa/wpa_supplicant/notify.c
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/notify.c
  head/contrib/wpa/wpa_supplicant/notify.h
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/notify.h
  head/contrib/wpa/wpa_supplicant/scan.h
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/scan.h
  head/contrib/wpa/wpa_supplicant/sme.c
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/sme.c
  head/contrib/wpa/wpa_supplicant/sme.h
     - copied unchanged from r214505, vendor/wpa/dist/wpa_supplicant/sme.h
  head/contrib/wpa/wpa_supplicant/xcode/
     - copied from r214505, vendor/wpa/dist/wpa_supplicant/xcode/
Replaced:
  head/contrib/wpa/hostapd/
     - copied from r214505, vendor/wpa/dist/hostapd/
  head/contrib/wpa/hostapd/ChangeLog
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/ChangeLog
  head/contrib/wpa/hostapd/Makefile
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/Makefile
  head/contrib/wpa/hostapd/README
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/README
  head/contrib/wpa/hostapd/README-WPS
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/README-WPS
  head/contrib/wpa/hostapd/ctrl_iface.c
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/ctrl_iface.c
  head/contrib/wpa/hostapd/ctrl_iface.h
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/ctrl_iface.h
  head/contrib/wpa/hostapd/defconfig
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/defconfig
  head/contrib/wpa/hostapd/eap_testing.txt
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/eap_testing.txt
  head/contrib/wpa/hostapd/hostapd.8
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd.8
  head/contrib/wpa/hostapd/hostapd.accept
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd.accept
  head/contrib/wpa/hostapd/hostapd.conf
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd.conf
  head/contrib/wpa/hostapd/hostapd.deny
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd.deny
  head/contrib/wpa/hostapd/hostapd.eap_user
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd.eap_user
  head/contrib/wpa/hostapd/hostapd.radius_clients
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd.radius_clients
  head/contrib/wpa/hostapd/hostapd.sim_db
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd.sim_db
  head/contrib/wpa/hostapd/hostapd.vlan
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd.vlan
  head/contrib/wpa/hostapd/hostapd.wpa_psk
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd.wpa_psk
  head/contrib/wpa/hostapd/hostapd_cli.1
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd_cli.1
  head/contrib/wpa/hostapd/hostapd_cli.c
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/hostapd_cli.c
  head/contrib/wpa/hostapd/logwatch/
     - copied from r214505, vendor/wpa/dist/hostapd/logwatch/
  head/contrib/wpa/hostapd/logwatch/README
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/logwatch/README
  head/contrib/wpa/hostapd/logwatch/hostapd
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/logwatch/hostapd
  head/contrib/wpa/hostapd/logwatch/hostapd.conf
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/logwatch/hostapd.conf
  head/contrib/wpa/hostapd/nt_password_hash.c
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/nt_password_hash.c
  head/contrib/wpa/hostapd/wired.conf
     - copied unchanged from r214505, vendor/wpa/dist/hostapd/wired.conf
Deleted:
  head/contrib/wpa/src/common/nl80211_copy.h
  head/contrib/wpa/src/common/wireless_copy.h
  head/contrib/wpa/src/crypto/aes.c
  head/contrib/wpa/src/crypto/aes_wrap.c
  head/contrib/wpa/src/crypto/des.c
  head/contrib/wpa/src/crypto/md4.c
  head/contrib/wpa/src/crypto/rc4.h
  head/contrib/wpa/src/drivers/radiotap.c
  head/contrib/wpa/src/drivers/radiotap.h
  head/contrib/wpa/src/drivers/radiotap_iter.h
  head/contrib/wpa/src/drivers/scan_helpers.c
  head/contrib/wpa/src/eap_server/eap.c
  head/contrib/wpa/src/eap_server/eap_aka.c
  head/contrib/wpa/src/eap_server/eap_fast.c
  head/contrib/wpa/src/eap_server/eap_gpsk.c
  head/contrib/wpa/src/eap_server/eap_gtc.c
  head/contrib/wpa/src/eap_server/eap_identity.c
  head/contrib/wpa/src/eap_server/eap_ikev2.c
  head/contrib/wpa/src/eap_server/eap_md5.c
  head/contrib/wpa/src/eap_server/eap_methods.c
  head/contrib/wpa/src/eap_server/eap_mschapv2.c
  head/contrib/wpa/src/eap_server/eap_pax.c
  head/contrib/wpa/src/eap_server/eap_peap.c
  head/contrib/wpa/src/eap_server/eap_psk.c
  head/contrib/wpa/src/eap_server/eap_sake.c
  head/contrib/wpa/src/eap_server/eap_sim.c
  head/contrib/wpa/src/eap_server/eap_tls.c
  head/contrib/wpa/src/eap_server/eap_tls_common.c
  head/contrib/wpa/src/eap_server/eap_tnc.c
  head/contrib/wpa/src/eap_server/eap_ttls.c
  head/contrib/wpa/src/eap_server/eap_vendor_test.c
  head/contrib/wpa/src/eap_server/eap_wsc.c
  head/contrib/wpa/src/hlr_auc_gw/Makefile
  head/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.c
  head/contrib/wpa/src/hlr_auc_gw/hlr_auc_gw.milenage_db
  head/contrib/wpa/src/hlr_auc_gw/milenage.c
  head/contrib/wpa/src/hlr_auc_gw/milenage.h
  head/contrib/wpa/src/tls/asn1_test.c
  head/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.c
  head/contrib/wpa/wpa_supplicant/ctrl_iface_dbus.h
  head/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.c
  head/contrib/wpa/wpa_supplicant/ctrl_iface_dbus_handlers.h
  head/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.conf
  head/contrib/wpa/wpa_supplicant/dbus-wpa_supplicant.service
  head/contrib/wpa/wpa_supplicant/dbus_dict_helpers.c
  head/contrib/wpa/wpa_supplicant/dbus_dict_helpers.h
  head/contrib/wpa/wpa_supplicant/doc/code_structure.doxygen
  head/contrib/wpa/wpa_supplicant/doc/ctrl_iface.doxygen
  head/contrib/wpa/wpa_supplicant/doc/doxygen.fast
  head/contrib/wpa/wpa_supplicant/doc/doxygen.full
  head/contrib/wpa/wpa_supplicant/doc/driver_wrapper.doxygen
  head/contrib/wpa/wpa_supplicant/doc/eap.doxygen
  head/contrib/wpa/wpa_supplicant/doc/kerneldoc2doxygen.pl
  head/contrib/wpa/wpa_supplicant/doc/mainpage.doxygen
  head/contrib/wpa/wpa_supplicant/doc/porting.doxygen
  head/contrib/wpa/wpa_supplicant/doc/testing_tools.doxygen
  head/contrib/wpa/wpa_supplicant/doc/wpa_supplicant.fig
  head/contrib/wpa/wpa_supplicant/tests/test_aes.c
  head/contrib/wpa/wpa_supplicant/tests/test_md4.c
  head/contrib/wpa/wpa_supplicant/tests/test_md5.c
  head/contrib/wpa/wpa_supplicant/tests/test_ms_funcs.c
  head/contrib/wpa/wpa_supplicant/tests/test_sha1.c
  head/contrib/wpa/wpa_supplicant/tests/test_sha256.c
  head/contrib/wpa/wpa_supplicant/tests/test_x509v3.c
  head/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist.sh
  head/contrib/wpa/wpa_supplicant/tests/test_x509v3_nist2.sh
Modified:
  head/contrib/wpa/src/Makefile
  head/contrib/wpa/src/common/Makefile
  head/contrib/wpa/src/common/defs.h
  head/contrib/wpa/src/common/ieee802_11_common.c
  head/contrib/wpa/src/common/ieee802_11_common.h
  head/contrib/wpa/src/common/ieee802_11_defs.h
  head/contrib/wpa/src/common/privsep_commands.h
  head/contrib/wpa/src/common/version.h
  head/contrib/wpa/src/common/wpa_common.c
  head/contrib/wpa/src/common/wpa_common.h
  head/contrib/wpa/src/common/wpa_ctrl.h
  head/contrib/wpa/src/crypto/Makefile
  head/contrib/wpa/src/crypto/aes.h
  head/contrib/wpa/src/crypto/crypto.h
  head/contrib/wpa/src/crypto/crypto_cryptoapi.c
  head/contrib/wpa/src/crypto/crypto_gnutls.c
  head/contrib/wpa/src/crypto/crypto_internal.c
  head/contrib/wpa/src/crypto/crypto_libtomcrypt.c
  head/contrib/wpa/src/crypto/crypto_none.c
  head/contrib/wpa/src/crypto/crypto_openssl.c
  head/contrib/wpa/src/crypto/dh_groups.c
  head/contrib/wpa/src/crypto/md5.c
  head/contrib/wpa/src/crypto/md5.h
  head/contrib/wpa/src/crypto/ms_funcs.c
  head/contrib/wpa/src/crypto/ms_funcs.h
  head/contrib/wpa/src/crypto/rc4.c
  head/contrib/wpa/src/crypto/sha1.c
  head/contrib/wpa/src/crypto/sha1.h
  head/contrib/wpa/src/crypto/sha256.c
  head/contrib/wpa/src/crypto/tls.h
  head/contrib/wpa/src/crypto/tls_gnutls.c
  head/contrib/wpa/src/crypto/tls_internal.c
  head/contrib/wpa/src/crypto/tls_none.c
  head/contrib/wpa/src/crypto/tls_openssl.c
  head/contrib/wpa/src/crypto/tls_schannel.c
  head/contrib/wpa/src/drivers/Makefile
  head/contrib/wpa/src/drivers/driver.h
  head/contrib/wpa/src/drivers/driver_ndis.c
  head/contrib/wpa/src/drivers/driver_ndis.h
  head/contrib/wpa/src/drivers/driver_ndiswrapper.c
  head/contrib/wpa/src/drivers/driver_wired.c
  head/contrib/wpa/src/drivers/drivers.c
  head/contrib/wpa/src/eap_common/Makefile
  head/contrib/wpa/src/eap_common/chap.c
  head/contrib/wpa/src/eap_common/chap.h
  head/contrib/wpa/src/eap_common/eap_fast_common.c
  head/contrib/wpa/src/eap_common/eap_gpsk_common.c
  head/contrib/wpa/src/eap_common/eap_pax_common.c
  head/contrib/wpa/src/eap_common/eap_peap_common.c
  head/contrib/wpa/src/eap_common/eap_psk_common.c
  head/contrib/wpa/src/eap_common/eap_sake_common.c
  head/contrib/wpa/src/eap_common/eap_sim_common.c
  head/contrib/wpa/src/eap_common/eap_sim_common.h
  head/contrib/wpa/src/eap_common/ikev2_common.c
  head/contrib/wpa/src/eap_peer/Makefile
  head/contrib/wpa/src/eap_peer/eap.c
  head/contrib/wpa/src/eap_peer/eap.h
  head/contrib/wpa/src/eap_peer/eap_aka.c
  head/contrib/wpa/src/eap_peer/eap_config.h
  head/contrib/wpa/src/eap_peer/eap_fast.c
  head/contrib/wpa/src/eap_peer/eap_fast_pac.c
  head/contrib/wpa/src/eap_peer/eap_leap.c
  head/contrib/wpa/src/eap_peer/eap_md5.c
  head/contrib/wpa/src/eap_peer/eap_methods.c
  head/contrib/wpa/src/eap_peer/eap_methods.h
  head/contrib/wpa/src/eap_peer/eap_mschapv2.c
  head/contrib/wpa/src/eap_peer/eap_pax.c
  head/contrib/wpa/src/eap_peer/eap_peap.c
  head/contrib/wpa/src/eap_peer/eap_psk.c
  head/contrib/wpa/src/eap_peer/eap_sim.c
  head/contrib/wpa/src/eap_peer/eap_tls.c
  head/contrib/wpa/src/eap_peer/eap_tls_common.c
  head/contrib/wpa/src/eap_peer/eap_tls_common.h
  head/contrib/wpa/src/eap_peer/eap_tnc.c
  head/contrib/wpa/src/eap_peer/eap_ttls.c
  head/contrib/wpa/src/eap_peer/eap_wsc.c
  head/contrib/wpa/src/eap_peer/ikev2.c
  head/contrib/wpa/src/eap_peer/mschapv2.c
  head/contrib/wpa/src/eap_peer/mschapv2.h
  head/contrib/wpa/src/eap_server/Makefile
  head/contrib/wpa/src/eap_server/eap.h
  head/contrib/wpa/src/eap_server/eap_i.h
  head/contrib/wpa/src/eap_server/eap_methods.h
  head/contrib/wpa/src/eap_server/eap_sim_db.c
  head/contrib/wpa/src/eap_server/eap_sim_db.h
  head/contrib/wpa/src/eap_server/eap_tls_common.h
  head/contrib/wpa/src/eap_server/ikev2.c
  head/contrib/wpa/src/eap_server/tncs.c
  head/contrib/wpa/src/eapol_supp/Makefile
  head/contrib/wpa/src/eapol_supp/eapol_supp_sm.c
  head/contrib/wpa/src/eapol_supp/eapol_supp_sm.h
  head/contrib/wpa/src/l2_packet/Makefile
  head/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
  head/contrib/wpa/src/l2_packet/l2_packet_ndis.c
  head/contrib/wpa/src/radius/Makefile
  head/contrib/wpa/src/radius/radius.c
  head/contrib/wpa/src/radius/radius.h
  head/contrib/wpa/src/radius/radius_client.c
  head/contrib/wpa/src/radius/radius_client.h
  head/contrib/wpa/src/radius/radius_server.c
  head/contrib/wpa/src/radius/radius_server.h
  head/contrib/wpa/src/rsn_supp/Makefile
  head/contrib/wpa/src/rsn_supp/peerkey.c
  head/contrib/wpa/src/rsn_supp/pmksa_cache.c
  head/contrib/wpa/src/rsn_supp/pmksa_cache.h
  head/contrib/wpa/src/rsn_supp/preauth.c
  head/contrib/wpa/src/rsn_supp/preauth.h
  head/contrib/wpa/src/rsn_supp/wpa.c
  head/contrib/wpa/src/rsn_supp/wpa.h
  head/contrib/wpa/src/rsn_supp/wpa_ft.c
  head/contrib/wpa/src/rsn_supp/wpa_i.h
  head/contrib/wpa/src/rsn_supp/wpa_ie.c
  head/contrib/wpa/src/rsn_supp/wpa_ie.h
  head/contrib/wpa/src/tls/Makefile
  head/contrib/wpa/src/tls/asn1.c
  head/contrib/wpa/src/tls/asn1.h
  head/contrib/wpa/src/tls/rsa.c
  head/contrib/wpa/src/tls/tlsv1_client.c
  head/contrib/wpa/src/tls/tlsv1_client_read.c
  head/contrib/wpa/src/tls/tlsv1_client_write.c
  head/contrib/wpa/src/tls/tlsv1_common.h
  head/contrib/wpa/src/tls/tlsv1_cred.c
  head/contrib/wpa/src/tls/tlsv1_record.c
  head/contrib/wpa/src/tls/tlsv1_record.h
  head/contrib/wpa/src/tls/tlsv1_server.c
  head/contrib/wpa/src/tls/tlsv1_server_read.c
  head/contrib/wpa/src/tls/tlsv1_server_write.c
  head/contrib/wpa/src/tls/x509v3.c
  head/contrib/wpa/src/tls/x509v3.h
  head/contrib/wpa/src/utils/Makefile
  head/contrib/wpa/src/utils/base64.c
  head/contrib/wpa/src/utils/build_config.h
  head/contrib/wpa/src/utils/common.c
  head/contrib/wpa/src/utils/common.h
  head/contrib/wpa/src/utils/eloop.c
  head/contrib/wpa/src/utils/eloop.h
  head/contrib/wpa/src/utils/eloop_none.c
  head/contrib/wpa/src/utils/eloop_win.c
  head/contrib/wpa/src/utils/ip_addr.h
  head/contrib/wpa/src/utils/os.h
  head/contrib/wpa/src/utils/os_internal.c
  head/contrib/wpa/src/utils/os_unix.c
  head/contrib/wpa/src/utils/uuid.c
  head/contrib/wpa/src/utils/uuid.h
  head/contrib/wpa/src/utils/wpa_debug.c
  head/contrib/wpa/src/utils/wpa_debug.h
  head/contrib/wpa/src/utils/wpabuf.c
  head/contrib/wpa/src/utils/wpabuf.h
  head/contrib/wpa/src/wps/Makefile
  head/contrib/wpa/src/wps/httpread.c
  head/contrib/wpa/src/wps/httpread.h
  head/contrib/wpa/src/wps/wps.c
  head/contrib/wpa/src/wps/wps.h
  head/contrib/wpa/src/wps/wps_attr_build.c
  head/contrib/wpa/src/wps/wps_attr_parse.c
  head/contrib/wpa/src/wps/wps_attr_process.c
  head/contrib/wpa/src/wps/wps_common.c
  head/contrib/wpa/src/wps/wps_defs.h
  head/contrib/wpa/src/wps/wps_dev_attr.c
  head/contrib/wpa/src/wps/wps_enrollee.c
  head/contrib/wpa/src/wps/wps_i.h
  head/contrib/wpa/src/wps/wps_registrar.c
  head/contrib/wpa/src/wps/wps_upnp.c
  head/contrib/wpa/src/wps/wps_upnp.h
  head/contrib/wpa/src/wps/wps_upnp_event.c
  head/contrib/wpa/src/wps/wps_upnp_i.h
  head/contrib/wpa/src/wps/wps_upnp_ssdp.c
  head/contrib/wpa/src/wps/wps_upnp_web.c
  head/contrib/wpa/wpa_supplicant/ChangeLog
  head/contrib/wpa/wpa_supplicant/Makefile
  head/contrib/wpa/wpa_supplicant/README
  head/contrib/wpa/wpa_supplicant/README-WPS
  head/contrib/wpa/wpa_supplicant/config.c
  head/contrib/wpa/wpa_supplicant/config.h
  head/contrib/wpa/wpa_supplicant/config_file.c
  head/contrib/wpa/wpa_supplicant/config_ssid.h
  head/contrib/wpa/wpa_supplicant/ctrl_iface.c
  head/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c
  head/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c
  head/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c
  head/contrib/wpa/wpa_supplicant/defconfig
  head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8
  head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8
  head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8
  head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8
  head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8
  head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.8
  head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
  head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
  head/contrib/wpa/wpa_supplicant/eapol_test.c
  head/contrib/wpa/wpa_supplicant/events.c
  head/contrib/wpa/wpa_supplicant/main.c
  head/contrib/wpa/wpa_supplicant/mlme.c
  head/contrib/wpa/wpa_supplicant/mlme.h
  head/contrib/wpa/wpa_supplicant/nmake.mak
  head/contrib/wpa/wpa_supplicant/preauth_test.c
  head/contrib/wpa/wpa_supplicant/scan.c
  head/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c
  head/contrib/wpa/wpa_supplicant/tests/test_wpa.c
  head/contrib/wpa/wpa_supplicant/todo.txt
  head/contrib/wpa/wpa_supplicant/wpa_cli.c
  head/contrib/wpa/wpa_supplicant/wpa_passphrase.c
  head/contrib/wpa/wpa_supplicant/wpa_priv.c
  head/contrib/wpa/wpa_supplicant/wpa_supplicant.c
  head/contrib/wpa/wpa_supplicant/wpa_supplicant.conf
  head/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi
  head/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h
  head/contrib/wpa/wpa_supplicant/wpas_glue.c
  head/contrib/wpa/wpa_supplicant/wps_supplicant.c
  head/contrib/wpa/wpa_supplicant/wps_supplicant.h
Directory Properties:
  head/contrib/wpa/   (props changed)

Copied: head/contrib/wpa/hostapd/ChangeLog (from r214505, vendor/wpa/dist/hostapd/ChangeLog)
==============================================================================

--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/contrib/wpa/hostapd/ChangeLog	Wed Nov  3 10:43:38 2010	(r214734, copy of r214505, vendor/wpa/dist/hostapd/ChangeLog)
@@ -0,0 +1,663 @@
+ChangeLog for hostapd
+
+2010-09-07 - v0.7.3
+	* fixed re-association after WPS not initializing WPA state machine in
+	  some cases
+	* fixed WPS IE update on reconfiguration
+	* fixed WPS code not to proxy Probe Request frames for foreign SSIDs
+	* added WPS workaround for open networks and some known interop issues
+	* fixed WPS Diffie-Hellman derivation to use correct public key length
+	* fixed FT RRB messages on big endian CPUs
+	* changed WPS protection for brute force AP PIN attacks to disable AP
+	  PIN only temporarily (but with increasing time) to avoid usability
+	  issues on Label-only devices
+	* added wps_ap_pin command for more secure handling of AP PIN
+	  operations (e.g., to generate a random AP PIN and only use it for
+	  short amount of time)
+	* fixed HT STBC negotiation
+
+2010-04-18 - v0.7.2
+	* fix WPS internal Registrar use when an external Registrar is also
+	  active
+	* bsd: Cleaned up driver wrapper and added various low-level
+	  configuration options
+	* TNC: fixed issues with fragmentation
+	* EAP-TNC: add Flags field into fragment acknowledgement (needed to
+	  interoperate with other implementations; may potentially breaks
+	  compatibility with older wpa_supplicant/hostapd versions)
+	* cleaned up driver wrapper API for multi-BSS operations
+	* nl80211: fix multi-BSS and VLAN operations
+	* fix number of issues with IEEE 802.11r/FT; this version is not
+	  backwards compatible with old versions
+	* add SA Query Request processing in AP mode (IEEE 802.11w)
+	* fix IGTK PN in group rekeying (IEEE 802.11w)
+	* fix WPS PBC session overlap detection to use correct attribute
+	* hostapd_notif_Assoc() can now be called with all IEs to simplify
+	  driver wrappers
+	* work around interoperability issue with some WPS External Registrar
+	  implementations
+	* nl80211: fix WPS IE update
+	* hostapd_cli: add support for action script operations (run a script
+	  on hostapd events)
+	* fix DH padding with internal crypto code (mainly, for WPS)
+	* fix WPS association with both WPS IE and WPA/RSN IE present with
+	  driver wrappers that use hostapd MLME (e.g., nl80211)
+
+2010-01-16 - v0.7.1
+	* cleaned up driver wrapper API (struct wpa_driver_ops); the new API
+	  is not fully backwards compatible, so out-of-tree driver wrappers
+	  will need modifications
+	* cleaned up various module interfaces
+	* merge hostapd and wpa_supplicant developers' documentation into a
+	  single document
+	* fixed HT Capabilities IE with nl80211 drivers
+	* moved generic AP functionality code into src/ap
+	* WPS: handle Selected Registrar as union of info from all Registrars
+	* remove obsolte Prism54.org driver wrapper
+	* added internal debugging mechanism with backtrace support and memory
+	  allocation/freeing validation, etc. tests (CONFIG_WPA_TRACE=y)
+	* EAP-FAST server: piggyback Phase 2 start with the end of Phase 1
+	* WPS: add support for dynamically selecting whether to provision the
+	  PSK as an ASCII passphrase or PSK
+	* added support for WDS (4-address frame) mode with per-station virtual
+	  interfaces (wds_sta=1 in config file; only supported with
+	  driver=nl80211 for now)
+	* fixed WPS Probe Request processing to handle missing required
+	  attribute
+	* fixed PKCS#12 use with OpenSSL 1.0.0
+	* detect bridge interface automatically so that bridge parameter in
+	  hostapd.conf becomes optional (though, it may now be used to
+	  automatically add then WLAN interface into a bridge with
+	  driver=nl80211)
+
+2009-11-21 - v0.7.0
+	* increased hostapd_cli ping interval to 5 seconds and made this
+	  configurable with a new command line options (-G<seconds>)
+	* driver_nl80211: use Linux socket filter to improve performance
+	* added support for external Registrars with WPS (UPnP transport)
+	* 802.11n: scan for overlapping BSSes before starting 20/40 MHz channel
+	* driver_nl80211: fixed STA accounting data collection (TX/RX bytes
+	  reported correctly; TX/RX packets not yet available from kernel)
+	* added support for WPS USBA out-of-band mechanism with USB Flash
+	  Drives (UFD) (CONFIG_WPS_UFD=y)
+	* fixed EAPOL/EAP reauthentication when using an external RADIUS
+	  authentication server
+	* 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]
+	* 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]
+	* added number of code size optimizations to remove unnecessary
+	  functionality from the program binary based on build configuration
+	  (part of this automatic; part configurable with CONFIG_NO_* build
+	  options)
+	* use shared driver wrapper files with wpa_supplicant
+	* driver_nl80211: multiple updates to provide support for new Linux
+	  nl80211/mac80211 functionality
+	* updated management frame protection to use IEEE Std 802.11w-2009
+	* fixed number of small WPS issues and added workarounds to
+	  interoperate with common deployed broken implementations
+	* added some IEEE 802.11n co-existance rules to disable 40 MHz channels
+	  or modify primary/secondary channels if needed based on neighboring
+	  networks
+	* added support for NFC out-of-band mechanism with WPS
+	* added preliminary support for IEEE 802.11r RIC processing
+
+2009-01-06 - v0.6.7
+	* added support for Wi-Fi Protected Setup (WPS)
+	  (hostapd can now be configured to act as an integrated WPS Registrar
+	  and provision credentials for WPS Enrollees using PIN and PBC
+	  methods; external wireless Registrar can configure the AP, but
+	  external WLAN Manager Registrars are not supported); WPS support can
+	  be enabled by adding CONFIG_WPS=y into .config and setting the
+	  runtime configuration variables in hostapd.conf (see WPS section in
+	  the example configuration file); new hostapd_cli commands wps_pin and
+	  wps_pbc are used to configure WPS negotiation; see README-WPS for
+	  more details
+	* added IEEE 802.11n HT capability configuration (ht_capab)
+	* added support for generating Country IE based on nl80211 regulatory
+	  information (added if ieee80211d=1 in configuration)
+	* fixed WEP authentication (both Open System and Shared Key) with
+	  mac80211
+	* added support for EAP-AKA' (draft-arkko-eap-aka-kdf)
+	* added support for using driver_test over UDP socket
+	* changed EAP-GPSK to use the IANA assigned EAP method type 51
+	* updated management frame protection to use IEEE 802.11w/D7.0
+	* fixed retransmission of EAP requests if no response is received
+
+2008-11-23 - v0.6.6
+	* added a new configuration option, wpa_ptk_rekey, that can be used to
+	  enforce frequent PTK rekeying, e.g., to mitigate some attacks against
+	  TKIP deficiencies
+	* updated OpenSSL code for EAP-FAST to use an updated version of the
+	  session ticket overriding API that was included into the upstream
+	  OpenSSL 0.9.9 tree on 2008-11-15 (no additional OpenSSL patch is
+	  needed with that version anymore)
+	* changed channel flags configuration to read the information from
+	  the driver (e.g., via driver_nl80211 when using mac80211) instead of
+	  using hostapd as the source of the regulatory information (i.e.,
+	  information from CRDA is now used with mac80211); this allows 5 GHz
+	  channels to be used with hostapd (if allowed in the current
+	  regulatory domain)
+	* fixed EAP-TLS message processing for the last TLS message if it is
+	  large enough to require fragmentation (e.g., if a large Session
+	  Ticket data is included)
+	* fixed listen interval configuration for nl80211 drivers
+
+2008-11-01 - v0.6.5
+	* added support for SHA-256 as X.509 certificate digest when using the
+	  internal X.509/TLSv1 implementation
+	* fixed EAP-FAST PAC-Opaque padding (0.6.4 broke this for some peer
+	  identity lengths)
+	* fixed internal TLSv1 implementation for abbreviated handshake (used
+	  by EAP-FAST server)
+	* added support for setting VLAN ID for STAs based on local MAC ACL
+	  (accept_mac_file) as an alternative for RADIUS server-based
+	  configuration
+	* updated management frame protection to use IEEE 802.11w/D6.0
+	  (adds a new association ping to protect against unauthenticated
+	  authenticate or (re)associate request frames dropping association)
+	* added support for using SHA256-based stronger key derivation for WPA2
+	  (IEEE 802.11w)
+	* added new "driver wrapper" for RADIUS-only configuration
+	  (driver=none in hostapd.conf; CONFIG_DRIVER_NONE=y in .config)
+	* fixed WPA/RSN IE validation to verify that the proto (WPA vs. WPA2)
+	  is enabled in configuration
+	* changed EAP-FAST configuration to use separate fields for A-ID and
+	  A-ID-Info (eap_fast_a_id_info) to allow A-ID to be set to a fixed
+	  16-octet len binary value for better interoperability with some peer
+	  implementations; eap_fast_a_id is now configured as a hex string
+	* driver_nl80211: Updated to match the current Linux mac80211 AP mode
+	  configuration (wireless-testing.git and Linux kernel releases
+	  starting from 2.6.29)
+
+2008-08-10 - v0.6.4
+	* added peer identity into EAP-FAST PAC-Opaque and skip Phase 2
+	  Identity Request if identity is already known
+	* added support for EAP Sequences in EAP-FAST Phase 2
+	* added support for EAP-TNC (Trusted Network Connect)
+	  (this version implements the EAP-TNC method and EAP-TTLS/EAP-FAST
+	  changes needed to run two methods in sequence (IF-T) and the IF-IMV
+	  and IF-TNCCS interfaces from TNCS)
+	* added support for optional cryptobinding with PEAPv0
+	* added fragmentation support for EAP-TNC
+	* added support for fragmenting EAP-TTLS/PEAP/FAST Phase 2 (tunneled)
+	  data
+	* added support for opportunistic key caching (OKC)
+
+2008-02-22 - v0.6.3
+	* fixed Reassociation Response callback processing when using internal
+	  MLME (driver_{hostap,nl80211,test}.c)
+	* updated FT support to use the latest draft, IEEE 802.11r/D9.0
+	* copy optional Proxy-State attributes into RADIUS response when acting
+	  as a RADIUS authentication server
+	* fixed EAPOL state machine to handle a case in which no response is
+	  received from the RADIUS authentication server; previous version
+	  could have triggered a crash in some cases after a timeout
+	* fixed EAP-SIM/AKA realm processing to allow decorated usernames to
+	  be used
+	* added a workaround for EAP-SIM/AKA peers that include incorrect null
+	  termination in the username
+	* fixed EAP-SIM/AKA protected result indication to include AT_COUNTER
+	  attribute in notification messages only when using fast
+	  reauthentication
+	* fixed EAP-SIM Start response processing for fast reauthentication
+	  case
+	* added support for pending EAP processing in EAP-{PEAP,TTLS,FAST}
+	  phase 2 to allow EAP-SIM and EAP-AKA to be used as the Phase 2 method
+
+2008-01-01 - v0.6.2
+	* fixed EAP-SIM and EAP-AKA message parser to validate attribute
+	  lengths properly to avoid potential crash caused by invalid messages
+	* added data structure for storing allocated buffers (struct wpabuf);
+	  this does not affect hostapd usage, but many of the APIs changed
+	  and various interfaces (e.g., EAP) is not compatible with old
+	  versions
+	* added support for protecting EAP-AKA/Identity messages with
+	  AT_CHECKCODE (optional feature in RFC 4187)
+	* added support for protected result indication with AT_RESULT_IND for
+	  EAP-SIM and EAP-AKA (eap_sim_aka_result_ind=1)
+	* added support for configuring EAP-TTLS phase 2 non-EAP methods in
+	  EAP server configuration; previously all four were enabled for every
+	  phase 2 user, now all four are disabled by default and need to be
+	  enabled with new method names TTLS-PAP, TTLS-CHAP, TTLS-MSCHAP,
+	  TTLS-MSCHAPV2
+	* removed old debug printing mechanism and the related 'debug'
+	  parameter in the configuration file; debug verbosity is now set with
+	  -d (or -dd) command line arguments
+	* added support for EAP-IKEv2 (draft-tschofenig-eap-ikev2-15.txt);
+	  only shared key/password authentication is supported in this version
+
+2007-11-24 - v0.6.1
+	* added experimental, integrated TLSv1 server implementation with the
+	  needed X.509/ASN.1/RSA/bignum processing (this can be enabled by
+	  setting CONFIG_TLS=internal and CONFIG_INTERNAL_LIBTOMMATH=y in
+	  .config); this can be useful, e.g., if the target system does not
+	  have a suitable TLS library and a minimal code size is required
+	* added support for EAP-FAST server method to the integrated EAP
+	  server
+	* updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+	  draft (draft-ietf-emu-eap-gpsk-07.txt)
+	* added a new configuration parameter, rsn_pairwise, to allow different
+	  pairwise cipher suites to be enabled for WPA and RSN/WPA2
+	  (note: if wpa_pairwise differs from rsn_pairwise, the driver will
+	  either need to support this or will have to use the WPA/RSN IEs from
+	  hostapd; currently, the included madwifi and bsd driver interfaces do
+	  not have support for this)
+	* updated FT support to use the latest draft, IEEE 802.11r/D8.0
+
+2007-05-28 - v0.6.0
+	* added experimental IEEE 802.11r/D6.0 support
+	* updated EAP-SAKE to RFC 4763 and the IANA-allocated EAP type 48
+	* updated EAP-PSK to use the IANA-allocated EAP type 47
+	* fixed EAP-PSK bit ordering of the Flags field
+	* fixed configuration reloading (SIGHUP) to re-initialize WPA PSKs
+	  by reading wpa_psk_file [Bug 181]
+	* fixed EAP-TTLS AVP parser processing for too short AVP lengths
+	* fixed IPv6 connection to RADIUS accounting server
+	* updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+	  draft (draft-ietf-emu-eap-gpsk-04.txt)
+	* hlr_auc_gw: read GSM triplet file into memory and rotate through the
+	  entries instead of only using the same three triplets every time
+	  (this does not work properly with tests using multiple clients, but
+	  provides bit better triplet data for testing a single client; anyway,
+	  if a better quality triplets are needed, GSM-Milenage should be used
+	  instead of hardcoded triplet file)
+	* fixed EAP-MSCHAPv2 server to use a space between S and M parameters
+	  in Success Request [Bug 203]
+	* added support for sending EAP-AKA Notifications in error cases
+	* updated to use IEEE 802.11w/D2.0 for management frame protection
+	  (still experimental)
+	* RADIUS server: added support for processing duplicate messages
+	  (retransmissions from RADIUS client) by replying with the previous
+	  reply
+
+2006-11-24 - v0.5.6
+	* added support for configuring and controlling multiple BSSes per
+	  radio interface (bss=<ifname> in hostapd.conf); this is only
+	  available with Devicescape and test driver interfaces
+	* fixed PMKSA cache update in the end of successful RSN
+	  pre-authentication
+	* added support for dynamic VLAN configuration (i.e., selecting VLAN-ID
+	  for each STA based on RADIUS Access-Accept attributes); this requires
+	  VLAN support from the kernel driver/802.11 stack and this is
+	  currently only available with Devicescape and test driver interfaces
+	* driver_madwifi: fixed configuration of unencrypted modes (plaintext
+	  and IEEE 802.1X without WEP)
+	* removed STAKey handshake since PeerKey handshake has replaced it in
+	  IEEE 802.11ma and there are no known deployments of STAKey
+	* updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+	  draft (draft-ietf-emu-eap-gpsk-01.txt)
+	* added preliminary implementation of IEEE 802.11w/D1.0 (management
+	  frame protection)
+	  (Note: this requires driver support to work properly.)
+	  (Note2: IEEE 802.11w is an unapproved draft and subject to change.)
+	* hlr_auc_gw: added support for GSM-Milenage (for EAP-SIM)
+	* hlr_auc_gw: added support for reading per-IMSI Milenage keys and
+	  parameters from a text file to make it possible to implement proper
+	  GSM/UMTS authentication server for multiple SIM/USIM cards using
+	  EAP-SIM/EAP-AKA
+	* fixed session timeout processing with drivers that do not use
+	  ieee802_11.c (e.g., madwifi)
+
+2006-08-27 - v0.5.5
+	* added 'hostapd_cli new_sta <addr>' command for adding a new STA into
+	  hostapd (e.g., to initialize wired network authentication based on an
+	  external signal)
+	* fixed hostapd to add PMKID KDE into 4-Way Handshake Message 1 when
+	  using WPA2 even if PMKSA caching is not used
+	* added -P<pid file> argument for hostapd to write the current process
+	  id into a file
+	* added support for RADIUS Authentication Server MIB (RFC 2619)
+
+2006-06-20 - v0.5.4
+	* fixed nt_password_hash build [Bug 144]
+	* added PeerKey handshake implementation for IEEE 802.11e
+	  direct link setup (DLS) to replace STAKey handshake
+	* added support for EAP Generalized Pre-Shared Key (EAP-GPSK,
+	  draft-clancy-emu-eap-shared-secret-00.txt)
+	* fixed a segmentation fault when RSN pre-authentication was completed
+	  successfully [Bug 152]
+
+2006-04-27 - v0.5.3
+	* do not build nt_password_hash and hlr_auc_gw by default to avoid
+	  requiring a TLS library for a successful build; these programs can be
+	  build with 'make nt_password_hash' and 'make hlr_auc_gw'
+	* added a new configuration option, eapol_version, that can be used to
+	  set EAPOL version to 1 (default is 2) to work around broken client
+	  implementations that drop EAPOL frames which use version number 2
+	  [Bug 89]
+	* added support for EAP-SAKE (no EAP method number allocated yet, so
+	  this is using the same experimental type 255 as EAP-PSK)
+	* fixed EAP-MSCHAPv2 message length validation
+
+2006-03-19 - v0.5.2
+	* fixed stdarg use in hostapd_logger(): if both stdout and syslog
+	  logging was enabled, hostapd could trigger a segmentation fault in
+	  vsyslog on some CPU -- C library combinations
+	* moved HLR/AuC gateway implementation for EAP-SIM/AKA into an external
+	  program to make it easier to use for implementing real SS7 gateway;
+	  eap_sim_db is not anymore used as a file name for GSM authentication
+	  triplets; instead, it is path to UNIX domain socket that will be used
+	  to communicate with the external gateway program (e.g., hlr_auc_gw)
+	* added example HLR/AuC gateway implementation, hlr_auc_gw, that uses
+	  local information (GSM authentication triplets from a text file and
+	  hardcoded AKA authentication data); this can be used to test EAP-SIM
+	  and EAP-AKA
+	* added Milenage algorithm (example 3GPP AKA algorithm) to hlr_auc_gw
+	  to make it possible to test EAP-AKA with real USIM cards (this is
+	  disabled by default; define AKA_USE_MILENAGE when building hlr_auc_gw
+	  to enable this)
+	* driver_madwifi: added support for getting station RSN IE from
+	  madwifi-ng svn r1453 and newer; this fixes RSN that was apparently
+	  broken with earlier change (r1357) in the driver
+	* changed EAP method registration to use a dynamic list of methods
+	  instead of a static list generated at build time
+	* fixed WPA message 3/4 not to encrypt Key Data field (WPA IE)
+	  [Bug 125]
+	* added ap_max_inactivity configuration parameter
+
+2006-01-29 - v0.5.1
+	* driver_test: added better support for multiple APs and STAs by using
+	  a directory with sockets that include MAC address for each device in
+	  the name (test_socket=DIR:/tmp/test)
+	* added support for EAP expanded type (vendor specific EAP methods)
+
+2005-12-18 - v0.5.0 (beginning of 0.5.x development releases)
+	* added experimental STAKey handshake implementation for IEEE 802.11e
+	  direct link setup (DLS); note: this is disabled by default in both
+	  build and runtime configuration (can be enabled with CONFIG_STAKEY=y
+	  and stakey=1)
+	* added support for EAP methods to use callbacks to external programs
+	  by buffering a pending request and processing it after the EAP method
+	  is ready to continue
+	* improved EAP-SIM database interface to allow external request to GSM
+	  HLR/AuC without blocking hostapd process
+	* added support for using EAP-SIM pseudonyms and fast re-authentication
+	* added support for EAP-AKA in the integrated EAP authenticator
+	* added support for matching EAP identity prefixes (e.g., "1"*) in EAP
+	  user database to allow EAP-SIM/AKA selection without extra roundtrip
+	  for EAP-Nak negotiation
+	* added support for storing EAP user password as NtPasswordHash instead
+	  of plaintext password when using MSCHAP or MSCHAPv2 for
+	  authentication (hash:<16-octet hex value>); added nt_password_hash
+	  tool for hashing password to generate NtPasswordHash
+
+2005-11-20 - v0.4.7 (beginning of 0.4.x stable releases)
+	* driver_wired: fixed EAPOL sending to optionally use PAE group address
+	  as the destination instead of supplicant MAC address; this is
+	  disabled by default, but should be enabled with use_pae_group_addr=1
+	  in configuration file if the wired interface is used by only one
+	  device at the time (common switch configuration)
+	* driver_madwifi: configure driver to use TKIP countermeasures in order
+	  to get correct behavior (IEEE 802.11 association failing; previously,
+	  association succeeded, but hostpad forced disassociation immediately)
+	* driver_madwifi: added support for madwifi-ng
+
+2005-10-27 - v0.4.6
+	* added support for replacing user identity from EAP with RADIUS
+	  User-Name attribute from Access-Accept message, if that is included,
+	  for the RADIUS accounting messages (e.g., for EAP-PEAP/TTLS to get
+	  tunneled identity into accounting messages when the RADIUS server
+	  does not support better way of doing this with Class attribute)
+	* driver_madwifi: fixed EAPOL packet receive for configuration where
+	  ath# is part of a bridge interface
+	* added a configuration file and log analyzer script for logwatch
+	* fixed EAPOL state machine step function to process all state
+	  transitions before processing new events; this resolves a race
+	  condition in which EAPOL-Start message could trigger hostapd to send
+	  two EAP-Response/Identity frames to the authentication server
+
+2005-09-25 - v0.4.5
+	* added client CA list to the TLS certificate request in order to make
+	  it easier for the client to select which certificate to use
+	* added experimental support for EAP-PSK
+	* added support for WE-19 (hostap, madwifi)
+
+2005-08-21 - v0.4.4
+	* fixed build without CONFIG_RSN_PREAUTH
+	* fixed FreeBSD build
+
+2005-06-26 - v0.4.3
+	* fixed PMKSA caching to copy User-Name and Class attributes so that
+	  RADIUS accounting gets correct information
+	* start RADIUS accounting only after successful completion of WPA
+	  4-Way Handshake if WPA-PSK is used
+	* fixed PMKSA caching for the case where STA (re)associates without
+	  first disassociating
+
+2005-06-12 - v0.4.2
+	* EAP-PAX is now registered as EAP type 46
+	* fixed EAP-PAX MAC calculation
+	* fixed EAP-PAX CK and ICK key derivation
+	* renamed eap_authenticator configuration variable to eap_server to
+	  better match with RFC 3748 (EAP) terminology
+	* driver_test: added support for testing hostapd with wpa_supplicant
+	  by using test driver interface without any kernel drivers or network
+	  cards
+
+2005-05-22 - v0.4.1
+	* fixed RADIUS server initialization when only auth or acct server
+	  is configured and the other one is left empty
+	* driver_madwifi: added support for RADIUS accounting
+	* driver_madwifi: added preliminary support for compiling against 'BSD'
+	  branch of madwifi CVS tree
+	* driver_madwifi: fixed pairwise key removal to allow WPA reauth
+	  without disassociation
+	* added support for reading additional certificates from PKCS#12 files
+	  and adding them to the certificate chain
+	* fixed RADIUS Class attribute processing to only use Access-Accept
+	  packets to update Class; previously, other RADIUS authentication
+	  packets could have cleared Class attribute
+	* added support for more than one Class attribute in RADIUS packets
+	* added support for verifying certificate revocation list (CRL) when
+	  using integrated EAP authenticator for EAP-TLS; new hostapd.conf
+	  options 'check_crl'; CRL must be included in the ca_cert file for now
+
+2005-04-25 - v0.4.0 (beginning of 0.4.x development releases)
+	* added support for including network information into
+	  EAP-Request/Identity message (ASCII-0 (nul) in eap_message)
+	  (e.g., to implement draft-adrange-eap-network-discovery-07.txt)
+	* fixed a bug which caused some RSN pre-authentication cases to use
+	  freed memory and potentially crash hostapd
+	* fixed private key loading for cases where passphrase is not set
+	* added support for sending TLS alerts and aborting authentication
+	  when receiving a TLS alert
+	* fixed WPA2 to add PMKSA cache entry when using integrated EAP
+	  authenticator
+	* fixed PMKSA caching (EAP authentication was not skipped correctly
+	  with the new state machine changes from IEEE 802.1X draft)
+	* added support for RADIUS over IPv6; own_ip_addr, auth_server_addr,
+	  and acct_server_addr can now be IPv6 addresses (CONFIG_IPV6=y needs
+	  to be added to .config to include IPv6 support); for RADIUS server,
+	  radius_server_ipv6=1 needs to be set in hostapd.conf and addresses
+	  in RADIUS clients file can then use IPv6 format
+	* added experimental support for EAP-PAX
+	* replaced hostapd control interface library (hostapd_ctrl.[ch]) with
+	  the same implementation that wpa_supplicant is using (wpa_ctrl.[ch])
+
+2005-02-12 - v0.3.7 (beginning of 0.3.x stable releases)
+
+2005-01-23 - v0.3.5
+	* added support for configuring a forced PEAP version based on the
+	  Phase 1 identity
+	* fixed PEAPv1 to use tunneled EAP-Success/Failure instead of EAP-TLV
+	  to terminate authentication
+	* fixed EAP identifier duplicate processing with the new IEEE 802.1X
+	  draft
+	* clear accounting data in the driver when starting a new accounting
+	  session
+	* driver_madwifi: filter wireless events based on ifindex to allow more
+	  than one network interface to be used
+	* fixed WPA message 2/4 processing not to cancel timeout for TimeoutEvt
+	  setting if the packet does not pass MIC verification (e.g., due to
+	  incorrect PSK); previously, message 1/4 was not tried again if an
+	  invalid message 2/4 was received
+	* fixed reconfiguration of RADIUS client retransmission timer when
+	  adding a new message to the pending list; previously, timer was not
+	  updated at this point and if there was a pending message with long
+	  time for the next retry, the new message needed to wait that long for
+	  its first retry, too
+
+2005-01-09 - v0.3.4
+	* added support for configuring multiple allowed EAP types for Phase 2
+	  authentication (EAP-PEAP, EAP-TTLS)
+	* fixed EAPOL-Start processing to trigger WPA reauthentication
+	  (previously, only EAPOL authentication was done)
+
+2005-01-02 - v0.3.3
+	* added support for EAP-PEAP in the integrated EAP authenticator
+	* added support for EAP-GTC in the integrated EAP authenticator
+	* added support for configuring list of EAP methods for Phase 1 so that
+	  the integrated EAP authenticator can, e.g., use the wildcard entry
+	  for EAP-TLS and EAP-PEAP
+	* added support for EAP-TTLS in the integrated EAP authenticator
+	* added support for EAP-SIM in the integrated EAP authenticator
+	* added support for using hostapd as a RADIUS authentication server
+	  with the integrated EAP authenticator taking care of EAP
+	  authentication (new hostapd.conf options: radius_server_clients and
+	  radius_server_auth_port); this is not included in default build; use
+	  CONFIG_RADIUS_SERVER=y in .config to include
+
+2004-12-19 - v0.3.2
+	* removed 'daemonize' configuration file option since it has not really
+	  been used at all for more than year
+	* driver_madwifi: fixed group key setup and added get_ssid method
+	* added support for EAP-MSCHAPv2 in the integrated EAP authenticator
+
+2004-12-12 - v0.3.1
+	* added support for integrated EAP-TLS authentication (new hostapd.conf
+	  variables: ca_cert, server_cert, private_key, private_key_passwd);
+	  this enabled dynamic keying (WPA2/WPA/IEEE 802.1X/WEP) without
+	  external RADIUS server
+	* added support for reading PKCS#12 (PFX) files (as a replacement for
+	  PEM/DER) to get certificate and private key (CONFIG_PKCS12)
+
+2004-12-05 - v0.3.0 (beginning of 0.3.x development releases)
+	* added support for Acct-{Input,Output}-Gigawords
+	* added support for Event-Timestamp (in RADIUS Accounting-Requests)
+	* added support for RADIUS Authentication Client MIB (RFC2618)
+	* added support for RADIUS Accounting Client MIB (RFC2620)
+	* made EAP re-authentication period configurable (eap_reauth_period)
+	* fixed EAPOL reauthentication to trigger WPA/WPA2 reauthentication
+	* fixed EAPOL state machine to stop if STA is removed during
+	  eapol_sm_step(); this fixes at least one segfault triggering bug with
+	  IEEE 802.11i pre-authentication
+	* added support for multiple WPA pre-shared keys (e.g., one for each
+	  client MAC address or keys shared by a group of clients);
+	  new hostapd.conf field wpa_psk_file for setting path to a text file
+	  containing PSKs, see hostapd.wpa_psk for an example
+	* added support for multiple driver interfaces to allow hostapd to be
+	  used with other drivers
+	* added wired authenticator driver interface (driver=wired in
+	  hostapd.conf, see wired.conf for example configuration)
+	* added madwifi driver interface (driver=madwifi in hostapd.conf, see
+	  madwifi.conf for example configuration; Note: include files from
+	  madwifi project is needed for building and a configuration file,
+	  .config, needs to be created in hostapd directory with
+	  CONFIG_DRIVER_MADWIFI=y to include this driver interface in hostapd
+	  build)
+	* fixed an alignment issue that could cause SHA-1 to fail on some
+	  platforms (e.g., Intel ixp425 with a compiler that does not 32-bit
+	  align variables)
+	* fixed RADIUS reconnection after an error in sending interim
+	  accounting packets
+	* added hostapd control interface for external programs and an example
+	  CLI, hostapd_cli (like wpa_cli for wpa_supplicant)
+	* started adding dot11, dot1x, radius MIBs ('hostapd_cli mib',
+	  'hostapd_cli sta <addr>')
+	* finished update from IEEE 802.1X-2001 to IEEE 802.1X-REV (now d11)
+	* added support for strict GTK rekeying (wpa_strict_rekey in
+	  hostapd.conf)
+	* updated IAPP to use UDP port 3517 and multicast address 224.0.1.178
+	  (instead of broadcast) for IAPP ADD-notify (moved from draft 3 to
+	  IEEE 802.11F-2003)
+	* added Prism54 driver interface (driver=prism54 in hostapd.conf;
+	  note: .config needs to be created in hostapd directory with
+	  CONFIG_DRIVER_PRISM54=y to include this driver interface in hostapd
+	  build)
+	* dual-licensed hostapd (GPLv2 and BSD licenses)
+	* fixed RADIUS accounting to generate a new session id for cases where
+	  a station reassociates without first being complete deauthenticated
+	* fixed STA disassociation handler to mark next timeout state to
+	  deauthenticate the station, i.e., skip long wait for inactivity poll
+	  and extra disassociation, if the STA disassociates without
+	  deauthenticating
+	* added integrated EAP authenticator that can be used instead of
+	  external RADIUS authentication server; currently, only EAP-MD5 is
+	  supported, so this cannot yet be used for key distribution; the EAP
+	  method interface is generic, though, so adding new EAP methods should
+	  be straightforward; new hostapd.conf variables: 'eap_authenticator'
+	  and 'eap_user_file'; this obsoletes "minimal authentication server"
+	  ('minimal_eap' in hostapd.conf) which is now removed
+	* added support for FreeBSD and driver interface for the BSD net80211
+	  layer (driver=bsd in hostapd.conf and CONFIG_DRIVER_BSD=y in
+	  .config); please note that some of the required kernel mods have not
+	  yet been committed
+
+2004-07-17 - v0.2.4 (beginning of 0.2.x stable releases)
+	* fixed some accounting cases where Accounting-Start was sent when
+	  IEEE 802.1X port was being deauthorized
+
+2004-06-20 - v0.2.3
+	* modified RADIUS client to re-connect the socket in case of certain
+	  error codes that are generated when a network interface state is
+	  changes (e.g., when IP address changes or the interface is set UP)
+	* fixed couple of cases where EAPOL state for a station was freed
+	  twice causing a segfault for hostapd
+	* fixed couple of bugs in processing WPA deauthentication (freed data
+	  was used)
+
+2004-05-31 - v0.2.2
+	* fixed WPA/WPA2 group rekeying to use key index correctly (GN/GM)
+	* fixed group rekeying to send zero TSC in EAPOL-Key messages to fix
+	  cases where STAs dropped multicast frames as replay attacks
+	* added support for copying RADIUS Attribute 'Class' from
+	  authentication messages into accounting messages
+	* send canned EAP failure if RADIUS server sends Access-Reject without
+	  EAP message (previously, Supplicant was not notified in this case)
+	* fixed mixed WPA-PSK and WPA-EAP mode to work with WPA-PSK (i.e., do
+	  not start EAPOL state machines if the STA selected to use WPA-PSK)
+
+2004-05-06 - v0.2.1
+	* added WPA and IEEE 802.11i/RSN (WPA2) Authenticator functionality
+	  - based on IEEE 802.11i/D10.0 but modified to interoperate with WPA
+	    (i.e., IEEE 802.11i/D3.0)
+	  - supports WPA-only, RSN-only, and mixed WPA/RSN mode
+	  - both WPA-PSK and WPA-RADIUS/EAP are supported
+	  - PMKSA caching and pre-authentication
+	  - new hostapd.conf variables: wpa, wpa_psk, wpa_passphrase,
+	    wpa_key_mgmt, wpa_pairwise, wpa_group_rekey, wpa_gmk_rekey,
+	    rsn_preauth, rsn_preauth_interfaces
+	* fixed interim accounting to remove any pending accounting messages
+	  to the STA before sending a new one
+
+2004-02-15 - v0.2.0
+	* added support for Acct-Interim-Interval:
+	  - draft-ietf-radius-acct-interim-01.txt
+	  - use Acct-Interim-Interval attribute from Access-Accept if local
+	    'radius_acct_interim_interval' is not set
+	  - allow different update intervals for each STA
+	* fixed event loop to call signal handlers only after returning from
+	  the real signal handler
+	* reset sta->timeout_next after successful association to make sure
+	  that the previously registered inactivity timer will not remove the
+	  STA immediately (e.g., if STA deauthenticates and re-associates
+	  before the timer is triggered).
+	* added new hostapd.conf variable, nas_identifier, that can be used to
+	  add an optional RADIUS Attribute, NAS-Identifier, into authentication
+	  and accounting messages
+	* added support for Accounting-On and Accounting-Off messages
+	* fixed accounting session handling to send Accounting-Start only once
+	  per session and not to send Accounting-Stop if the session was not
+	  initialized properly
+	* fixed Accounting-Stop statistics in cases where the message was
+	  previously sent after the kernel entry for the STA (and/or IEEE
+	  802.1X data) was removed
+
+
+Note:
+
+Older changes up to and including v0.1.0 are included in the ChangeLog
+of the Host AP driver.

Copied: head/contrib/wpa/hostapd/Makefile (from r214505, vendor/wpa/dist/hostapd/Makefile)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/contrib/wpa/hostapd/Makefile	Wed Nov  3 10:43:38 2010	(r214734, copy of r214505, vendor/wpa/dist/hostapd/Makefile)
@@ -0,0 +1,791 @@
+ifndef CC
+CC=gcc
+endif
+
+ifndef CFLAGS
+CFLAGS = -MMD -O2 -Wall -g
+endif
+
+CFLAGS += -I../src
+CFLAGS += -I../src/utils
+
+# 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 += main.o
+OBJS += config_file.o
+
+OBJS += ../src/ap/hostapd.o
+OBJS += ../src/ap/wpa_auth_glue.o
+OBJS += ../src/ap/drv_callbacks.o
+OBJS += ../src/ap/ap_drv_ops.o
+OBJS += ../src/ap/utils.o
+OBJS += ../src/ap/authsrv.o
+OBJS += ../src/ap/ieee802_1x.o
+OBJS += ../src/ap/ap_config.o
+OBJS += ../src/ap/ieee802_11_auth.o
+OBJS += ../src/ap/sta_info.o
+OBJS += ../src/ap/wpa_auth.o
+OBJS += ../src/ap/tkip_countermeasures.o
+OBJS += ../src/ap/ap_mlme.o
+OBJS += ../src/ap/wpa_auth_ie.o
+OBJS += ../src/ap/preauth_auth.o
+OBJS += ../src/ap/pmksa_cache_auth.o
+
+NEED_RC4=y
+NEED_AES=y
+NEED_MD5=y
+NEED_SHA1=y
+
+OBJS += ../src/drivers/drivers.o
+CFLAGS += -DHOSTAPD
+
+ifdef CONFIG_WPA_TRACE
+CFLAGS += -DWPA_TRACE
+OBJS += ../src/utils/trace.o
+LDFLAGS += -rdynamic
+CFLAGS += -funwind-tables
+ifdef CONFIG_WPA_TRACE_BFD
+CFLAGS += -DWPA_TRACE_BFD
+LIBS += -lbfd
+LIBS_c += -lbfd
+endif
+endif
+
+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/eapol_auth/eapol_auth_sm.o
+
+
+ifndef CONFIG_NO_DUMP_STATE
+# 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
+OBJS += dump_state.o
+OBJS += ../src/eapol_auth/eapol_auth_dump.o
+endif
+
+ifdef CONFIG_NO_RADIUS
+CFLAGS += -DCONFIG_NO_RADIUS
+CONFIG_NO_ACCOUNTING=y
+else
+OBJS += ../src/radius/radius.o
+OBJS += ../src/radius/radius_client.o
+endif
+
+ifdef CONFIG_NO_ACCOUNTING
+CFLAGS += -DCONFIG_NO_ACCOUNTING
+else
+OBJS += ../src/ap/accounting.o
+endif
+
+ifdef CONFIG_NO_VLAN
+CFLAGS += -DCONFIG_NO_VLAN
+else
+OBJS += ../src/ap/vlan_init.o
+endif
+
+ifdef CONFIG_NO_CTRL_IFACE
+CFLAGS += -DCONFIG_NO_CTRL_IFACE
+else
+OBJS += ctrl_iface.o
+OBJS += ../src/ap/ctrl_iface_ap.o
+endif
+
+OBJS += ../src/crypto/md5.o
+
+CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX
+
+ifdef CONFIG_IAPP
+CFLAGS += -DCONFIG_IAPP
+OBJS += ../src/ap/iapp.o
+endif
+
+ifdef CONFIG_RSN_PREAUTH
+CFLAGS += -DCONFIG_RSN_PREAUTH
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_PEERKEY
+CFLAGS += -DCONFIG_PEERKEY
+OBJS += ../src/ap/peerkey_auth.o
+endif
+
+ifdef CONFIG_IEEE80211W
+CFLAGS += -DCONFIG_IEEE80211W
+NEED_SHA256=y
+NEED_AES_OMAC1=y
+endif
+
+ifdef CONFIG_IEEE80211R
+CFLAGS += -DCONFIG_IEEE80211R
+OBJS += ../src/ap/wpa_auth_ft.o
+NEED_SHA256=y
+NEED_AES_OMAC1=y
+NEED_AES_UNWRAP=y
+endif
+
+ifdef CONFIG_IEEE80211N
+CFLAGS += -DCONFIG_IEEE80211N
+endif
+
+include ../src/drivers/drivers.mak
+OBJS += $(DRV_AP_OBJS)
+CFLAGS += $(DRV_AP_CFLAGS)
+LDFLAGS += $(DRV_AP_LDFLAGS)
+LIBS += $(DRV_AP_LIBS)
+
+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_SERVER_MD5
+OBJS += ../src/eap_server/eap_server_md5.o
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_TLS
+CFLAGS += -DEAP_SERVER_TLS
+OBJS += ../src/eap_server/eap_server_tls.o
+TLS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_PEAP
+CFLAGS += -DEAP_SERVER_PEAP
+OBJS += ../src/eap_server/eap_server_peap.o
+OBJS += ../src/eap_common/eap_peap_common.o
+TLS_FUNCS=y
+CONFIG_EAP_MSCHAPV2=y
+endif
+
+ifdef CONFIG_EAP_TTLS
+CFLAGS += -DEAP_SERVER_TTLS
+OBJS += ../src/eap_server/eap_server_ttls.o
+TLS_FUNCS=y
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_MSCHAPV2
+CFLAGS += -DEAP_SERVER_MSCHAPV2
+OBJS += ../src/eap_server/eap_server_mschapv2.o
+MS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_GTC
+CFLAGS += -DEAP_SERVER_GTC
+OBJS += ../src/eap_server/eap_server_gtc.o
+endif
+
+ifdef CONFIG_EAP_SIM
+CFLAGS += -DEAP_SERVER_SIM
+OBJS += ../src/eap_server/eap_server_sim.o
+CONFIG_EAP_SIM_COMMON=y
+NEED_AES_CBC=y
+endif
+
+ifdef CONFIG_EAP_AKA
+CFLAGS += -DEAP_SERVER_AKA
+OBJS += ../src/eap_server/eap_server_aka.o
+CONFIG_EAP_SIM_COMMON=y
+NEED_SHA256=y
+NEED_AES_CBC=y
+endif
+
+ifdef CONFIG_EAP_AKA_PRIME
+CFLAGS += -DEAP_SERVER_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_SERVER_PAX
+OBJS += ../src/eap_server/eap_server_pax.o ../src/eap_common/eap_pax_common.o
+endif
+
+ifdef CONFIG_EAP_PSK
+CFLAGS += -DEAP_SERVER_PSK
+OBJS += ../src/eap_server/eap_server_psk.o ../src/eap_common/eap_psk_common.o
+NEED_AES_OMAC1=y
+NEED_AES_ENCBLOCK=y
+NEED_AES_EAX=y
+endif
+
+ifdef CONFIG_EAP_SAKE
+CFLAGS += -DEAP_SERVER_SAKE
+OBJS += ../src/eap_server/eap_server_sake.o ../src/eap_common/eap_sake_common.o
+endif
+
+ifdef CONFIG_EAP_GPSK
+CFLAGS += -DEAP_SERVER_GPSK
+OBJS += ../src/eap_server/eap_server_gpsk.o ../src/eap_common/eap_gpsk_common.o
+ifdef CONFIG_EAP_GPSK_SHA256
+CFLAGS += -DEAP_SERVER_GPSK_SHA256
+endif
+NEED_SHA256=y
+NEED_AES_OMAC1=y
+endif
+
+ifdef CONFIG_EAP_VENDOR_TEST
+CFLAGS += -DEAP_SERVER_VENDOR_TEST
+OBJS += ../src/eap_server/eap_server_vendor_test.o
+endif
+
+ifdef CONFIG_EAP_FAST
+CFLAGS += -DEAP_SERVER_FAST
+OBJS += ../src/eap_server/eap_server_fast.o
+OBJS += ../src/eap_common/eap_fast_common.o
+TLS_FUNCS=y
+NEED_T_PRF=y
+NEED_AES_UNWRAP=y
+endif
+
+ifdef CONFIG_WPS
+CFLAGS += -DCONFIG_WPS -DEAP_SERVER_WSC
+OBJS += ../src/utils/uuid.o
+OBJS += ../src/ap/wps_hostapd.o
+OBJS += ../src/eap_server/eap_server_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_BASE64=y
+NEED_AES_CBC=y
+NEED_MODEXP=y
+CONFIG_EAP=y
+
+ifdef CONFIG_WPS_UFD
+CFLAGS += -DCONFIG_WPS_UFD
+OBJS += ../src/wps/wps_ufd.o
+NEED_WPS_OOB=y
+endif
+
+ifdef CONFIG_WPS_NFC
+CFLAGS += -DCONFIG_WPS_NFC
+OBJS += ../src/wps/ndef.o
+OBJS += ../src/wps/wps_nfc.o
+NEED_WPS_OOB=y
+ifdef CONFIG_WPS_NFC_PN531
+PN531_PATH ?= /usr/local/src/nfc
+CFLAGS += -DCONFIG_WPS_NFC_PN531
+CFLAGS += -I${PN531_PATH}/inc
+OBJS += ../src/wps/wps_nfc_pn531.o
+LIBS += ${PN531_PATH}/lib/wpsnfc.dll
+LIBS += ${PN531_PATH}/lib/libnfc_mapping_pn53x.dll
+endif
+endif
+

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
