[pkg-wpa-devel] [wpa] 04/06: Merge tag 'upstream/2.6' into debian/master
Andrew Shadura
andrewsh at debian.org
Thu Oct 20 16:35:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
andrewsh pushed a commit to annotated tag debian/2.6-1
in repository wpa.
commit 2f9c9f4e3f658239c068eb5d91a1f662ac43b522
Merge: c910680 1e2b756
Author: Andrew Shadura <andrewsh at debian.org>
Date: Thu Oct 20 18:23:40 2016 +0200
Merge tag 'upstream/2.6' into debian/master
Upstream version 2.6
CONTRIBUTIONS | 30 +-
COPYING | 2 +-
README | 2 +-
hostapd/Android.mk | 45 +-
hostapd/ChangeLog | 73 ++
hostapd/Makefile | 106 +-
hostapd/README | 2 +-
hostapd/android.config | 8 +
hostapd/config_file.c | 216 +++-
hostapd/ctrl_iface.c | 860 ++++++++++---
hostapd/defconfig | 17 +
hostapd/hapd_module_tests.c | 1 +
hostapd/hlr_auc_gw.c | 136 +--
hostapd/hostapd.android.rc | 20 +
hostapd/hostapd.conf | 143 ++-
hostapd/hostapd_cli.c | 650 +++++++---
hostapd/main.c | 131 +-
hs20/client/Android.mk | 2 +-
hs20/client/Makefile | 1 +
hs20/client/est.c | 60 +-
hs20/client/osu_client.c | 35 +-
hs20/server/www/spp.php | 3 +-
patches/openssl-0.9.8za-tls-extensions.patch | 397 ------
patches/openssl-0.9.8zf-tls-extensions.patch | 398 ------
src/ap/accounting.c | 256 ++--
src/ap/accounting.h | 7 +-
src/ap/acs.c | 6 +-
src/ap/ap_config.c | 70 +-
src/ap/ap_config.h | 55 +-
src/ap/ap_drv_ops.c | 228 ++--
src/ap/ap_drv_ops.h | 18 +-
src/ap/ap_mlme.c | 3 +
src/ap/authsrv.c | 3 +
src/ap/beacon.c | 242 +++-
src/ap/beacon.h | 3 +
src/ap/ctrl_iface_ap.c | 121 +-
src/ap/ctrl_iface_ap.h | 8 +
src/ap/dfs.c | 26 +-
src/ap/dhcp_snoop.c | 3 +-
src/ap/drv_callbacks.c | 111 +-
src/ap/gas_serv.c | 297 ++++-
src/ap/gas_serv.h | 19 +
src/ap/hostapd.c | 424 ++++++-
src/ap/hostapd.h | 56 +-
src/ap/hw_features.c | 6 +-
src/ap/iapp.c | 17 +-
src/ap/ieee802_11.c | 631 +++++++---
src/ap/ieee802_11.h | 33 +-
src/ap/ieee802_11_auth.c | 154 ++-
src/ap/ieee802_11_auth.h | 5 +-
src/ap/ieee802_11_ht.c | 23 +
src/ap/ieee802_11_shared.c | 78 ++
src/ap/ieee802_11_vht.c | 202 ++-
src/ap/ieee802_1x.c | 239 ++--
src/ap/ieee802_1x.h | 2 +-
src/ap/mbo_ap.c | 244 ++++
src/ap/mbo_ap.h | 51 +
src/ap/ndisc_snoop.c | 1 +
src/ap/neighbor_db.c | 133 ++
src/ap/neighbor_db.h | 24 +
src/ap/pmksa_cache_auth.c | 111 +-
src/ap/pmksa_cache_auth.h | 14 +-
src/ap/rrm.c | 544 +++++++++
src/ap/rrm.h | 28 +
src/ap/sta_info.c | 322 +++--
src/ap/sta_info.h | 74 +-
src/ap/taxonomy.c | 291 +++++
src/ap/taxonomy.h | 24 +
src/ap/vlan.c | 34 +
src/ap/vlan.h | 30 +
src/ap/vlan_full.c | 752 ++++++++++++
src/ap/vlan_ifconfig.c | 69 ++
src/ap/vlan_init.c | 973 ++-------------
src/ap/vlan_init.h | 17 +-
src/ap/vlan_ioctl.c | 155 +++
src/ap/vlan_util.c | 44 +-
src/ap/vlan_util.h | 18 +-
src/ap/wnm_ap.c | 39 +-
src/ap/wnm_ap.h | 3 +-
src/ap/wpa_auth.c | 223 +++-
src/ap/wpa_auth.h | 40 +-
src/ap/wpa_auth_ft.c | 10 +-
src/ap/wpa_auth_glue.c | 20 +-
src/ap/wpa_auth_i.h | 4 +-
src/ap/wpa_auth_ie.c | 19 +-
src/ap/wps_hostapd.c | 34 +-
src/common/cli.c | 267 ++++
src/common/cli.h | 47 +
src/common/common_module_tests.c | 1 +
src/common/ctrl_iface_common.c | 173 +++
src/common/ctrl_iface_common.h | 38 +
src/common/defs.h | 15 +-
src/common/eapol_common.h | 2 +-
src/common/ieee802_11_common.c | 212 +++-
src/common/ieee802_11_common.h | 28 +
src/common/ieee802_11_defs.h | 245 +++-
src/common/ieee802_1x_defs.h | 2 +-
src/common/linux_bridge.h | 24 +
src/common/linux_vlan.h | 52 +
src/common/qca-vendor.h | 1235 ++++++++++++++++++-
src/common/sae.c | 32 +-
src/common/sae.h | 1 +
src/common/version.h | 6 +-
src/common/wpa_common.c | 141 ++-
src/common/wpa_common.h | 4 +-
src/common/wpa_ctrl.c | 2 +
src/common/wpa_ctrl.h | 32 +
src/common/wpa_helpers.c | 3 +-
src/crypto/Makefile | 4 +-
src/crypto/aes-cbc.c | 6 +
src/crypto/aes-omac1.c | 3 +
src/crypto/crypto.h | 25 +-
src/crypto/crypto_internal.c | 50 +
src/crypto/crypto_module_tests.c | 61 +-
src/crypto/crypto_openssl.c | 403 ++++--
src/crypto/dh_group5.c | 1 +
src/crypto/dh_groups.c | 7 +-
src/crypto/fips_prf_openssl.c | 25 +-
src/crypto/md4-internal.c | 3 +
src/crypto/md5-internal.c | 3 +
src/crypto/ms_funcs.c | 2 +-
src/crypto/sha1-internal.c | 4 +-
src/crypto/sha256-internal.c | 3 +
src/crypto/sha256-prf.c | 26 +-
src/crypto/sha256.h | 12 +-
src/crypto/sha384-internal.c | 92 ++
src/crypto/sha384_i.h | 23 +
src/crypto/sha512-internal.c | 264 ++++
src/crypto/sha512_i.h | 25 +
src/crypto/tls.h | 47 +-
src/crypto/tls_gnutls.c | 81 +-
src/crypto/tls_internal.c | 64 +-
src/crypto/tls_none.c | 12 +-
src/crypto/tls_openssl.c | 586 ++++++---
src/crypto/tls_openssl.h | 19 +
src/crypto/tls_openssl_ocsp.c | 846 +++++++++++++
src/drivers/driver.h | 344 +++++-
src/drivers/driver_atheros.c | 176 +--
src/drivers/driver_bsd.c | 346 ++++--
src/drivers/driver_common.c | 57 +-
src/drivers/driver_hostap.c | 19 +-
src/drivers/driver_macsec_qca.c | 14 +-
src/drivers/driver_ndis.c | 16 +-
src/drivers/driver_nl80211.c | 1163 ++++++++++++++----
src/drivers/driver_nl80211.h | 36 +-
src/drivers/driver_nl80211_capa.c | 246 +++-
src/drivers/driver_nl80211_event.c | 309 ++++-
src/drivers/driver_nl80211_monitor.c | 2 +-
src/drivers/driver_nl80211_scan.c | 408 ++++++-
src/drivers/driver_privsep.c | 4 +-
src/drivers/driver_roboswitch.c | 6 +-
src/drivers/driver_wext.c | 30 +-
src/drivers/driver_wired.c | 11 +-
src/drivers/drivers.c | 36 -
src/drivers/drivers.mak | 13 +-
src/drivers/drivers.mk | 13 +-
src/drivers/nl80211_copy.h | 311 ++++-
src/drivers/rfkill.c | 46 +-
src/eap_common/eap_eke_common.c | 42 +-
src/eap_common/eap_fast_common.c | 25 +-
src/eap_common/eap_fast_common.h | 6 +-
src/eap_common/eap_gpsk_common.c | 9 +-
src/eap_common/eap_pax_common.c | 6 +-
src/eap_common/eap_pwd_common.c | 20 +
src/eap_common/eap_sake_common.c | 2 +-
src/eap_common/ikev2_common.c | 15 +-
src/eap_peer/eap.c | 80 +-
src/eap_peer/eap_aka.c | 13 +-
src/eap_peer/eap_config.h | 20 +-
src/eap_peer/eap_eke.c | 7 +-
src/eap_peer/eap_fast.c | 83 +-
src/eap_peer/eap_fast_pac.c | 9 +-
src/eap_peer/eap_gpsk.c | 6 +-
src/eap_peer/eap_gtc.c | 6 +-
src/eap_peer/eap_i.h | 2 +
src/eap_peer/eap_ikev2.c | 6 +-
src/eap_peer/eap_leap.c | 6 +-
src/eap_peer/eap_md5.c | 6 +-
src/eap_peer/eap_methods.c | 17 +-
src/eap_peer/eap_methods.h | 1 -
src/eap_peer/eap_mschapv2.c | 6 +-
src/eap_peer/eap_otp.c | 6 +-
src/eap_peer/eap_pax.c | 49 +-
src/eap_peer/eap_peap.c | 76 +-
src/eap_peer/eap_psk.c | 6 +-
src/eap_peer/eap_pwd.c | 18 +-
src/eap_peer/eap_sake.c | 25 +-
src/eap_peer/eap_sim.c | 10 +-
src/eap_peer/eap_tls.c | 60 +-
src/eap_peer/eap_tls_common.c | 23 +-
src/eap_peer/eap_tnc.c | 18 +-
src/eap_peer/eap_ttls.c | 128 +-
src/eap_peer/eap_vendor_test.c | 6 +-
src/eap_peer/eap_wsc.c | 12 +-
src/eap_peer/ikev2.c | 4 +-
src/eap_peer/tncc.c | 19 +-
src/eap_server/eap_methods.h | 1 -
src/eap_server/eap_server_aka.c | 13 +-
src/eap_server/eap_server_eke.c | 6 +-
src/eap_server/eap_server_fast.c | 56 +-
src/eap_server/eap_server_gpsk.c | 6 +-
src/eap_server/eap_server_gtc.c | 6 +-
src/eap_server/eap_server_identity.c | 6 +-
src/eap_server/eap_server_ikev2.c | 6 +-
src/eap_server/eap_server_md5.c | 6 +-
src/eap_server/eap_server_methods.c | 15 +-
src/eap_server/eap_server_mschapv2.c | 6 +-
src/eap_server/eap_server_pax.c | 6 +-
src/eap_server/eap_server_peap.c | 24 +-
src/eap_server/eap_server_psk.c | 6 +-
src/eap_server/eap_server_pwd.c | 21 +-
src/eap_server/eap_server_sake.c | 6 +-
src/eap_server/eap_server_sim.c | 6 +-
src/eap_server/eap_server_tls.c | 18 +-
src/eap_server/eap_server_tls_common.c | 4 +-
src/eap_server/eap_server_tnc.c | 6 +-
src/eap_server/eap_server_ttls.c | 6 +-
src/eap_server/eap_server_vendor_test.c | 6 +-
src/eap_server/eap_server_wsc.c | 6 +-
src/eap_server/eap_sim_db.c | 88 +-
src/eap_server/eap_sim_db.h | 2 +-
src/eap_server/ikev2.c | 6 +-
src/eap_server/tncs.c | 14 +-
src/eapol_auth/eapol_auth_sm.c | 21 +-
src/eapol_auth/eapol_auth_sm_i.h | 12 +-
src/eapol_supp/eapol_supp_sm.c | 10 +
src/fst/fst.c | 8 +-
src/fst/fst_ctrl_aux.c | 31 +-
src/fst/fst_ctrl_iface.c | 8 +-
src/fst/fst_defs.h | 10 +-
src/fst/fst_group.c | 270 ++--
src/fst/fst_group.h | 12 +-
src/fst/fst_iface.c | 7 +-
src/fst/fst_iface.h | 3 +-
src/fst/fst_session.c | 95 +-
src/l2_packet/l2_packet_linux.c | 40 +-
src/l2_packet/l2_packet_pcap.c | 12 +
src/p2p/p2p.c | 267 +++-
src/p2p/p2p.h | 71 +-
src/p2p/p2p_build.c | 6 +-
src/p2p/p2p_go_neg.c | 27 +-
src/p2p/p2p_group.c | 23 +-
src/p2p/p2p_i.h | 14 +
src/p2p/p2p_invitation.c | 4 +-
src/p2p/p2p_parse.c | 98 +-
src/p2p/p2p_pd.c | 888 +++++++++-----
src/p2p/p2p_sd.c | 74 +-
src/pae/ieee802_1x_cp.c | 56 +-
src/pae/ieee802_1x_cp.h | 14 +-
src/pae/ieee802_1x_kay.c | 1128 ++++++++---------
src/pae/ieee802_1x_kay.h | 13 +-
src/pae/ieee802_1x_kay_i.h | 164 ++-
src/pae/ieee802_1x_secy_ops.c | 5 +-
src/pae/ieee802_1x_secy_ops.h | 3 +-
src/radius/radius.c | 124 +-
src/radius/radius.h | 19 +-
src/radius/radius_client.c | 150 ++-
src/radius/radius_client.h | 3 +
src/radius/radius_das.c | 11 +-
src/radius/radius_das.h | 1 +
src/rsn_supp/pmksa_cache.c | 13 +-
src/rsn_supp/pmksa_cache.h | 8 +-
src/rsn_supp/preauth.c | 6 +-
src/rsn_supp/preauth.h | 6 +-
src/rsn_supp/tdls.c | 25 +-
src/rsn_supp/wpa.c | 167 ++-
src/rsn_supp/wpa.h | 14 +-
src/rsn_supp/wpa_i.h | 16 +-
src/rsn_supp/wpa_ie.c | 6 +-
src/tls/Makefile | 1 +
src/tls/asn1.h | 4 +-
src/tls/pkcs5.c | 446 ++++++-
src/tls/tlsv1_client.c | 55 +-
src/tls/tlsv1_client.h | 10 +-
src/tls/tlsv1_client_i.h | 18 +-
src/tls/tlsv1_client_ocsp.c | 803 ++++++++++++
src/tls/tlsv1_client_read.c | 487 +++++++-
src/tls/tlsv1_client_write.c | 158 ++-
src/tls/tlsv1_common.c | 39 +-
src/tls/tlsv1_common.h | 5 +-
src/tls/tlsv1_cred.c | 777 +++++++++++-
src/tls/tlsv1_cred.h | 8 +
src/tls/tlsv1_server_i.h | 3 +
src/tls/tlsv1_server_read.c | 86 ++
src/tls/tlsv1_server_write.c | 168 ++-
src/tls/x509v3.c | 300 ++++-
src/tls/x509v3.h | 36 +-
src/utils/browser-android.c | 6 +-
src/utils/common.c | 83 +-
src/utils/common.h | 16 +
src/utils/edit_simple.c | 6 +
src/utils/eloop.c | 292 ++++-
src/utils/eloop.h | 8 +
src/utils/eloop_win.c | 6 +
src/utils/ext_password.c | 4 -
src/utils/ext_password_i.h | 6 +
src/utils/http_curl.c | 74 +-
src/utils/module_tests.h | 20 +
src/utils/os.h | 4 +
src/utils/os_unix.c | 15 +-
src/utils/pcsc_funcs.c | 29 +-
src/utils/platform.h | 4 +-
src/utils/radiotap.c | 2 +-
src/utils/radiotap.h | 4 +-
src/utils/radiotap_iter.h | 2 +-
src/utils/trace.c | 9 +
src/utils/trace.h | 2 +
src/utils/utils_module_tests.c | 1 +
src/utils/wpa_debug.c | 24 +-
src/utils/wpabuf.c | 30 +
src/utils/wpabuf.h | 17 +-
src/utils/xml_libxml2.c | 2 +
src/wps/wps.c | 6 +-
src/wps/wps.h | 14 +-
src/wps/wps_attr_build.c | 31 +-
src/wps/wps_attr_parse.c | 4 +-
src/wps/wps_attr_process.c | 10 +
src/wps/wps_common.c | 47 +-
src/wps/wps_defs.h | 4 +
src/wps/wps_enrollee.c | 33 +-
src/wps/wps_i.h | 4 +-
src/wps/wps_module_tests.c | 3 +-
src/wps/wps_registrar.c | 77 +-
src/wps/wps_upnp.c | 11 +-
src/wps/wps_upnp.h | 3 +
src/wps/wps_upnp_i.h | 3 +-
src/wps/wps_upnp_ssdp.c | 6 -
src/wps/wps_upnp_web.c | 88 +-
wpa_supplicant/Android.mk | 166 +--
wpa_supplicant/ChangeLog | 144 +++
wpa_supplicant/Makefile | 162 +--
wpa_supplicant/README | 48 +-
wpa_supplicant/README-HS20 | 67 +-
wpa_supplicant/README-P2P | 22 +-
wpa_supplicant/android.config | 12 +-
wpa_supplicant/ap.c | 200 ++-
wpa_supplicant/ap.h | 10 +-
wpa_supplicant/autoscan.c | 34 +-
wpa_supplicant/autoscan.h | 10 +
wpa_supplicant/bgscan.c | 6 -
wpa_supplicant/bgscan.h | 9 +
wpa_supplicant/binder/.clang-format | 9 +
wpa_supplicant/binder/binder.cpp | 104 ++
wpa_supplicant/binder/binder.h | 46 +
wpa_supplicant/binder/binder_constants.cpp | 18 +
wpa_supplicant/binder/binder_constants.h | 21 +
wpa_supplicant/binder/binder_i.h | 28 +
wpa_supplicant/binder/binder_manager.cpp | 100 ++
wpa_supplicant/binder/binder_manager.h | 58 +
.../binder/fi/w1/wpa_supplicant/IIface.aidl | 16 +
.../binder/fi/w1/wpa_supplicant/ISupplicant.aidl | 59 +
.../fi/w1/wpa_supplicant/ISupplicantCallbacks.aidl | 20 +
wpa_supplicant/binder/iface.cpp | 16 +
wpa_supplicant/binder/iface.h | 42 +
wpa_supplicant/binder/supplicant.cpp | 127 ++
wpa_supplicant/binder/supplicant.h | 55 +
wpa_supplicant/bss.c | 97 +-
wpa_supplicant/bss.h | 20 +
wpa_supplicant/config.c | 190 ++-
wpa_supplicant/config.h | 88 +-
wpa_supplicant/config_file.c | 45 +
wpa_supplicant/config_ssid.h | 45 +
wpa_supplicant/config_winreg.c | 1 +
wpa_supplicant/ctrl_iface.c | 1052 ++++++++++++----
wpa_supplicant/ctrl_iface_udp.c | 170 ++-
wpa_supplicant/ctrl_iface_unix.c | 358 ++++--
wpa_supplicant/dbus/dbus-wpa_supplicant.conf | 2 -
wpa_supplicant/dbus/dbus_common_i.h | 10 +-
wpa_supplicant/dbus/dbus_dict_helpers.c | 74 --
wpa_supplicant/dbus/dbus_dict_helpers.h | 15 -
wpa_supplicant/dbus/dbus_new.c | 359 +++++-
wpa_supplicant/dbus/dbus_new.h | 7 +-
wpa_supplicant/dbus/dbus_new_handlers.c | 655 +++++++---
wpa_supplicant/dbus/dbus_new_handlers.h | 267 ++--
wpa_supplicant/dbus/dbus_new_handlers_p2p.c | 201 +--
wpa_supplicant/dbus/dbus_new_handlers_p2p.h | 164 +--
wpa_supplicant/dbus/dbus_new_handlers_wps.c | 26 +-
wpa_supplicant/dbus/dbus_new_helpers.c | 9 +-
wpa_supplicant/dbus/dbus_new_helpers.h | 12 +-
wpa_supplicant/dbus/dbus_new_introspect.c | 4 +-
wpa_supplicant/dbus/dbus_old_handlers.c | 23 +-
wpa_supplicant/defconfig | 44 +
wpa_supplicant/doc/docbook/eapol_test.sgml | 2 +-
wpa_supplicant/doc/docbook/wpa_background.sgml | 2 +-
wpa_supplicant/doc/docbook/wpa_cli.sgml | 2 +-
wpa_supplicant/doc/docbook/wpa_gui.sgml | 2 +-
wpa_supplicant/doc/docbook/wpa_passphrase.sgml | 2 +-
wpa_supplicant/doc/docbook/wpa_priv.sgml | 2 +-
wpa_supplicant/doc/docbook/wpa_supplicant.sgml | 9 +-
wpa_supplicant/driver_i.h | 82 +-
wpa_supplicant/eapol_test.c | 18 +-
wpa_supplicant/events.c | 530 ++++++--
wpa_supplicant/gas_query.c | 154 ++-
wpa_supplicant/gas_query.h | 2 -
wpa_supplicant/hs20_supplicant.c | 313 ++++-
wpa_supplicant/hs20_supplicant.h | 15 +-
wpa_supplicant/ibss_rsn.c | 12 +-
wpa_supplicant/ibss_rsn.h | 3 +-
wpa_supplicant/interworking.c | 231 ++--
wpa_supplicant/interworking.h | 3 +-
wpa_supplicant/libwpa_test.c | 32 +
wpa_supplicant/main.c | 96 +-
wpa_supplicant/mbo.c | 836 +++++++++++++
wpa_supplicant/mesh.c | 130 +-
wpa_supplicant/mesh.h | 3 +
wpa_supplicant/mesh_mpm.c | 376 ++++--
wpa_supplicant/mesh_mpm.h | 5 +-
wpa_supplicant/mesh_rsn.c | 374 ++++--
wpa_supplicant/mesh_rsn.h | 11 +-
wpa_supplicant/notify.c | 25 +-
wpa_supplicant/notify.h | 3 +-
wpa_supplicant/offchannel.c | 52 +-
wpa_supplicant/p2p_supplicant.c | 1289 ++++++++++++++------
wpa_supplicant/p2p_supplicant.h | 26 +-
wpa_supplicant/p2p_supplicant_sd.c | 18 +-
wpa_supplicant/scan.c | 471 +++++--
wpa_supplicant/scan.h | 13 +-
wpa_supplicant/sme.c | 125 +-
wpa_supplicant/systemd/wpa_supplicant.service.in | 4 +-
wpa_supplicant/tests/link_test.c | 83 --
wpa_supplicant/tests/test_eap_sim_common.c | 47 -
wpa_supplicant/tests/test_wpa.c | 369 ------
wpa_supplicant/wmm_ac.h | 2 +-
wpa_supplicant/wnm_sta.c | 503 +++++++-
wpa_supplicant/wnm_sta.h | 2 +-
wpa_supplicant/wpa_cli.c | 529 ++++----
wpa_supplicant/wpa_priv.c | 61 +-
wpa_supplicant/wpa_supplicant.c | 1197 ++++++++++++++++--
wpa_supplicant/wpa_supplicant.conf | 184 ++-
wpa_supplicant/wpa_supplicant_i.h | 149 ++-
wpa_supplicant/wpas_glue.c | 11 +-
wpa_supplicant/wpas_kay.c | 11 +-
wpa_supplicant/wpas_module_tests.c | 33 +-
wpa_supplicant/wps_supplicant.c | 46 +-
wpa_supplicant/wps_supplicant.h | 7 +
435 files changed, 33321 insertions(+), 10209 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/wpa.git
More information about the Pkg-wpa-devel
mailing list