Merge branch 'master' (v0.9.6.2) into debian
authorDan Breslau <dbreslau@painless-security.com>
Fri, 28 Oct 2016 16:36:00 +0000 (12:36 -0400)
committerDan Breslau <dbreslau@painless-security.com>
Fri, 28 Oct 2016 16:36:00 +0000 (12:36 -0400)
Conflicts:
.gitignore
build-aux/compile
libeap/build_release
libeap/doc/.gitignore
libeap/doc/Makefile
libeap/doc/code_structure.doxygen
libeap/doc/ctrl_iface.doxygen
libeap/doc/dbus.doxygen
libeap/doc/directories.doxygen
libeap/doc/doxygen.conf
libeap/doc/driver_wrapper.doxygen
libeap/doc/eap.doxygen
libeap/doc/eap_server.doxygen
libeap/doc/hostapd.fig
libeap/doc/hostapd_ctrl_iface.doxygen
libeap/doc/mainpage.doxygen
libeap/doc/porting.doxygen
libeap/doc/testing_tools.doxygen
libeap/doc/wpa_supplicant.fig
libeap/eap_example/README
libeap/eap_example/eap_example.c
libeap/eap_example/eap_example_peer.c
libeap/eap_example/eap_example_server.c
libeap/hostapd/ChangeLog
libeap/hostapd/Makefile
libeap/hostapd/README
libeap/hostapd/README-WPS
libeap/hostapd/config_file.c
libeap/hostapd/config_file.h
libeap/hostapd/ctrl_iface.c
libeap/hostapd/ctrl_iface.h
libeap/hostapd/defconfig
libeap/hostapd/eap_register.c
libeap/hostapd/eap_register.h
libeap/hostapd/hlr_auc_gw.c
libeap/hostapd/hlr_auc_gw.milenage_db
libeap/hostapd/hostapd.8
libeap/hostapd/hostapd.conf
libeap/hostapd/hostapd.eap_user
libeap/hostapd/hostapd_cli.c
libeap/hostapd/main.c
libeap/hostapd/nt_password_hash.c
libeap/mac80211_hwsim/tools/Makefile
libeap/mac80211_hwsim/tools/hwsim_test.c
libeap/radius_example/Makefile
libeap/radius_example/README
libeap/radius_example/radius_example.c
libeap/src/Makefile
libeap/src/ap/Makefile
libeap/src/ap/accounting.c
libeap/src/ap/accounting.h
libeap/src/ap/ap_config.c
libeap/src/ap/ap_config.h
libeap/src/ap/ap_drv_ops.c
libeap/src/ap/ap_drv_ops.h
libeap/src/ap/ap_list.c
libeap/src/ap/ap_list.h
libeap/src/ap/ap_mlme.c
libeap/src/ap/ap_mlme.h
libeap/src/ap/authsrv.c
libeap/src/ap/authsrv.h
libeap/src/ap/beacon.c
libeap/src/ap/beacon.h
libeap/src/ap/ctrl_iface_ap.c
libeap/src/ap/ctrl_iface_ap.h
libeap/src/ap/drv_callbacks.c
libeap/src/ap/hostapd.c
libeap/src/ap/hostapd.h
libeap/src/ap/hw_features.c
libeap/src/ap/hw_features.h
libeap/src/ap/iapp.c
libeap/src/ap/iapp.h
libeap/src/ap/ieee802_11.c
libeap/src/ap/ieee802_11.h
libeap/src/ap/ieee802_11_auth.c
libeap/src/ap/ieee802_11_auth.h
libeap/src/ap/ieee802_11_ht.c
libeap/src/ap/ieee802_1x.c
libeap/src/ap/ieee802_1x.h
libeap/src/ap/p2p_hostapd.c
libeap/src/ap/p2p_hostapd.h
libeap/src/ap/peerkey_auth.c
libeap/src/ap/pmksa_cache_auth.c
libeap/src/ap/pmksa_cache_auth.h
libeap/src/ap/preauth_auth.c
libeap/src/ap/preauth_auth.h
libeap/src/ap/sta_info.c
libeap/src/ap/sta_info.h
libeap/src/ap/tkip_countermeasures.c
libeap/src/ap/tkip_countermeasures.h
libeap/src/ap/utils.c
libeap/src/ap/vlan_init.c
libeap/src/ap/vlan_init.h
libeap/src/ap/wmm.c
libeap/src/ap/wmm.h
libeap/src/ap/wpa_auth.c
libeap/src/ap/wpa_auth.h
libeap/src/ap/wpa_auth_ft.c
libeap/src/ap/wpa_auth_glue.c
libeap/src/ap/wpa_auth_glue.h
libeap/src/ap/wpa_auth_i.h
libeap/src/ap/wpa_auth_ie.c
libeap/src/ap/wpa_auth_ie.h
libeap/src/ap/wps_hostapd.c
libeap/src/ap/wps_hostapd.h
libeap/src/common/Makefile
libeap/src/common/ieee802_11_common.c
libeap/src/common/wpa_common.c
libeap/src/common/wpa_ctrl.c
libeap/src/crypto/Makefile
libeap/src/crypto/aes-internal-dec.c
libeap/src/crypto/aes-internal-enc.c
libeap/src/crypto/aes-internal.c
libeap/src/crypto/crypto_gnutls.c
libeap/src/crypto/crypto_internal-cipher.c
libeap/src/crypto/crypto_internal-modexp.c
libeap/src/crypto/crypto_internal-rsa.c
libeap/src/crypto/crypto_internal.c
libeap/src/crypto/crypto_libtomcrypt.c
libeap/src/crypto/crypto_none.c
libeap/src/crypto/des-internal.c
libeap/src/crypto/des_i.h
libeap/src/crypto/dh_group5.c
libeap/src/crypto/dh_groups.c
libeap/src/crypto/fips_prf_internal.c
libeap/src/crypto/fips_prf_openssl.c
libeap/src/crypto/md4-internal.c
libeap/src/crypto/md5-internal.c
libeap/src/crypto/md5_i.h
libeap/src/crypto/rc4.c
libeap/src/crypto/sha1-internal.c
libeap/src/crypto/sha1_i.h
libeap/src/crypto/sha256-internal.c
libeap/src/crypto/tls_gnutls.c
libeap/src/crypto/tls_internal.c
libeap/src/crypto/tls_none.c
libeap/src/drivers/Makefile
libeap/src/drivers/driver.h
libeap/src/drivers/driver_atheros.c
libeap/src/drivers/driver_bsd.c
libeap/src/drivers/driver_hostap.c
libeap/src/drivers/driver_hostap.h
libeap/src/drivers/driver_ndis.c
libeap/src/drivers/driver_ndis.h
libeap/src/drivers/driver_ndis_.c
libeap/src/drivers/driver_nl80211.c
libeap/src/drivers/driver_none.c
libeap/src/drivers/driver_privsep.c
libeap/src/drivers/driver_roboswitch.c
libeap/src/drivers/driver_wext.c
libeap/src/drivers/driver_wext.h
libeap/src/drivers/driver_wired.c
libeap/src/drivers/drivers.c
libeap/src/drivers/drivers.mak
libeap/src/drivers/linux_ioctl.c
libeap/src/drivers/linux_ioctl.h
libeap/src/drivers/ndis_events.c
libeap/src/drivers/netlink.c
libeap/src/drivers/netlink.h
libeap/src/drivers/nl80211_copy.h
libeap/src/drivers/priv_netlink.h
libeap/src/drivers/rfkill.c
libeap/src/drivers/rfkill.h
libeap/src/eap_common/Makefile
libeap/src/eap_common/eap_fast_common.c
libeap/src/eap_common/eap_ikev2_common.c
libeap/src/eap_common/eap_pwd_common.c
libeap/src/eap_common/eap_sim_common.c
libeap/src/eap_common/eap_wsc_common.c
libeap/src/eap_common/ikev2_common.c
libeap/src/eap_peer/Makefile
libeap/src/eap_peer/eap_aka.c
libeap/src/eap_peer/eap_fast.c
libeap/src/eap_peer/eap_fast_pac.c
libeap/src/eap_peer/eap_ikev2.c
libeap/src/eap_peer/eap_pwd.c
libeap/src/eap_peer/eap_sim.c
libeap/src/eap_peer/eap_tnc.c
libeap/src/eap_peer/eap_vendor_test.c
libeap/src/eap_peer/eap_wsc.c
libeap/src/eap_peer/ikev2.c
libeap/src/eap_peer/tncc.c
libeap/src/eap_server/Makefile
libeap/src/eap_server/eap.h
libeap/src/eap_server/eap_i.h
libeap/src/eap_server/eap_methods.h
libeap/src/eap_server/eap_server.c
libeap/src/eap_server/eap_server_aka.c
libeap/src/eap_server/eap_server_fast.c
libeap/src/eap_server/eap_server_gpsk.c
libeap/src/eap_server/eap_server_gtc.c
libeap/src/eap_server/eap_server_identity.c
libeap/src/eap_server/eap_server_ikev2.c
libeap/src/eap_server/eap_server_md5.c
libeap/src/eap_server/eap_server_methods.c
libeap/src/eap_server/eap_server_mschapv2.c
libeap/src/eap_server/eap_server_pax.c
libeap/src/eap_server/eap_server_peap.c
libeap/src/eap_server/eap_server_psk.c
libeap/src/eap_server/eap_server_pwd.c
libeap/src/eap_server/eap_server_sake.c
libeap/src/eap_server/eap_server_sim.c
libeap/src/eap_server/eap_server_tls.c
libeap/src/eap_server/eap_server_tls_common.c
libeap/src/eap_server/eap_server_tnc.c
libeap/src/eap_server/eap_server_ttls.c
libeap/src/eap_server/eap_server_vendor_test.c
libeap/src/eap_server/eap_server_wsc.c
libeap/src/eap_server/eap_sim_db.c
libeap/src/eap_server/eap_sim_db.h
libeap/src/eap_server/eap_tls_common.h
libeap/src/eap_server/ikev2.c
libeap/src/eap_server/ikev2.h
libeap/src/eap_server/tncs.c
libeap/src/eap_server/tncs.h
libeap/src/eapol_auth/Makefile
libeap/src/eapol_auth/eapol_auth_dump.c
libeap/src/eapol_auth/eapol_auth_sm.c
libeap/src/eapol_auth/eapol_auth_sm.h
libeap/src/eapol_auth/eapol_auth_sm_i.h
libeap/src/eapol_supp/Makefile
libeap/src/eapol_supp/eapol_supp_sm.c
libeap/src/eapol_supp/eapol_supp_sm.h
libeap/src/l2_packet/Makefile
libeap/src/l2_packet/l2_packet.h
libeap/src/l2_packet/l2_packet_freebsd.c
libeap/src/l2_packet/l2_packet_linux.c
libeap/src/l2_packet/l2_packet_ndis.c
libeap/src/l2_packet/l2_packet_none.c
libeap/src/l2_packet/l2_packet_pcap.c
libeap/src/l2_packet/l2_packet_privsep.c
libeap/src/l2_packet/l2_packet_winpcap.c
libeap/src/lib.rules
libeap/src/p2p/Makefile
libeap/src/p2p/p2p.c
libeap/src/p2p/p2p.h
libeap/src/p2p/p2p_build.c
libeap/src/p2p/p2p_dev_disc.c
libeap/src/p2p/p2p_go_neg.c
libeap/src/p2p/p2p_group.c
libeap/src/p2p/p2p_i.h
libeap/src/p2p/p2p_invitation.c
libeap/src/p2p/p2p_parse.c
libeap/src/p2p/p2p_pd.c
libeap/src/p2p/p2p_sd.c
libeap/src/p2p/p2p_utils.c
libeap/src/radius/Makefile
libeap/src/radius/radius.c
libeap/src/radius/radius_client.c
libeap/src/radius/radius_client.h
libeap/src/radius/radius_server.c
libeap/src/radius/radius_server.h
libeap/src/rsn_supp/Makefile
libeap/src/rsn_supp/peerkey.c
libeap/src/rsn_supp/peerkey.h
libeap/src/rsn_supp/pmksa_cache.c
libeap/src/rsn_supp/pmksa_cache.h
libeap/src/rsn_supp/preauth.c
libeap/src/rsn_supp/preauth.h
libeap/src/rsn_supp/wpa.c
libeap/src/rsn_supp/wpa.h
libeap/src/rsn_supp/wpa_ft.c
libeap/src/rsn_supp/wpa_i.h
libeap/src/rsn_supp/wpa_ie.c
libeap/src/rsn_supp/wpa_ie.h
libeap/src/tls/Makefile
libeap/src/tls/asn1.c
libeap/src/tls/asn1.h
libeap/src/tls/bignum.c
libeap/src/tls/bignum.h
libeap/src/tls/pkcs1.c
libeap/src/tls/pkcs1.h
libeap/src/tls/pkcs5.c
libeap/src/tls/pkcs5.h
libeap/src/tls/pkcs8.c
libeap/src/tls/pkcs8.h
libeap/src/tls/rsa.c
libeap/src/tls/rsa.h
libeap/src/tls/tlsv1_client.c
libeap/src/tls/tlsv1_client.h
libeap/src/tls/tlsv1_client_i.h
libeap/src/tls/tlsv1_client_read.c
libeap/src/tls/tlsv1_client_write.c
libeap/src/tls/tlsv1_common.c
libeap/src/tls/tlsv1_common.h
libeap/src/tls/tlsv1_cred.c
libeap/src/tls/tlsv1_cred.h
libeap/src/tls/tlsv1_record.c
libeap/src/tls/tlsv1_record.h
libeap/src/tls/tlsv1_server.c
libeap/src/tls/tlsv1_server.h
libeap/src/tls/tlsv1_server_i.h
libeap/src/tls/tlsv1_server_read.c
libeap/src/tls/tlsv1_server_write.c
libeap/src/tls/x509v3.c
libeap/src/tls/x509v3.h
libeap/src/utils/Makefile
libeap/src/utils/eloop.c
libeap/src/utils/eloop_win.c
libeap/src/utils/os_internal.c
libeap/src/utils/os_none.c
libeap/src/utils/os_win32.c
libeap/src/utils/pcsc_funcs.c
libeap/src/wps/Makefile
libeap/src/wps/http_client.c
libeap/src/wps/http_client.h
libeap/src/wps/http_server.c
libeap/src/wps/http_server.h
libeap/src/wps/httpread.c
libeap/src/wps/httpread.h
libeap/src/wps/ndef.c
libeap/src/wps/upnp_xml.c
libeap/src/wps/upnp_xml.h
libeap/src/wps/wps.c
libeap/src/wps/wps.h
libeap/src/wps/wps_attr_build.c
libeap/src/wps/wps_attr_parse.c
libeap/src/wps/wps_attr_process.c
libeap/src/wps/wps_common.c
libeap/src/wps/wps_defs.h
libeap/src/wps/wps_dev_attr.c
libeap/src/wps/wps_dev_attr.h
libeap/src/wps/wps_enrollee.c
libeap/src/wps/wps_er.c
libeap/src/wps/wps_er.h
libeap/src/wps/wps_er_ssdp.c
libeap/src/wps/wps_i.h
libeap/src/wps/wps_registrar.c
libeap/src/wps/wps_upnp.c
libeap/src/wps/wps_upnp.h
libeap/src/wps/wps_upnp_ap.c
libeap/src/wps/wps_upnp_event.c
libeap/src/wps/wps_upnp_i.h
libeap/src/wps/wps_upnp_ssdp.c
libeap/src/wps/wps_upnp_web.c
libeap/src/wps/wps_validate.c
libeap/tests/.gitignore
libeap/tests/Makefile
libeap/tests/test-aes.c
libeap/tests/test-asn1.c
libeap/tests/test-base64.c
libeap/tests/test-list.c
libeap/tests/test-md4.c
libeap/tests/test-milenage.c
libeap/tests/test-sha1.c
libeap/tests/test-sha256.c
libeap/tests/test-x509.c
libeap/tests/test-x509v3.c
libeap/tests/test_x509v3_nist2.sh
libeap/wpa_supplicant/.gitignore
libeap/wpa_supplicant/ChangeLog
libeap/wpa_supplicant/Makefile
libeap/wpa_supplicant/README-WPS
libeap/wpa_supplicant/README-Windows.txt
libeap/wpa_supplicant/ap.c
libeap/wpa_supplicant/ap.h
libeap/wpa_supplicant/bgscan.c
libeap/wpa_supplicant/bgscan.h
libeap/wpa_supplicant/bgscan_learn.c
libeap/wpa_supplicant/bgscan_simple.c
libeap/wpa_supplicant/blacklist.c
libeap/wpa_supplicant/blacklist.h
libeap/wpa_supplicant/bss.c
libeap/wpa_supplicant/bss.h
libeap/wpa_supplicant/config.c
libeap/wpa_supplicant/config.h
libeap/wpa_supplicant/config_file.c
libeap/wpa_supplicant/config_none.c
libeap/wpa_supplicant/config_ssid.h
libeap/wpa_supplicant/config_winreg.c
libeap/wpa_supplicant/ctrl_iface.c
libeap/wpa_supplicant/ctrl_iface.h
libeap/wpa_supplicant/ctrl_iface_named_pipe.c
libeap/wpa_supplicant/ctrl_iface_udp.c
libeap/wpa_supplicant/ctrl_iface_unix.c
libeap/wpa_supplicant/dbus/Makefile
libeap/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
libeap/wpa_supplicant/dbus/dbus_common.c
libeap/wpa_supplicant/dbus/dbus_common.h
libeap/wpa_supplicant/dbus/dbus_common_i.h
libeap/wpa_supplicant/dbus/dbus_dict_helpers.c
libeap/wpa_supplicant/dbus/dbus_dict_helpers.h
libeap/wpa_supplicant/dbus/dbus_new.c
libeap/wpa_supplicant/dbus/dbus_new.h
libeap/wpa_supplicant/dbus/dbus_new_handlers.c
libeap/wpa_supplicant/dbus/dbus_new_handlers.h
libeap/wpa_supplicant/dbus/dbus_new_handlers_wps.c
libeap/wpa_supplicant/dbus/dbus_new_helpers.c
libeap/wpa_supplicant/dbus/dbus_new_helpers.h
libeap/wpa_supplicant/dbus/dbus_new_introspect.c
libeap/wpa_supplicant/dbus/dbus_old.c
libeap/wpa_supplicant/dbus/dbus_old.h
libeap/wpa_supplicant/dbus/dbus_old_handlers.c
libeap/wpa_supplicant/dbus/dbus_old_handlers.h
libeap/wpa_supplicant/dbus/dbus_old_handlers_wps.c
libeap/wpa_supplicant/defconfig
libeap/wpa_supplicant/doc/docbook/Makefile
libeap/wpa_supplicant/doc/docbook/wpa_background.sgml
libeap/wpa_supplicant/doc/docbook/wpa_cli.sgml
libeap/wpa_supplicant/doc/docbook/wpa_gui.sgml
libeap/wpa_supplicant/doc/docbook/wpa_passphrase.sgml
libeap/wpa_supplicant/doc/docbook/wpa_priv.sgml
libeap/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
libeap/wpa_supplicant/driver_i.h
libeap/wpa_supplicant/eap_register.c
libeap/wpa_supplicant/eapol_test.c
libeap/wpa_supplicant/events.c
libeap/wpa_supplicant/examples/p2p-action.sh
libeap/wpa_supplicant/examples/udhcpd-p2p.conf
libeap/wpa_supplicant/examples/wpas-dbus-new-signals.py
libeap/wpa_supplicant/ibss_rsn.c
libeap/wpa_supplicant/ibss_rsn.h
libeap/wpa_supplicant/main.c
libeap/wpa_supplicant/main_none.c
libeap/wpa_supplicant/main_winmain.c
libeap/wpa_supplicant/main_winsvc.c
libeap/wpa_supplicant/notify.c
libeap/wpa_supplicant/notify.h
libeap/wpa_supplicant/p2p_supplicant.c
libeap/wpa_supplicant/p2p_supplicant.h
libeap/wpa_supplicant/preauth_test.c
libeap/wpa_supplicant/scan.c
libeap/wpa_supplicant/scan.h
libeap/wpa_supplicant/sme.c
libeap/wpa_supplicant/sme.h
libeap/wpa_supplicant/todo.txt
libeap/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
libeap/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
libeap/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
libeap/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
libeap/wpa_supplicant/win_if_list.c
libeap/wpa_supplicant/wpa_cli.c
libeap/wpa_supplicant/wpa_gui-qt4/addinterface.cpp
libeap/wpa_supplicant/wpa_gui-qt4/addinterface.h
libeap/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp
libeap/wpa_supplicant/wpa_gui-qt4/eventhistory.h
libeap/wpa_supplicant/wpa_gui-qt4/main.cpp
libeap/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
libeap/wpa_supplicant/wpa_gui-qt4/networkconfig.h
libeap/wpa_supplicant/wpa_gui-qt4/peers.cpp
libeap/wpa_supplicant/wpa_gui-qt4/peers.h
libeap/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
libeap/wpa_supplicant/wpa_gui-qt4/scanresults.h
libeap/wpa_supplicant/wpa_gui-qt4/stringquery.cpp
libeap/wpa_supplicant/wpa_gui-qt4/stringquery.h
libeap/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp
libeap/wpa_supplicant/wpa_gui-qt4/userdatarequest.h
libeap/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro
libeap/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
libeap/wpa_supplicant/wpa_gui-qt4/wpagui.h
libeap/wpa_supplicant/wpa_gui-qt4/wpamsg.h
libeap/wpa_supplicant/wpa_passphrase.c
libeap/wpa_supplicant/wpa_priv.c
libeap/wpa_supplicant/wpa_supplicant.c
libeap/wpa_supplicant/wpa_supplicant.conf
libeap/wpa_supplicant/wpa_supplicant_i.h
libeap/wpa_supplicant/wpas_glue.c
libeap/wpa_supplicant/wpas_glue.h
libeap/wpa_supplicant/wps_supplicant.c
libeap/wpa_supplicant/wps_supplicant.h
mech_eap/dictionary.ukerna

1  2 
build-aux/compile
mech_eap/init_sec_context.c

@@@ -1,9 -1,9 +1,9 @@@
  #! /bin/sh
  # Wrapper for compilers which do not understand '-c -o'.
  
- scriptversion=2012-10-14.11; # UTC
+ scriptversion=2016-06-08.14; # UTC
  
 -# Copyright (C) 1999-2013 Free Software Foundation, Inc.
 +# Copyright (C) 1999-2014 Free Software Foundation, Inc.
  # Written by Tom Tromey <tromey@cygnus.com>.
  #
  # This program is free software; you can redistribute it and/or modify
Simple merge