Date: Thu, 4 Jul 2013 21:12:58 +0000 (UTC) From: Rui Paulo <rpaulo@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r252726 - in head: contrib/wpa contrib/wpa/hostapd contrib/wpa/hostapd/logwatch contrib/wpa/patches contrib/wpa/src contrib/wpa/src/ap contrib/wpa/src/common contrib/wpa/src/crypto cont... Message-ID: <201307042112.r64LCwVc046799@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rpaulo Date: Thu Jul 4 21:12:58 2013 New Revision: 252726 URL: http://svnweb.freebsd.org/changeset/base/252726 Log: Merge hostapd / wpa_supplicant 2.0. Reviewed by: adrian (driver_bsd + usr.sbin/wpa) Added: head/contrib/wpa/hostapd/hlr_auc_gw.txt - copied unchanged from r252191, vendor/wpa/dist/hostapd/hlr_auc_gw.txt head/contrib/wpa/hostapd/hostapd.eap_user_sqlite - copied unchanged from r252191, vendor/wpa/dist/hostapd/hostapd.eap_user_sqlite head/contrib/wpa/patches/openssl-0.9.8x-tls-extensions.patch - copied unchanged from r252191, vendor/wpa/dist/patches/openssl-0.9.8x-tls-extensions.patch head/contrib/wpa/src/ap/eap_user_db.c - copied unchanged from r252191, vendor/wpa/dist/src/ap/eap_user_db.c head/contrib/wpa/src/ap/gas_serv.c - copied unchanged from r252191, vendor/wpa/dist/src/ap/gas_serv.c head/contrib/wpa/src/ap/gas_serv.h - copied unchanged from r252191, vendor/wpa/dist/src/ap/gas_serv.h head/contrib/wpa/src/ap/hs20.c - copied unchanged from r252191, vendor/wpa/dist/src/ap/hs20.c head/contrib/wpa/src/ap/hs20.h - copied unchanged from r252191, vendor/wpa/dist/src/ap/hs20.h head/contrib/wpa/src/ap/ieee802_11_shared.c - copied unchanged from r252191, vendor/wpa/dist/src/ap/ieee802_11_shared.c head/contrib/wpa/src/ap/ieee802_11_vht.c - copied unchanged from r252191, vendor/wpa/dist/src/ap/ieee802_11_vht.c head/contrib/wpa/src/ap/p2p_hostapd.c - copied unchanged from r252191, vendor/wpa/dist/src/ap/p2p_hostapd.c head/contrib/wpa/src/ap/p2p_hostapd.h - copied unchanged from r252191, vendor/wpa/dist/src/ap/p2p_hostapd.h head/contrib/wpa/src/ap/vlan_util.c - copied unchanged from r252191, vendor/wpa/dist/src/ap/vlan_util.c head/contrib/wpa/src/ap/vlan_util.h - copied unchanged from r252191, vendor/wpa/dist/src/ap/vlan_util.h head/contrib/wpa/src/ap/wnm_ap.c - copied unchanged from r252191, vendor/wpa/dist/src/ap/wnm_ap.c head/contrib/wpa/src/ap/wnm_ap.h - copied unchanged from r252191, vendor/wpa/dist/src/ap/wnm_ap.h head/contrib/wpa/src/common/gas.c - copied unchanged from r252191, vendor/wpa/dist/src/common/gas.c head/contrib/wpa/src/common/gas.h - copied unchanged from r252191, vendor/wpa/dist/src/common/gas.h head/contrib/wpa/src/crypto/aes-ccm.c - copied unchanged from r252191, vendor/wpa/dist/src/crypto/aes-ccm.c head/contrib/wpa/src/crypto/aes-gcm.c - copied unchanged from r252191, vendor/wpa/dist/src/crypto/aes-gcm.c head/contrib/wpa/src/crypto/random.c - copied unchanged from r252191, vendor/wpa/dist/src/crypto/random.c head/contrib/wpa/src/crypto/random.h - copied unchanged from r252191, vendor/wpa/dist/src/crypto/random.h head/contrib/wpa/src/crypto/sha1-prf.c - copied unchanged from r252191, vendor/wpa/dist/src/crypto/sha1-prf.c head/contrib/wpa/src/crypto/sha256-prf.c - copied unchanged from r252191, vendor/wpa/dist/src/crypto/sha256-prf.c head/contrib/wpa/src/crypto/sha256-tlsprf.c - copied unchanged from r252191, vendor/wpa/dist/src/crypto/sha256-tlsprf.c head/contrib/wpa/src/crypto/sha256_i.h - copied unchanged from r252191, vendor/wpa/dist/src/crypto/sha256_i.h head/contrib/wpa/src/drivers/android_drv.h - copied unchanged from r252191, vendor/wpa/dist/src/drivers/android_drv.h head/contrib/wpa/src/drivers/driver_bsd.c - copied, changed from r252196, vendor/wpa/dist/src/drivers/driver_bsd.c head/contrib/wpa/src/drivers/driver_common.c - copied unchanged from r252191, vendor/wpa/dist/src/drivers/driver_common.c head/contrib/wpa/src/drivers/driver_privsep.c - copied unchanged from r252385, vendor/wpa/dist/src/drivers/driver_privsep.c head/contrib/wpa/src/drivers/drivers.mk - copied unchanged from r252191, vendor/wpa/dist/src/drivers/drivers.mk head/contrib/wpa/src/drivers/linux_wext.h - copied unchanged from r252191, vendor/wpa/dist/src/drivers/linux_wext.h head/contrib/wpa/src/drivers/rfkill.c - copied unchanged from r252191, vendor/wpa/dist/src/drivers/rfkill.c head/contrib/wpa/src/drivers/rfkill.h - copied unchanged from r252191, vendor/wpa/dist/src/drivers/rfkill.h head/contrib/wpa/src/eap_common/eap_pwd_common.c - copied unchanged from r252191, vendor/wpa/dist/src/eap_common/eap_pwd_common.c head/contrib/wpa/src/eap_common/eap_pwd_common.h - copied unchanged from r252191, vendor/wpa/dist/src/eap_common/eap_pwd_common.h head/contrib/wpa/src/eap_peer/eap_pwd.c - copied unchanged from r252191, vendor/wpa/dist/src/eap_peer/eap_pwd.c head/contrib/wpa/src/eap_server/eap_server_pwd.c - copied unchanged from r252191, vendor/wpa/dist/src/eap_server/eap_server_pwd.c head/contrib/wpa/src/l2_packet/l2_packet_privsep.c - copied unchanged from r252385, vendor/wpa/dist/src/l2_packet/l2_packet_privsep.c head/contrib/wpa/src/p2p/ - copied from r252191, vendor/wpa/dist/src/p2p/ head/contrib/wpa/src/radius/radius_das.c - copied unchanged from r252191, vendor/wpa/dist/src/radius/radius_das.c head/contrib/wpa/src/radius/radius_das.h - copied unchanged from r252191, vendor/wpa/dist/src/radius/radius_das.h head/contrib/wpa/src/rsn_supp/tdls.c - copied unchanged from r252191, vendor/wpa/dist/src/rsn_supp/tdls.c head/contrib/wpa/src/utils/edit.c - copied unchanged from r252191, vendor/wpa/dist/src/utils/edit.c head/contrib/wpa/src/utils/edit.h - copied unchanged from r252191, vendor/wpa/dist/src/utils/edit.h head/contrib/wpa/src/utils/edit_readline.c - copied unchanged from r252191, vendor/wpa/dist/src/utils/edit_readline.c head/contrib/wpa/src/utils/edit_simple.c - copied unchanged from r252191, vendor/wpa/dist/src/utils/edit_simple.c head/contrib/wpa/src/utils/ext_password.c - copied unchanged from r252191, vendor/wpa/dist/src/utils/ext_password.c head/contrib/wpa/src/utils/ext_password.h - copied unchanged from r252191, vendor/wpa/dist/src/utils/ext_password.h head/contrib/wpa/src/utils/ext_password_i.h - copied unchanged from r252191, vendor/wpa/dist/src/utils/ext_password_i.h head/contrib/wpa/src/utils/ext_password_test.c - copied unchanged from r252191, vendor/wpa/dist/src/utils/ext_password_test.c head/contrib/wpa/src/wps/wps_attr_parse.h - copied unchanged from r252191, vendor/wpa/dist/src/wps/wps_attr_parse.h head/contrib/wpa/src/wps/wps_validate.c - copied unchanged from r252191, vendor/wpa/dist/src/wps/wps_validate.c head/contrib/wpa/wpa_supplicant/README-HS20 - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/README-HS20 head/contrib/wpa/wpa_supplicant/README-P2P - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/README-P2P head/contrib/wpa/wpa_supplicant/autoscan.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/autoscan.c head/contrib/wpa/wpa_supplicant/autoscan.h - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/autoscan.h head/contrib/wpa/wpa_supplicant/autoscan_exponential.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/autoscan_exponential.c head/contrib/wpa/wpa_supplicant/autoscan_periodic.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/autoscan_periodic.c head/contrib/wpa/wpa_supplicant/bgscan_learn.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/bgscan_learn.c head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_p2p.c head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_p2p.h head/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in head/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in head/contrib/wpa/wpa_supplicant/examples/dbus-listen-preq.py - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/examples/dbus-listen-preq.py head/contrib/wpa/wpa_supplicant/examples/p2p/ - copied from r252191, vendor/wpa/dist/wpa_supplicant/examples/p2p/ head/contrib/wpa/wpa_supplicant/examples/p2p-action-udhcp.sh - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/examples/p2p-action-udhcp.sh head/contrib/wpa/wpa_supplicant/examples/p2p-action.sh - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/examples/p2p-action.sh head/contrib/wpa/wpa_supplicant/examples/udhcpd-p2p.conf - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/examples/udhcpd-p2p.conf head/contrib/wpa/wpa_supplicant/examples/wps-ap-cli - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/examples/wps-ap-cli head/contrib/wpa/wpa_supplicant/examples/wps-nfc.py - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/examples/wps-nfc.py head/contrib/wpa/wpa_supplicant/gas_query.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/gas_query.c head/contrib/wpa/wpa_supplicant/gas_query.h - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/gas_query.h head/contrib/wpa/wpa_supplicant/hs20_supplicant.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/hs20_supplicant.c head/contrib/wpa/wpa_supplicant/hs20_supplicant.h - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/hs20_supplicant.h head/contrib/wpa/wpa_supplicant/interworking.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/interworking.c head/contrib/wpa/wpa_supplicant/interworking.h - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/interworking.h head/contrib/wpa/wpa_supplicant/nfc_pw_token.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/nfc_pw_token.c head/contrib/wpa/wpa_supplicant/offchannel.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/offchannel.c head/contrib/wpa/wpa_supplicant/offchannel.h - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/offchannel.h head/contrib/wpa/wpa_supplicant/p2p_supplicant.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/p2p_supplicant.c head/contrib/wpa/wpa_supplicant/p2p_supplicant.h - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/p2p_supplicant.h head/contrib/wpa/wpa_supplicant/utils/ - copied from r252191, vendor/wpa/dist/wpa_supplicant/utils/ head/contrib/wpa/wpa_supplicant/wifi_display.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/wifi_display.c head/contrib/wpa/wpa_supplicant/wifi_display.h - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/wifi_display.h head/contrib/wpa/wpa_supplicant/wnm_sta.c - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/wnm_sta.c head/contrib/wpa/wpa_supplicant/wnm_sta.h - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/wnm_sta.h head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.mk - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/wpa_supplicant_conf.mk head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.sh - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/wpa_supplicant_conf.sh head/contrib/wpa/wpa_supplicant/wpa_supplicant_template.conf - copied unchanged from r252191, vendor/wpa/dist/wpa_supplicant/wpa_supplicant_template.conf head/usr.sbin/wpa/wpa_priv/ head/usr.sbin/wpa/wpa_priv/Makefile (contents, props changed) Deleted: head/contrib/wpa/hostapd/.gitignore head/contrib/wpa/src/crypto/md5-non-fips.c head/contrib/wpa/src/drivers/driver_ndiswrapper.c head/contrib/wpa/src/wps/wps_nfc.c head/contrib/wpa/src/wps/wps_nfc_pn531.c head/contrib/wpa/src/wps/wps_ufd.c head/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service head/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service head/contrib/wpa/wpa_supplicant/mlme.c head/contrib/wpa/wpa_supplicant/mlme.h head/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi head/usr.sbin/wpa/hostapd/driver_freebsd.c head/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c Modified: head/contrib/wpa/COPYING head/contrib/wpa/README head/contrib/wpa/hostapd/ChangeLog head/contrib/wpa/hostapd/Makefile (contents, props changed) head/contrib/wpa/hostapd/README head/contrib/wpa/hostapd/README-WPS head/contrib/wpa/hostapd/config_file.c (contents, props changed) head/contrib/wpa/hostapd/config_file.h (contents, props changed) head/contrib/wpa/hostapd/ctrl_iface.c (contents, props changed) head/contrib/wpa/hostapd/ctrl_iface.h (contents, props changed) head/contrib/wpa/hostapd/defconfig head/contrib/wpa/hostapd/dump_state.c (contents, props changed) head/contrib/wpa/hostapd/dump_state.h (contents, props changed) head/contrib/wpa/hostapd/eap_register.c (contents, props changed) head/contrib/wpa/hostapd/eap_register.h (contents, props changed) head/contrib/wpa/hostapd/hlr_auc_gw.c (contents, props changed) head/contrib/wpa/hostapd/hostapd.conf (contents, props changed) head/contrib/wpa/hostapd/hostapd.eap_user head/contrib/wpa/hostapd/hostapd_cli.c (contents, props changed) head/contrib/wpa/hostapd/main.c (contents, props changed) head/contrib/wpa/hostapd/nt_password_hash.c (contents, props changed) head/contrib/wpa/src/Makefile head/contrib/wpa/src/ap/accounting.c (contents, props changed) head/contrib/wpa/src/ap/accounting.h (contents, props changed) head/contrib/wpa/src/ap/ap_config.c (contents, props changed) head/contrib/wpa/src/ap/ap_config.h (contents, props changed) head/contrib/wpa/src/ap/ap_drv_ops.c (contents, props changed) head/contrib/wpa/src/ap/ap_drv_ops.h (contents, props changed) head/contrib/wpa/src/ap/ap_list.c (contents, props changed) head/contrib/wpa/src/ap/ap_list.h (contents, props changed) head/contrib/wpa/src/ap/ap_mlme.c (contents, props changed) head/contrib/wpa/src/ap/ap_mlme.h (contents, props changed) head/contrib/wpa/src/ap/authsrv.c (contents, props changed) head/contrib/wpa/src/ap/authsrv.h (contents, props changed) head/contrib/wpa/src/ap/beacon.c (contents, props changed) head/contrib/wpa/src/ap/beacon.h (contents, props changed) head/contrib/wpa/src/ap/ctrl_iface_ap.c (contents, props changed) head/contrib/wpa/src/ap/ctrl_iface_ap.h (contents, props changed) head/contrib/wpa/src/ap/drv_callbacks.c (contents, props changed) head/contrib/wpa/src/ap/hostapd.c (contents, props changed) head/contrib/wpa/src/ap/hostapd.h (contents, props changed) head/contrib/wpa/src/ap/hw_features.c (contents, props changed) head/contrib/wpa/src/ap/hw_features.h (contents, props changed) head/contrib/wpa/src/ap/iapp.c (contents, props changed) head/contrib/wpa/src/ap/iapp.h (contents, props changed) head/contrib/wpa/src/ap/ieee802_11.c (contents, props changed) head/contrib/wpa/src/ap/ieee802_11.h (contents, props changed) head/contrib/wpa/src/ap/ieee802_11_auth.c (contents, props changed) head/contrib/wpa/src/ap/ieee802_11_auth.h (contents, props changed) head/contrib/wpa/src/ap/ieee802_11_ht.c (contents, props changed) head/contrib/wpa/src/ap/ieee802_1x.c (contents, props changed) head/contrib/wpa/src/ap/ieee802_1x.h (contents, props changed) head/contrib/wpa/src/ap/peerkey_auth.c (contents, props changed) head/contrib/wpa/src/ap/pmksa_cache_auth.c (contents, props changed) head/contrib/wpa/src/ap/pmksa_cache_auth.h (contents, props changed) head/contrib/wpa/src/ap/preauth_auth.c (contents, props changed) head/contrib/wpa/src/ap/preauth_auth.h (contents, props changed) head/contrib/wpa/src/ap/sta_info.c (contents, props changed) head/contrib/wpa/src/ap/sta_info.h (contents, props changed) head/contrib/wpa/src/ap/tkip_countermeasures.c (contents, props changed) head/contrib/wpa/src/ap/tkip_countermeasures.h (contents, props changed) head/contrib/wpa/src/ap/utils.c (contents, props changed) head/contrib/wpa/src/ap/vlan_init.c (contents, props changed) head/contrib/wpa/src/ap/wmm.c (contents, props changed) head/contrib/wpa/src/ap/wpa_auth.c (contents, props changed) head/contrib/wpa/src/ap/wpa_auth.h (contents, props changed) head/contrib/wpa/src/ap/wpa_auth_ft.c (contents, props changed) head/contrib/wpa/src/ap/wpa_auth_glue.c (contents, props changed) head/contrib/wpa/src/ap/wpa_auth_glue.h (contents, props changed) head/contrib/wpa/src/ap/wpa_auth_i.h (contents, props changed) head/contrib/wpa/src/ap/wpa_auth_ie.c (contents, props changed) head/contrib/wpa/src/ap/wpa_auth_ie.h (contents, props changed) head/contrib/wpa/src/ap/wps_hostapd.c (contents, props changed) head/contrib/wpa/src/ap/wps_hostapd.h (contents, props changed) head/contrib/wpa/src/common/defs.h head/contrib/wpa/src/common/eapol_common.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.c head/contrib/wpa/src/common/wpa_ctrl.h head/contrib/wpa/src/crypto/Makefile head/contrib/wpa/src/crypto/aes-cbc.c (contents, props changed) head/contrib/wpa/src/crypto/aes-ctr.c (contents, props changed) head/contrib/wpa/src/crypto/aes-eax.c (contents, props changed) head/contrib/wpa/src/crypto/aes-encblock.c (contents, props changed) head/contrib/wpa/src/crypto/aes-internal-dec.c (contents, props changed) head/contrib/wpa/src/crypto/aes-internal-enc.c (contents, props changed) head/contrib/wpa/src/crypto/aes-internal.c (contents, props changed) head/contrib/wpa/src/crypto/aes-omac1.c (contents, props changed) head/contrib/wpa/src/crypto/aes-unwrap.c (contents, props changed) head/contrib/wpa/src/crypto/aes-wrap.c (contents, props changed) head/contrib/wpa/src/crypto/aes.h head/contrib/wpa/src/crypto/aes_i.h (contents, props changed) head/contrib/wpa/src/crypto/aes_wrap.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-cipher.c (contents, props changed) head/contrib/wpa/src/crypto/crypto_internal-modexp.c (contents, props changed) head/contrib/wpa/src/crypto/crypto_internal-rsa.c (contents, props changed) 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_nss.c (contents, props changed) head/contrib/wpa/src/crypto/crypto_openssl.c head/contrib/wpa/src/crypto/des-internal.c (contents, props changed) head/contrib/wpa/src/crypto/des_i.h (contents, props changed) head/contrib/wpa/src/crypto/dh_group5.c (contents, props changed) head/contrib/wpa/src/crypto/dh_group5.h (contents, props changed) head/contrib/wpa/src/crypto/dh_groups.c head/contrib/wpa/src/crypto/dh_groups.h head/contrib/wpa/src/crypto/fips_prf_cryptoapi.c (contents, props changed) head/contrib/wpa/src/crypto/fips_prf_gnutls.c (contents, props changed) head/contrib/wpa/src/crypto/fips_prf_internal.c (contents, props changed) head/contrib/wpa/src/crypto/fips_prf_nss.c (contents, props changed) head/contrib/wpa/src/crypto/fips_prf_openssl.c (contents, props changed) head/contrib/wpa/src/crypto/md4-internal.c (contents, props changed) head/contrib/wpa/src/crypto/md5-internal.c (contents, props changed) head/contrib/wpa/src/crypto/md5.c head/contrib/wpa/src/crypto/md5.h head/contrib/wpa/src/crypto/md5_i.h (contents, props changed) head/contrib/wpa/src/crypto/milenage.c (contents, props changed) head/contrib/wpa/src/crypto/milenage.h (contents, props changed) 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-internal.c (contents, props changed) head/contrib/wpa/src/crypto/sha1-pbkdf2.c (contents, props changed) head/contrib/wpa/src/crypto/sha1-tlsprf.c (contents, props changed) head/contrib/wpa/src/crypto/sha1-tprf.c (contents, props changed) head/contrib/wpa/src/crypto/sha1.c head/contrib/wpa/src/crypto/sha1.h head/contrib/wpa/src/crypto/sha1_i.h (contents, props changed) head/contrib/wpa/src/crypto/sha256-internal.c (contents, props changed) head/contrib/wpa/src/crypto/sha256.c head/contrib/wpa/src/crypto/sha256.h 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_nss.c (contents, props changed) head/contrib/wpa/src/crypto/tls_openssl.c head/contrib/wpa/src/crypto/tls_schannel.c 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_ndis_.c head/contrib/wpa/src/drivers/driver_wired.c head/contrib/wpa/src/drivers/drivers.c head/contrib/wpa/src/drivers/drivers.mak head/contrib/wpa/src/drivers/ndis_events.c head/contrib/wpa/src/eap_common/chap.c head/contrib/wpa/src/eap_common/chap.h head/contrib/wpa/src/eap_common/eap_common.c head/contrib/wpa/src/eap_common/eap_common.h head/contrib/wpa/src/eap_common/eap_defs.h head/contrib/wpa/src/eap_common/eap_fast_common.c head/contrib/wpa/src/eap_common/eap_fast_common.h head/contrib/wpa/src/eap_common/eap_gpsk_common.c head/contrib/wpa/src/eap_common/eap_gpsk_common.h head/contrib/wpa/src/eap_common/eap_ikev2_common.c head/contrib/wpa/src/eap_common/eap_ikev2_common.h head/contrib/wpa/src/eap_common/eap_pax_common.c head/contrib/wpa/src/eap_common/eap_pax_common.h head/contrib/wpa/src/eap_common/eap_peap_common.c head/contrib/wpa/src/eap_common/eap_peap_common.h head/contrib/wpa/src/eap_common/eap_psk_common.c head/contrib/wpa/src/eap_common/eap_psk_common.h head/contrib/wpa/src/eap_common/eap_sake_common.c head/contrib/wpa/src/eap_common/eap_sake_common.h 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/eap_tlv_common.h head/contrib/wpa/src/eap_common/eap_ttls.h head/contrib/wpa/src/eap_common/eap_wsc_common.c head/contrib/wpa/src/eap_common/eap_wsc_common.h head/contrib/wpa/src/eap_common/ikev2_common.c head/contrib/wpa/src/eap_common/ikev2_common.h 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_fast_pac.h head/contrib/wpa/src/eap_peer/eap_gpsk.c head/contrib/wpa/src/eap_peer/eap_gtc.c head/contrib/wpa/src/eap_peer/eap_i.h head/contrib/wpa/src/eap_peer/eap_ikev2.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_otp.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_sake.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_vendor_test.c head/contrib/wpa/src/eap_peer/eap_wsc.c head/contrib/wpa/src/eap_peer/ikev2.c head/contrib/wpa/src/eap_peer/ikev2.h head/contrib/wpa/src/eap_peer/mschapv2.c head/contrib/wpa/src/eap_peer/mschapv2.h head/contrib/wpa/src/eap_peer/tncc.c head/contrib/wpa/src/eap_peer/tncc.h 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_server.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_aka.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_fast.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_gpsk.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_gtc.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_identity.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_ikev2.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_md5.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_methods.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_mschapv2.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_pax.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_peap.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_psk.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_sake.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_sim.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_tls.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_tls_common.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_tnc.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_ttls.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_vendor_test.c (contents, props changed) head/contrib/wpa/src/eap_server/eap_server_wsc.c (contents, props changed) 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/ikev2.h head/contrib/wpa/src/eap_server/tncs.c head/contrib/wpa/src/eap_server/tncs.h head/contrib/wpa/src/eapol_auth/eapol_auth_dump.c (contents, props changed) head/contrib/wpa/src/eapol_auth/eapol_auth_sm.c (contents, props changed) head/contrib/wpa/src/eapol_auth/eapol_auth_sm.h (contents, props changed) head/contrib/wpa/src/eapol_auth/eapol_auth_sm_i.h (contents, props changed) 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/l2_packet.h head/contrib/wpa/src/l2_packet/l2_packet_freebsd.c head/contrib/wpa/src/l2_packet/l2_packet_ndis.c head/contrib/wpa/src/l2_packet/l2_packet_none.c 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/peerkey.c head/contrib/wpa/src/rsn_supp/peerkey.h 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/bignum.c head/contrib/wpa/src/tls/bignum.h head/contrib/wpa/src/tls/libtommath.c head/contrib/wpa/src/tls/pkcs1.c (contents, props changed) head/contrib/wpa/src/tls/pkcs1.h (contents, props changed) head/contrib/wpa/src/tls/pkcs5.c (contents, props changed) head/contrib/wpa/src/tls/pkcs5.h (contents, props changed) head/contrib/wpa/src/tls/pkcs8.c (contents, props changed) head/contrib/wpa/src/tls/pkcs8.h (contents, props changed) head/contrib/wpa/src/tls/rsa.c head/contrib/wpa/src/tls/rsa.h head/contrib/wpa/src/tls/tlsv1_client.c head/contrib/wpa/src/tls/tlsv1_client.h head/contrib/wpa/src/tls/tlsv1_client_i.h 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.c head/contrib/wpa/src/tls/tlsv1_common.h head/contrib/wpa/src/tls/tlsv1_cred.c head/contrib/wpa/src/tls/tlsv1_cred.h 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.h head/contrib/wpa/src/tls/tlsv1_server_i.h 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/base64.h 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/includes.h head/contrib/wpa/src/utils/ip_addr.c head/contrib/wpa/src/utils/ip_addr.h head/contrib/wpa/src/utils/list.h (contents, props changed) head/contrib/wpa/src/utils/os.h head/contrib/wpa/src/utils/os_internal.c head/contrib/wpa/src/utils/os_none.c head/contrib/wpa/src/utils/os_unix.c head/contrib/wpa/src/utils/os_win32.c head/contrib/wpa/src/utils/pcsc_funcs.c head/contrib/wpa/src/utils/pcsc_funcs.h head/contrib/wpa/src/utils/radiotap.h (contents, props changed) head/contrib/wpa/src/utils/radiotap_iter.h (contents, props changed) head/contrib/wpa/src/utils/state_machine.h head/contrib/wpa/src/utils/trace.c (contents, props changed) head/contrib/wpa/src/utils/trace.h (contents, props changed) 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/http_client.c (contents, props changed) head/contrib/wpa/src/wps/http_client.h (contents, props changed) head/contrib/wpa/src/wps/http_server.c (contents, props changed) head/contrib/wpa/src/wps/http_server.h (contents, props changed) head/contrib/wpa/src/wps/httpread.c head/contrib/wpa/src/wps/httpread.h head/contrib/wpa/src/wps/ndef.c (contents, props changed) head/contrib/wpa/src/wps/upnp_xml.c (contents, props changed) head/contrib/wpa/src/wps/upnp_xml.h (contents, props changed) 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_dev_attr.h head/contrib/wpa/src/wps/wps_enrollee.c head/contrib/wpa/src/wps/wps_er.c (contents, props changed) head/contrib/wpa/src/wps/wps_er.h (contents, props changed) head/contrib/wpa/src/wps/wps_er_ssdp.c (contents, props changed) 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_ap.c (contents, props changed) 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/.gitignore 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/ap.c (contents, props changed) head/contrib/wpa/wpa_supplicant/ap.h (contents, props changed) head/contrib/wpa/wpa_supplicant/bgscan.c (contents, props changed) head/contrib/wpa/wpa_supplicant/bgscan.h (contents, props changed) head/contrib/wpa/wpa_supplicant/bgscan_simple.c (contents, props changed) head/contrib/wpa/wpa_supplicant/blacklist.c head/contrib/wpa/wpa_supplicant/blacklist.h head/contrib/wpa/wpa_supplicant/bss.c (contents, props changed) head/contrib/wpa/wpa_supplicant/bss.h (contents, props changed) 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_none.c head/contrib/wpa/wpa_supplicant/config_ssid.h head/contrib/wpa/wpa_supplicant/ctrl_iface.c head/contrib/wpa/wpa_supplicant/ctrl_iface.h 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/dbus/Makefile (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_common.c (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_common.h (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_common_i.h (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.c (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.h (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_new.c (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_new.h (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.c (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.h (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_wps.c (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.c (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.h (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_new_introspect.c (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_old.c (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_old.h (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.c (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.h (contents, props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers_wps.c (contents, props changed) head/contrib/wpa/wpa_supplicant/defconfig head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.8 head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_background.sgml head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.8 head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.8 head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.8 head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_passphrase.sgml head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.8 head/contrib/wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml 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/driver_i.h (contents, props changed) head/contrib/wpa/wpa_supplicant/eap_register.c (contents, props changed) head/contrib/wpa/wpa_supplicant/eapol_test.c head/contrib/wpa/wpa_supplicant/events.c head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py (contents, props changed) head/contrib/wpa/wpa_supplicant/ibss_rsn.c (contents, props changed) head/contrib/wpa/wpa_supplicant/ibss_rsn.h (contents, props changed) head/contrib/wpa/wpa_supplicant/main.c head/contrib/wpa/wpa_supplicant/main_none.c head/contrib/wpa/wpa_supplicant/notify.c (contents, props changed) head/contrib/wpa/wpa_supplicant/notify.h (contents, props changed) head/contrib/wpa/wpa_supplicant/preauth_test.c head/contrib/wpa/wpa_supplicant/scan.c head/contrib/wpa/wpa_supplicant/scan.h (contents, props changed) head/contrib/wpa/wpa_supplicant/sme.c (contents, props changed) head/contrib/wpa/wpa_supplicant/sme.h (contents, props changed) 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/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_i.h head/contrib/wpa/wpa_supplicant/wpas_glue.c head/contrib/wpa/wpa_supplicant/wpas_glue.h head/contrib/wpa/wpa_supplicant/wps_supplicant.c head/contrib/wpa/wpa_supplicant/wps_supplicant.h head/usr.sbin/wpa/Makefile.crypto head/usr.sbin/wpa/Makefile.inc head/usr.sbin/wpa/hostapd/Makefile head/usr.sbin/wpa/hostapd_cli/Makefile head/usr.sbin/wpa/wpa_cli/Makefile head/usr.sbin/wpa/wpa_passphrase/Makefile head/usr.sbin/wpa/wpa_supplicant/Makefile Directory Properties: head/contrib/wpa/ (props changed) head/contrib/wpa/hostapd/eap_testing.txt (props changed) head/contrib/wpa/hostapd/hostapd.8 (props changed) head/contrib/wpa/hostapd/hostapd_cli.1 (props changed) head/contrib/wpa/hostapd/logwatch/hostapd.conf (props changed) head/contrib/wpa/hostapd/wired.conf (props changed) head/contrib/wpa/src/ap/Makefile (props changed) head/contrib/wpa/src/ap/vlan_init.h (props changed) head/contrib/wpa/src/ap/wmm.h (props changed) head/contrib/wpa/src/eapol_auth/Makefile (props changed) head/contrib/wpa/src/utils/radiotap.c (props changed) head/contrib/wpa/src/wps/http.h (props changed) head/contrib/wpa/wpa_supplicant/dbus/dbus-wpa_supplicant.conf (props changed) head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py (props changed) head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py (props changed) head/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py (props changed) Modified: head/contrib/wpa/COPYING ============================================================================== --- head/contrib/wpa/COPYING Thu Jul 4 20:57:15 2013 (r252725) +++ head/contrib/wpa/COPYING Thu Jul 4 21:12:58 2013 (r252726) @@ -1,340 +1,22 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 +wpa_supplicant and hostapd +-------------------------- - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Copyright (c) 2002-2012, Jouni Malinen <j@w1.fi> and contributors +All Rights Reserved. - Preamble - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. +See the README file for the current license terms. - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) 19yy <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) 19yy name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. +This software was previously distributed under BSD/GPL v2 dual license +terms that allowed either of those license alternatives to be +selected. As of February 11, 2012, the project has chosen to use only +the BSD license option for future distribution. As such, the GPL v2 +license option is no longer used. It should be noted that the BSD +license option (the one with advertisement clause removed) is compatible +with GPL and as such, does not prevent use of this software in projects +that use GPL. + +Some of the files may still include pointers to GPL version 2 license +terms. However, such copyright and license notifications are maintained +only for attribution purposes and any distribution of this software +after February 11, 2012 is no longer under the GPL v2 option. Modified: head/contrib/wpa/README ============================================================================== --- head/contrib/wpa/README Thu Jul 4 20:57:15 2013 (r252725) +++ head/contrib/wpa/README Thu Jul 4 21:12:58 2013 (r252726) @@ -1,19 +1,56 @@ -wpa_supplicant and hostapd v0.6.x ---------------------------------- +wpa_supplicant and hostapd +-------------------------- -Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi> and contributors +Copyright (c) 2002-2012, Jouni Malinen <j@w1.fi> and contributors All Rights Reserved. -These program is dual-licensed under both the GPL version 2 and BSD -license. Either license may be used at your option. +These programs are licensed under the BSD license (the one with +advertisement clause removed). + +If you are submitting changes to the project, please see CONTRIBUTIONS +file for more instructions. This package may include either wpa_supplicant, hostapd, or both. See README file respective subdirectories (wpa_supplicant/README or hostapd/README) for more details. -Source code files have been moved around in v0.6.x releases and -compared to earlier releases, the programs are now build by first -going to a subdirectory (wpa_supplicant or hostapd) and creating -build configuration (.config) and running 'make' there (for -Linux/BSD/cygwin builds). +Source code files were moved around in v0.6.x releases and compared to +earlier releases, the programs are now built by first going to a +subdirectory (wpa_supplicant or hostapd) and creating build +configuration (.config) and running 'make' there (for Linux/BSD/cygwin +builds). + + +License +------- + +This software may be distributed, used, and modified under the terms of +BSD license: + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + +3. Neither the name(s) of the above-listed copyright holder(s) nor the + names of its contributors may be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. Modified: head/contrib/wpa/hostapd/ChangeLog ============================================================================== --- head/contrib/wpa/hostapd/ChangeLog Thu Jul 4 20:57:15 2013 (r252725) +++ head/contrib/wpa/hostapd/ChangeLog Thu Jul 4 21:12:58 2013 (r252726) @@ -1,20 +1,206 @@ 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 +2013-01-12 - v2.0 + * added AP-STA-DISCONNECTED ctrl_iface event + * improved debug logging (human readable event names, interface name + included in more entries) + * added number of small changes to make it easier for static analyzers + to understand the implementation + * added a workaround for Windows 7 Michael MIC failure reporting and + use of the Secure bit in EAPOL-Key msg 3/4 + * fixed number of small bugs (see git logs for more details) + * changed OpenSSL to read full certificate chain from server_cert file + * nl80211: number of updates to use new cfg80211/nl80211 functionality + - replace monitor interface with nl80211 commands + - additional information for driver-based AP SME + * EAP-pwd: + - fix KDF for group 21 and zero-padding + - added support for fragmentation + - increased maximum number of hunting-and-pecking iterations + * avoid excessive Probe Response retries for broadcast Probe Request + frames (only with drivers using hostapd SME/MLME) + * added preliminary support for using TLS v1.2 (CONFIG_TLSV12=y) + * fixed WPS operation stopping on dual concurrent AP + * added wps_rf_bands configuration parameter for overriding RF Bands + value for WPS + * added support for getting per-device PSK from RADIUS Tunnel-Password + * added support for libnl 3.2 and newer + * increased initial group key handshake retransmit timeout to 500 ms + * added a workaround for 4-way handshake to update SNonce even after + having sent EAPOL-Key 3/4 to avoid issues with some supplicant + implementations that can change SNonce for each EAP-Key 2/4 + * added a workaround for EAPOL-Key 4/4 using incorrect type value in + WPA2 mode (some deployed stations use WPA type in that message) + * added a WPS workaround for mixed mode AP Settings with Windows 7 + * changed WPS AP PIN disabling mechanism to disable the PIN after 10 + consecutive failures in addition to using the exponential lockout + period + * added support for WFA Hotspot 2.0 + - GAS/ANQP advertisement of network information + - disable_dgaf parameter to disable downstream group-addressed + forwarding + * simplified licensing terms by selecting the BSD license as the only + alternative + * EAP-SIM: fixed re-authentication not to update pseudonym + * EAP-SIM: use Notification round before EAP-Failure + * EAP-AKA: added support for AT_COUNTER_TOO_SMALL + * EAP-AKA: skip AKA/Identity exchange if EAP identity is recognized + * EAP-AKA': fixed identity for MK derivation + * EAP-AKA': updated to RFC 5448 (username prefixes changed); note: this + breaks interoperability with older versions + * EAP-SIM/AKA: allow pseudonym to be used after unknown reauth id + * changed ANonce to be a random number instead of Counter-based + * added support for canceling WPS operations with hostapd_cli wps_cancel + * fixed EAP/WPS to PSK transition on reassociation in cases where + deauthentication is missed + * hlr_auc_gw enhancements: + - a new command line parameter -u can be used to enable updating of + SQN in Milenage file + - use 5 bit IND for SQN updates + - SQLite database can now be used to store Milenage information + * EAP-SIM/AKA DB: added optional use of SQLite database for pseudonyms + and reauth data + * added support for Chargeable-User-Identity (RFC 4372) + * added radius_auth_req_attr and radius_acct_req_attr configuration + parameters to allow adding/overriding of RADIUS attributes in + Access-Request and Accounting-Request packets + * added support for RADIUS dynamic authorization server (RFC 5176) + * added initial support for WNM operations + - BSS max idle period + - WNM-Sleep Mode + * added new WPS NFC ctrl_iface mechanism + - removed obsoleted WPS_OOB command (including support for deprecated + UFD config_method) + * added FT support for drivers that implement MLME internally + * added SA Query support for drivers that implement MLME internally + * removed default ACM=1 from AC_VO and AC_VI + * changed VENDOR-TEST EAP method to use proper private enterprise number + (this will not interoperate with older versions) + * added hostapd.conf parameter vendor_elements to allow arbitrary vendor + specific elements to be added to the Beacon and Probe Response frames + * added support for configuring GCMP cipher for IEEE 802.11ad + * added support for 256-bit AES with internal TLS implementation + * changed EAPOL transmission to use AC_VO if WMM is active + * fixed EAP-TLS/PEAP/TTLS/FAST server to validate TLS Message Length + correctly; invalid messages could have caused the hostapd process to + terminate before this fix [CVE-2012-4445] + * limit number of active wildcard PINs for WPS Registrar to one to avoid + confusing behavior with multiple wildcard PINs + * added a workaround for WPS PBC session overlap detection to avoid + interop issues with deployed station implementations that do not + remove active PBC indication from Probe Request frames properly + * added support for using SQLite for the eap_user database + * added Acct-Session-Id attribute into Access-Request messages + * fixed EAPOL frame transmission to non-QoS STAs with nl80211 + (do not send QoS frames if the STA did not negotiate use of QoS for + this association) + +2012-05-10 - v1.0 + * Add channel selection support in hostapd. See hostapd.conf. + * Add support for IEEE 802.11v Time Advertisement mechanism with UTC + TSF offset. See hostapd.conf for config info. + * Delay STA entry removal until Deauth/Disassoc TX status in AP mode. + This allows the driver to use PS buffering of Deauthentication and + Disassociation frames when the STA is in power save sleep. Only + available with drivers that provide TX status events for Deauth/ + Disassoc frames (nl80211). + * Allow PMKSA caching to be disabled on the Authenticator. See + hostap.conf config parameter disable_pmksa_caching. + * atheros: Add support for IEEE 802.11w configuration. + * bsd: Add support for setting HT values in IFM_MMASK. + * Allow client isolation to be configured with ap_isolate. Client + isolation can be used to prevent low-level bridging of frames + between associated stations in the BSS. By default, this bridging + is allowed. + * Allow coexistance of HT BSSes with WEP/TKIP BSSes. + * Add require_ht config parameter, which can be used to configure + hostapd to reject association with any station that does not support + HT PHY. + * Add support for writing debug log to a file using "-f" option. Also + add relog CLI command to re-open the log file. + * Add bridge handling for WDS STA interfaces. By default they are + added to the configured bridge of the AP interface (if present), + but the user can also specify a separate bridge using cli command + wds_bridge. + * hostapd_cli: + - Add wds_bridge command for specifying bridge for WDS STA + interfaces. + - Add relog command for reopening log file. + - Send AP-STA-DISCONNECTED event when an AP disconnects a station + due to inactivity. + - Add wps_config ctrl_interface command for configuring AP. This + command can be used to configure the AP using the internal WPS + registrar. It works in the same way as new AP settings received + from an ER. + - Many WPS/WPS ER commands - see WPS/WPS ER sections for details. + - Add command get version, that returns hostapd version string. + * WNM: Add BSS Transition Management Request for ESS Disassoc Imminent. + Use hostapd_cli ess_disassoc (STA addr) (URL) to send the + notification to the STA. + * Allow AP mode to disconnect STAs based on low ACK condition (when + the data connection is not working properly, e.g., due to the STA + going outside the range of the AP). Disabled by default, enable by + config option disassoc_low_ack. + * Add WPA_IGNORE_CONFIG_ERRORS build option to continue in case of bad + config file. + * WPS: + - Send AP Settings as a wrapped Credential attribute to ctrl_iface + in WPS-NEW-AP-SETTINGS. + - Dispatch more WPS events through hostapd ctrl_iface. + - Add mechanism for indicating non-standard WPS errors. + - Change concurrent radio AP to use only one WPS UPnP instance. + - Add wps_check_pin command for processing PIN from user input. + UIs can use this command to process a PIN entered by a user and to + validate the checksum digit (if present). + - Add hostap_cli get_config command to display current AP config. + - Add new hostapd_cli command, wps_ap_pin, to manage AP PIN at + runtime and support dynamic AP PIN management. + - Disable AP PIN after 10 consecutive failures. Slow down attacks + on failures up to 10. + - Allow AP to start in Enrollee mode without AP PIN for probing, + to be compatible with Windows 7. + - Add Config Error into WPS-FAIL events to provide more info + to the user on how to resolve the issue. + - When controlling multiple interfaces: + - apply WPS commands to all interfaces configured to use WPS + - apply WPS config changes to all interfaces that use WPS + - when an attack is detected on any interface, disable AP PIN on + all interfaces + * WPS ER: + - Show SetSelectedRegistrar events as ctrl_iface events. + - Add special AP Setup Locked mode to allow read only ER. + ap_setup_locked=2 can now be used to enable a special mode where + WPS ER can learn the current AP settings, but cannot change them. + * WPS 2.0: Add support for WPS 2.0 (CONFIG_WPS2) + - Add build option CONFIG_WPS_EXTENSIBILITY_TESTING to enable tool + for testing protocol extensibility. + - Add build option CONFIG_WPS_STRICT to allow disabling of WPS + workarounds. + - Add support for AuthorizedMACs attribute. + * TDLS: + - Allow TDLS use or TDLS channel switching in the BSS to be + prohibited in the BSS, using config params tdls_prohibit and + tdls_prohibit_chan_switch. + * EAP server: Add support for configuring fragment size (see + fragment_size in hostapd.conf). + * wlantest: Add a tool wlantest for IEEE802.11 protocol testing. + wlantest can be used to capture frames from a monitor interface + for realtime capturing or from pcap files for offline analysis. + * Interworking: Support added for 802.11u. Enable in .config with + CONFIG_INTERWORKING. See hostapd.conf for config parameters for + interworking. + * Android: Add build and runtime support for Android hostapd. + * Add a new debug message level for excessive information. Use + -ddd to enable. + * TLS: Add support for tls_disable_time_checks=1 in client mode. + * Internal TLS: + - Add support for TLS v1.1 (RFC 4346). Enable with build parameter + CONFIG_TLSV11. + - Add domainComponent parser for X.509 names + * Reorder some IEs to get closer to IEEE 802.11 standard. Move + WMM into end of Beacon, Probe Resp and (Re)Assoc Resp frames. + Move HT IEs to be later in (Re)Assoc Resp. + * Many bugfixes. 2010-04-18 - v0.7.2 * fix WPS internal Registrar use when an external Registrar is also @@ -98,7 +284,7 @@ ChangeLog for hostapd * 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 + * added some IEEE 802.11n co-existence 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 Modified: head/contrib/wpa/hostapd/Makefile ============================================================================== --- head/contrib/wpa/hostapd/Makefile Thu Jul 4 20:57:15 2013 (r252725) +++ head/contrib/wpa/hostapd/Makefile Thu Jul 4 21:12:58 2013 (r252726) @@ -43,6 +43,7 @@ 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/eap_user_db.o OBJS += ../src/ap/ieee802_11_auth.o OBJS += ../src/ap/sta_info.o OBJS += ../src/ap/wpa_auth.o @@ -51,6 +52,10 @@ 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 +OBJS += ../src/ap/ieee802_11_shared.o +OBJS += ../src/ap/beacon.o + +OBJS_c = hostapd_cli.o ../src/common/wpa_ctrl.o ../src/utils/os_$(CONFIG_OS).o NEED_RC4=y NEED_AES=y @@ -63,18 +68,25 @@ CFLAGS += -DHOSTAPD ifdef CONFIG_WPA_TRACE CFLAGS += -DWPA_TRACE OBJS += ../src/utils/trace.o +HOBJS += ../src/utils/trace.o LDFLAGS += -rdynamic CFLAGS += -funwind-tables ifdef CONFIG_WPA_TRACE_BFD CFLAGS += -DWPA_TRACE_BFD LIBS += -lbfd LIBS_c += -lbfd +LIBS_h += -lbfd endif endif -OBJS += ../src/utils/eloop.o +ifndef CONFIG_ELOOP +CONFIG_ELOOP=eloop +endif +OBJS += ../src/utils/$(CONFIG_ELOOP).o +OBJS_c += ../src/utils/$(CONFIG_ELOOP).o OBJS += ../src/utils/common.o OBJS += ../src/utils/wpa_debug.o +OBJS_c += ../src/utils/wpa_debug.o OBJS += ../src/utils/wpabuf.o OBJS += ../src/utils/os_$(CONFIG_OS).o OBJS += ../src/utils/ip_addr.o @@ -99,6 +111,7 @@ CONFIG_NO_ACCOUNTING=y else OBJS += ../src/radius/radius.o OBJS += ../src/radius/radius_client.o +OBJS += ../src/radius/radius_das.o endif ifdef CONFIG_NO_ACCOUNTING @@ -111,6 +124,12 @@ ifdef CONFIG_NO_VLAN CFLAGS += -DCONFIG_NO_VLAN else OBJS += ../src/ap/vlan_init.o +ifdef CONFIG_VLAN_NETLINK +ifdef CONFIG_FULL_DYNAMIC_VLAN +OBJS += ../src/ap/vlan_util.o +endif +CFLAGS += -DCONFIG_VLAN_NETLINK +endif endif ifdef CONFIG_NO_CTRL_IFACE @@ -153,10 +172,23 @@ NEED_AES_OMAC1=y NEED_AES_UNWRAP=y endif +ifdef CONFIG_SAE +CFLAGS += -DCONFIG_SAE +endif + +ifdef CONFIG_WNM +CFLAGS += -DCONFIG_WNM +OBJS += ../src/ap/wnm_ap.o +endif + ifdef CONFIG_IEEE80211N CFLAGS += -DCONFIG_IEEE80211N endif +ifdef CONFIG_IEEE80211AC +CFLAGS += -DCONFIG_IEEE80211AC +endif + include ../src/drivers/drivers.mak OBJS += $(DRV_AP_OBJS) CFLAGS += $(DRV_AP_CFLAGS) @@ -192,6 +224,14 @@ OBJS += ../src/eap_server/eap_server_tls TLS_FUNCS=y endif +ifdef CONFIG_EAP_UNAUTH_TLS +CFLAGS += -DEAP_SERVER_UNAUTH_TLS +ifndef CONFIG_EAP_TLS +OBJS += ../src/eap_server/eap_server_tls.o +TLS_FUNCS=y +endif +endif + ifdef CONFIG_EAP_PEAP CFLAGS += -DEAP_SERVER_PEAP OBJS += ../src/eap_server/eap_server_peap.o @@ -274,6 +314,12 @@ NEED_SHA256=y NEED_AES_OMAC1=y endif +ifdef CONFIG_EAP_PWD +CFLAGS += -DEAP_SERVER_PWD +OBJS += ../src/eap_server/eap_server_pwd.o ../src/eap_common/eap_pwd_common.o +NEED_SHA256=y +endif + ifdef CONFIG_EAP_VENDOR_TEST CFLAGS += -DEAP_SERVER_VENDOR_TEST OBJS += ../src/eap_server/eap_server_vendor_test.o @@ -289,6 +335,10 @@ NEED_AES_UNWRAP=y endif ifdef CONFIG_WPS +ifdef CONFIG_WPS2 +CFLAGS += -DCONFIG_WPS2 +endif + CFLAGS += -DCONFIG_WPS -DEAP_SERVER_WSC OBJS += ../src/utils/uuid.o OBJS += ../src/ap/wps_hostapd.o @@ -308,25 +358,10 @@ 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 ifdef NEED_WPS_OOB @@ -346,6 +381,15 @@ OBJS += ../src/wps/http_client.o OBJS += ../src/wps/http_server.o endif +ifdef CONFIG_WPS_STRICT +CFLAGS += -DCONFIG_WPS_STRICT +OBJS += ../src/wps/wps_validate.o +endif + +ifdef CONFIG_WPS_TESTING +CFLAGS += -DCONFIG_WPS_TESTING +endif + endif ifdef CONFIG_EAP_IKEV2 @@ -406,6 +450,15 @@ ifndef CONFIG_TLS CONFIG_TLS=openssl endif +ifdef CONFIG_TLSV11 +CFLAGS += -DCONFIG_TLSV11 +endif + +ifdef CONFIG_TLSV12 +CFLAGS += -DCONFIG_TLSV12 +NEED_SHA256=y +endif + ifeq ($(CONFIG_TLS), openssl) ifdef TLS_FUNCS OBJS += ../src/crypto/tls_openssl.o @@ -424,10 +477,6 @@ ifeq ($(CONFIG_TLS), gnutls) ifdef TLS_FUNCS OBJS += ../src/crypto/tls_gnutls.o LIBS += -lgnutls -lgpg-error -ifdef CONFIG_GNUTLS_EXTRA -CFLAGS += -DCONFIG_GNUTLS_EXTRA -LIBS += -lgnutls-extra -endif endif OBJS += ../src/crypto/crypto_gnutls.o HOBJS += ../src/crypto/crypto_gnutls.o @@ -489,6 +538,9 @@ OBJS += ../src/tls/pkcs8.o NEED_SHA256=y NEED_BASE64=y NEED_TLS_PRF=y +ifdef CONFIG_TLSV12 +NEED_TLS_PRF_SHA256=y +endif NEED_MODEXP=y NEED_CIPHER=y CFLAGS += -DCONFIG_TLS_INTERNAL @@ -602,14 +654,19 @@ OBJS += $(AESOBJS) endif ifdef NEED_SHA1 +ifneq ($(CONFIG_TLS), openssl) SHA1OBJS += ../src/crypto/sha1.o +endif +SHA1OBJS += ../src/crypto/sha1-prf.o ifdef CONFIG_INTERNAL_SHA1 SHA1OBJS += ../src/crypto/sha1-internal.o ifdef NEED_FIPS186_2_PRF SHA1OBJS += ../src/crypto/fips_prf_internal.o endif endif +ifneq ($(CONFIG_TLS), openssl) SHA1OBJS += ../src/crypto/sha1-pbkdf2.o +endif ifdef NEED_T_PRF SHA1OBJS += ../src/crypto/sha1-tprf.o endif @@ -625,6 +682,7 @@ endif ifdef NEED_MD5 ifdef CONFIG_INTERNAL_MD5 OBJS += ../src/crypto/md5-internal.o +HOBJS += ../src/crypto/md5-internal.o endif endif @@ -647,10 +705,17 @@ endif endif ifdef NEED_SHA256 +CFLAGS += -DCONFIG_SHA256 +ifneq ($(CONFIG_TLS), openssl) OBJS += ../src/crypto/sha256.o +endif +OBJS += ../src/crypto/sha256-prf.o ifdef CONFIG_INTERNAL_SHA256 OBJS += ../src/crypto/sha256-internal.o endif +ifdef NEED_TLS_PRF_SHA256 +OBJS += ../src/crypto/sha256-tlsprf.o +endif endif ifdef NEED_DH_GROUPS @@ -665,6 +730,16 @@ OBJS += ../src/crypto/dh_group5.o endif endif +ifdef CONFIG_NO_RANDOM_POOL +CFLAGS += -DCONFIG_NO_RANDOM_POOL +else +OBJS += ../src/crypto/random.o +HOBJS += ../src/crypto/random.o +HOBJS += ../src/utils/eloop.o +HOBJS += $(SHA1OBJS) +HOBJS += ../src/crypto/md5.o +endif + ifdef CONFIG_RADIUS_SERVER CFLAGS += -DRADIUS_SERVER OBJS += ../src/radius/radius_server.o @@ -689,7 +764,6 @@ OBJS += ../src/utils/base64.o endif ifdef NEED_AP_MLME -OBJS += ../src/ap/beacon.o OBJS += ../src/ap/wmm.o OBJS += ../src/ap/ap_list.o OBJS += ../src/ap/ieee802_11.o @@ -700,10 +774,49 @@ ifdef CONFIG_IEEE80211N OBJS += ../src/ap/ieee802_11_ht.o endif +ifdef CONFIG_IEEE80211AC +OBJS += ../src/ap/ieee802_11_vht.o +endif + +ifdef CONFIG_P2P_MANAGER +CFLAGS += -DCONFIG_P2P_MANAGER +OBJS += ../src/ap/p2p_hostapd.o +endif + +ifdef CONFIG_HS20 +CFLAGS += -DCONFIG_HS20 +OBJS += ../src/ap/hs20.o +CONFIG_INTERWORKING=y +endif + +ifdef CONFIG_INTERWORKING +CFLAGS += -DCONFIG_INTERWORKING +OBJS += ../src/common/gas.o +OBJS += ../src/ap/gas_serv.o +endif + +OBJS += ../src/drivers/driver_common.o + +ifdef CONFIG_WPA_CLI_EDIT +OBJS_c += ../src/utils/edit.o +else +OBJS_c += ../src/utils/edit_simple.o +endif + ifdef CONFIG_NO_STDOUT_DEBUG CFLAGS += -DCONFIG_NO_STDOUT_DEBUG endif +ifdef CONFIG_DEBUG_FILE +CFLAGS += -DCONFIG_DEBUG_FILE +endif + +ifdef CONFIG_SQLITE +CFLAGS += -DCONFIG_SQLITE +LIBS += -lsqlite3 +LIBS_h += -lsqlite3 +endif + ALL=hostapd hostapd_cli all: verify_config $(ALL) @@ -729,7 +842,8 @@ verify_config: fi install: all - for i in $(ALL); do cp -f $$i /usr/local/bin/$$i; done *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307042112.r64LCwVc046799>