Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/wpa/dist 2018-12-02 - v2.7



details:   https://anonhg.NetBSD.org/src/rev/e288c0ae68dd
branches:  trunk
changeset: 447217:e288c0ae68dd
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 04 19:29:14 2019 +0000

description:
2018-12-02 - v2.7
* fixed WPA packet number reuse with replayed messages and key
  reinstallation
  [https://w1.fi/security/2017-1/] (CVE-2017-13077, CVE-2017-13078,
  CVE-2017-13079, CVE-2017-13080, CVE-2017-13081, CVE-2017-13082,
  CVE-2017-13086, CVE-2017-13087, CVE-2017-13088)
* fixed unauthenticated EAPOL-Key decryption in wpa_supplicant
  [https://w1.fi/security/2018-1/] (CVE-2018-14526)
* added support for FILS (IEEE 802.11ai) shared key authentication
* added support for OWE (Opportunistic Wireless Encryption, RFC 8110;
  and transition mode defined by WFA)
* added support for DPP (Wi-Fi Device Provisioning Protocol)
* added support for RSA 3k key case with Suite B 192-bit level
* fixed Suite B PMKSA caching not to update PMKID during each 4-way
  handshake
* fixed EAP-pwd pre-processing with PasswordHashHash
* added EAP-pwd client support for salted passwords
* fixed a regression in TDLS prohibited bit validation
* started to use estimated throughput to avoid undesired signal
  strength based roaming decision
* MACsec/MKA:
  - new macsec_linux driver interface support for the Linux
    kernel macsec module
  - number of fixes and extensions
* added support for external persistent storage of PMKSA cache
  (PMKSA_GET/PMKSA_ADD control interface commands; and
   MESH_PMKSA_GET/MESH_PMKSA_SET for the mesh case)
* fixed mesh channel configuration pri/sec switch case
* added support for beacon report
* large number of other fixes, cleanup, and extensions
* added support for randomizing local address for GAS queries
  (gas_rand_mac_addr parameter)
* fixed EAP-SIM/AKA/AKA' ext auth cases within TLS tunnel
* added option for using random WPS UUID (auto_uuid=1)
* added SHA256-hash support for OCSP certificate matching
* fixed EAP-AKA' to add AT_KDF into Synchronization-Failure
* fixed a regression in RSN pre-authentication candidate selection
* added option to configure allowed group management cipher suites
  (group_mgmt network profile parameter)
* removed all PeerKey functionality
* fixed nl80211 AP and mesh mode configuration regression with
  Linux 4.15 and newer
* added ap_isolate configuration option for AP mode
* added support for nl80211 to offload 4-way handshake into the driver
* added support for using wolfSSL cryptographic library
* SAE
  - added support for configuring SAE password separately of the
    WPA2 PSK/passphrase
  - fixed PTK and EAPOL-Key integrity and key-wrap algorithm selection
    for SAE;
    note: this is not backwards compatible, i.e., both the AP and
    station side implementations will need to be update at the same
    time to maintain interoperability
  - added support for Password Identifier
  - fixed FT-SAE PMKID matching
* Hotspot 2.0
  - added support for fetching of Operator Icon Metadata ANQP-element
  - added support for Roaming Consortium Selection element
  - added support for Terms and Conditions
  - added support for OSEN connection in a shared RSN BSS
  - added support for fetching Venue URL information
* added support for using OpenSSL 1.1.1
* FT
  - disabled PMKSA caching with FT since it is not fully functional
  - added support for SHA384 based AKM
  - added support for BIP ciphers BIP-CMAC-256, BIP-GMAC-128,
    BIP-GMAC-256 in addition to previously supported BIP-CMAC-128
  - fixed additional IE inclusion in Reassociation Request frame when
    using FT protocol

diffstat:

 external/bsd/wpa/dist/CONTRIBUTIONS                                    |     2 +-
 external/bsd/wpa/dist/COPYING                                          |     2 +-
 external/bsd/wpa/dist/README                                           |     2 +-
 external/bsd/wpa/dist/hostapd/Android.mk                               |   142 +-
 external/bsd/wpa/dist/hostapd/ChangeLog                                |    55 +
 external/bsd/wpa/dist/hostapd/Makefile                                 |   244 +-
 external/bsd/wpa/dist/hostapd/README                                   |    30 +-
 external/bsd/wpa/dist/hostapd/android.config                           |    17 +-
 external/bsd/wpa/dist/hostapd/config_file.c                            |   816 +-
 external/bsd/wpa/dist/hostapd/config_file.h                            |     5 +
 external/bsd/wpa/dist/hostapd/ctrl_iface.c                             |  1040 +-
 external/bsd/wpa/dist/hostapd/defconfig                                |    38 +-
 external/bsd/wpa/dist/hostapd/hlr_auc_gw.c                             |     4 +-
 external/bsd/wpa/dist/hostapd/hostapd.android.rc                       |     3 +-
 external/bsd/wpa/dist/hostapd/hostapd.conf                             |   449 +-
 external/bsd/wpa/dist/hostapd/hostapd.eap_user_sqlite                  |    18 +-
 external/bsd/wpa/dist/hs20/client/est.c                                |     6 -
 external/bsd/wpa/dist/hs20/client/oma_dm_client.c                      |     6 +
 external/bsd/wpa/dist/hs20/client/osu_client.c                         |   258 +-
 external/bsd/wpa/dist/hs20/client/osu_client.h                         |     1 +
 external/bsd/wpa/dist/src/ap/Makefile                                  |     9 +-
 external/bsd/wpa/dist/src/ap/acs.c                                     |    48 +-
 external/bsd/wpa/dist/src/ap/acs.h                                     |     5 +
 external/bsd/wpa/dist/src/ap/ap_config.c                               |   163 +-
 external/bsd/wpa/dist/src/ap/ap_config.h                               |   143 +-
 external/bsd/wpa/dist/src/ap/ap_drv_ops.h                              |    15 +-
 external/bsd/wpa/dist/src/ap/ap_mlme.c                                 |    16 +-
 external/bsd/wpa/dist/src/ap/authsrv.c                                 |    52 +-
 external/bsd/wpa/dist/src/ap/beacon.c                                  |    96 +-
 external/bsd/wpa/dist/src/ap/beacon.h                                  |     2 +-
 external/bsd/wpa/dist/src/ap/bss_load.c                                |    52 +-
 external/bsd/wpa/dist/src/ap/ctrl_iface_ap.c                           |   361 +-
 external/bsd/wpa/dist/src/ap/ctrl_iface_ap.h                           |     4 +
 external/bsd/wpa/dist/src/ap/dfs.c                                     |    65 +-
 external/bsd/wpa/dist/src/ap/dfs.h                                     |     5 +-
 external/bsd/wpa/dist/src/ap/dhcp_snoop.c                              |    39 +-
 external/bsd/wpa/dist/src/ap/dpp_hostapd.c                             |  2096 ++
 external/bsd/wpa/dist/src/ap/dpp_hostapd.h                             |    43 +
 external/bsd/wpa/dist/src/ap/eap_user_db.c                             |     2 +
 external/bsd/wpa/dist/src/ap/eth_p_oui.c                               |   191 +
 external/bsd/wpa/dist/src/ap/eth_p_oui.h                               |    28 +
 external/bsd/wpa/dist/src/ap/fils_hlp.c                                |   641 +
 external/bsd/wpa/dist/src/ap/fils_hlp.h                                |    27 +
 external/bsd/wpa/dist/src/ap/gas_query_ap.c                            |   714 +
 external/bsd/wpa/dist/src/ap/gas_query_ap.h                            |    43 +
 external/bsd/wpa/dist/src/ap/gas_serv.c                                |   538 +-
 external/bsd/wpa/dist/src/ap/gas_serv.h                                |    10 +-
 external/bsd/wpa/dist/src/ap/hs20.c                                    |    71 +
 external/bsd/wpa/dist/src/ap/hs20.h                                    |     4 +
 external/bsd/wpa/dist/src/ap/hw_features.c                             |   127 +-
 external/bsd/wpa/dist/src/ap/ieee802_11.h                              |    31 +
 external/bsd/wpa/dist/src/ap/ieee802_11_auth.c                         |    15 +-
 external/bsd/wpa/dist/src/ap/ieee802_11_auth.h                         |     3 +-
 external/bsd/wpa/dist/src/ap/ieee802_11_he.c                           |    88 +
 external/bsd/wpa/dist/src/ap/ieee802_11_ht.c                           |    66 +-
 external/bsd/wpa/dist/src/ap/ieee802_11_shared.c                       |   200 +-
 external/bsd/wpa/dist/src/ap/ieee802_11_vht.c                          |     2 +-
 external/bsd/wpa/dist/src/ap/ieee802_1x.c                              |   212 +-
 external/bsd/wpa/dist/src/ap/ieee802_1x.h                              |     5 +
 external/bsd/wpa/dist/src/ap/ndisc_snoop.c                             |     1 +
 external/bsd/wpa/dist/src/ap/neighbor_db.c                             |     9 +-
 external/bsd/wpa/dist/src/ap/neighbor_db.h                             |     2 +-
 external/bsd/wpa/dist/src/ap/pmksa_cache_auth.c                        |   134 +-
 external/bsd/wpa/dist/src/ap/pmksa_cache_auth.h                        |    10 +
 external/bsd/wpa/dist/src/ap/rrm.c                                     |   164 +-
 external/bsd/wpa/dist/src/ap/rrm.h                                     |     5 +
 external/bsd/wpa/dist/src/ap/sta_info.c                                |   133 +-
 external/bsd/wpa/dist/src/ap/sta_info.h                                |    73 +-
 external/bsd/wpa/dist/src/ap/taxonomy.c                                |     1 +
 external/bsd/wpa/dist/src/ap/tkip_countermeasures.c                    |     5 +
 external/bsd/wpa/dist/src/ap/vlan_init.c                               |    14 +-
 external/bsd/wpa/dist/src/ap/wnm_ap.c                                  |   183 +-
 external/bsd/wpa/dist/src/ap/wnm_ap.h                                  |     3 +
 external/bsd/wpa/dist/src/ap/wpa_auth_glue.c                           |   712 +-
 external/bsd/wpa/dist/src/ap/wpa_auth_ie.c                             |   259 +-
 external/bsd/wpa/dist/src/ap/wpa_auth_ie.h                             |    14 +-
 external/bsd/wpa/dist/src/ap/wps_hostapd.c                             |     4 +-
 external/bsd/wpa/dist/src/common/common_module_tests.c                 |    55 +
 external/bsd/wpa/dist/src/common/ctrl_iface_common.c                   |    38 +-
 external/bsd/wpa/dist/src/common/ctrl_iface_common.h                   |     6 +-
 external/bsd/wpa/dist/src/common/defs.h                                |    70 +-
 external/bsd/wpa/dist/src/common/dhcp.h                                |   263 +
 external/bsd/wpa/dist/src/common/dpp.c                                 |  7691 ++++++++++
 external/bsd/wpa/dist/src/common/dpp.h                                 |   435 +
 external/bsd/wpa/dist/src/common/gas.c                                 |     2 +-
 external/bsd/wpa/dist/src/common/gas.h                                 |     3 +
 external/bsd/wpa/dist/src/common/gas_server.c                          |   487 +
 external/bsd/wpa/dist/src/common/gas_server.h                          |    44 +
 external/bsd/wpa/dist/src/common/hw_features_common.c                  |   106 +-
 external/bsd/wpa/dist/src/common/hw_features_common.h                  |     3 +
 external/bsd/wpa/dist/src/common/ieee802_11_common.c                   |   455 +-
 external/bsd/wpa/dist/src/common/ieee802_11_common.h                   |    50 +-
 external/bsd/wpa/dist/src/common/ieee802_11_defs.h                     |   520 +-
 external/bsd/wpa/dist/src/common/ieee802_1x_defs.h                     |     8 +
 external/bsd/wpa/dist/src/common/privsep_commands.h                    |    25 +-
 external/bsd/wpa/dist/src/common/qca-vendor.h                          |  4761 ++++++-
 external/bsd/wpa/dist/src/common/sae.c                                 |   243 +-
 external/bsd/wpa/dist/src/common/sae.h                                 |    15 +-
 external/bsd/wpa/dist/src/common/version.h                             |     2 +-
 external/bsd/wpa/dist/src/common/wpa_common.c                          |  1070 +-
 external/bsd/wpa/dist/src/common/wpa_ctrl.h                            |    91 +-
 external/bsd/wpa/dist/src/common/wpa_helpers.c                         |     3 +-
 external/bsd/wpa/dist/src/crypto/Makefile                              |     5 +
 external/bsd/wpa/dist/src/crypto/aes-ctr.c                             |    28 +-
 external/bsd/wpa/dist/src/crypto/aes-internal-dec.c                    |     4 +-
 external/bsd/wpa/dist/src/crypto/aes-internal-enc.c                    |     3 +-
 external/bsd/wpa/dist/src/crypto/aes-siv.c                             |    62 +-
 external/bsd/wpa/dist/src/crypto/aes.h                                 |     4 +-
 external/bsd/wpa/dist/src/crypto/aes_siv.h                             |    10 +-
 external/bsd/wpa/dist/src/crypto/aes_wrap.h                            |     4 +-
 external/bsd/wpa/dist/src/crypto/crypto.h                              |    80 +-
 external/bsd/wpa/dist/src/crypto/crypto_gnutls.c                       |   216 +-
 external/bsd/wpa/dist/src/crypto/crypto_internal-modexp.c              |    36 +
 external/bsd/wpa/dist/src/crypto/crypto_libtomcrypt.c                  |    49 +-
 external/bsd/wpa/dist/src/crypto/crypto_linux.c                        |  1006 +
 external/bsd/wpa/dist/src/crypto/crypto_module_tests.c                 |   434 +-
 external/bsd/wpa/dist/src/crypto/crypto_nettle.c                       |   437 +
 external/bsd/wpa/dist/src/crypto/crypto_none.c                         |     3 +-
 external/bsd/wpa/dist/src/crypto/crypto_openssl.c                      |   394 +-
 external/bsd/wpa/dist/src/crypto/crypto_wolfssl.c                      |  1791 ++
 external/bsd/wpa/dist/src/crypto/des-internal.c                        |    17 +-
 external/bsd/wpa/dist/src/crypto/dh_groups.c                           |    39 +-
 external/bsd/wpa/dist/src/crypto/fips_prf_wolfssl.c                    |    87 +
 external/bsd/wpa/dist/src/crypto/ms_funcs.c                            |    45 +-
 external/bsd/wpa/dist/src/crypto/ms_funcs.h                            |     8 +-
 external/bsd/wpa/dist/src/crypto/random.c                              |     5 +-
 external/bsd/wpa/dist/src/crypto/sha1-internal.c                       |     8 +-
 external/bsd/wpa/dist/src/crypto/sha256-internal.c                     |     6 +-
 external/bsd/wpa/dist/src/crypto/sha256-kdf.c                          |    20 +-
 external/bsd/wpa/dist/src/crypto/sha384-kdf.c                          |    87 +
 external/bsd/wpa/dist/src/crypto/sha384-prf.c                          |    28 +-
 external/bsd/wpa/dist/src/crypto/sha384.c                              |   104 +
 external/bsd/wpa/dist/src/crypto/sha384.h                              |    15 +-
 external/bsd/wpa/dist/src/crypto/sha512-kdf.c                          |    87 +
 external/bsd/wpa/dist/src/crypto/sha512-prf.c                          |   108 +
 external/bsd/wpa/dist/src/crypto/sha512.h                              |    27 +
 external/bsd/wpa/dist/src/crypto/tls.h                                 |    18 +
 external/bsd/wpa/dist/src/crypto/tls_gnutls.c                          |   157 +-
 external/bsd/wpa/dist/src/crypto/tls_internal.c                        |     8 +
 external/bsd/wpa/dist/src/crypto/tls_none.c                            |     7 +
 external/bsd/wpa/dist/src/crypto/tls_openssl.c                         |   651 +-
 external/bsd/wpa/dist/src/crypto/tls_wolfssl.c                         |  2175 ++
 external/bsd/wpa/dist/src/drivers/driver_atheros.c                     |   194 +-
 external/bsd/wpa/dist/src/drivers/driver_common.c                      |    23 +-
 external/bsd/wpa/dist/src/drivers/driver_hostap.c                      |    11 +-
 external/bsd/wpa/dist/src/drivers/driver_macsec_linux.c                |  1310 +
 external/bsd/wpa/dist/src/drivers/driver_macsec_qca.c                  |   659 +-
 external/bsd/wpa/dist/src/drivers/driver_ndis.c                        |    20 +-
 external/bsd/wpa/dist/src/drivers/driver_nl80211.c                     |  1686 +-
 external/bsd/wpa/dist/src/drivers/driver_nl80211.h                     |    28 +-
 external/bsd/wpa/dist/src/drivers/driver_nl80211_capa.c                |   270 +-
 external/bsd/wpa/dist/src/drivers/driver_nl80211_event.c               |   331 +-
 external/bsd/wpa/dist/src/drivers/driver_nl80211_monitor.c             |    11 +-
 external/bsd/wpa/dist/src/drivers/driver_nl80211_scan.c                |   450 +-
 external/bsd/wpa/dist/src/drivers/driver_privsep.c                     |    56 +-
 external/bsd/wpa/dist/src/drivers/driver_wext.c                        |    42 +-
 external/bsd/wpa/dist/src/drivers/driver_wired_common.c                |   322 +
 external/bsd/wpa/dist/src/drivers/driver_wired_common.h                |    34 +
 external/bsd/wpa/dist/src/drivers/drivers.c                            |     3 +
 external/bsd/wpa/dist/src/drivers/drivers.mak                          |    13 +
 external/bsd/wpa/dist/src/drivers/drivers.mk                           |    12 +
 external/bsd/wpa/dist/src/drivers/nl80211_copy.h                       |  1003 +-
 external/bsd/wpa/dist/src/eap_common/eap_eke_common.c                  |    32 +-
 external/bsd/wpa/dist/src/eap_common/eap_fast_common.c                 |     2 +-
 external/bsd/wpa/dist/src/eap_common/eap_pwd_common.c                  |   345 +-
 external/bsd/wpa/dist/src/eap_common/eap_pwd_common.h                  |    19 +-
 external/bsd/wpa/dist/src/eap_common/eap_sim_common.c                  |     9 +-
 external/bsd/wpa/dist/src/eap_peer/eap.c                               |   368 +-
 external/bsd/wpa/dist/src/eap_peer/eap.h                               |    35 +
 external/bsd/wpa/dist/src/eap_peer/eap_aka.c                           |   123 +-
 external/bsd/wpa/dist/src/eap_peer/eap_config.h                        |    12 +
 external/bsd/wpa/dist/src/eap_peer/eap_eke.c                           |    12 +-
 external/bsd/wpa/dist/src/eap_peer/eap_fast.c                          |    16 +-
 external/bsd/wpa/dist/src/eap_peer/eap_fast_pac.c                      |    15 +-
 external/bsd/wpa/dist/src/eap_peer/eap_gpsk.c                          |    18 +-
 external/bsd/wpa/dist/src/eap_peer/eap_i.h                             |    13 +
 external/bsd/wpa/dist/src/eap_peer/eap_ikev2.c                         |     6 +-
 external/bsd/wpa/dist/src/eap_peer/eap_leap.c                          |    17 +-
 external/bsd/wpa/dist/src/eap_peer/eap_mschapv2.c                      |    18 +-
 external/bsd/wpa/dist/src/eap_peer/eap_pax.c                           |     3 +-
 external/bsd/wpa/dist/src/eap_peer/eap_peap.c                          |    12 +-
 external/bsd/wpa/dist/src/eap_peer/eap_proxy.h                         |    12 +-
 external/bsd/wpa/dist/src/eap_peer/eap_proxy_dummy.c                   |    23 +-
 external/bsd/wpa/dist/src/eap_peer/eap_psk.c                           |    12 +-
 external/bsd/wpa/dist/src/eap_peer/eap_sake.c                          |    12 +-
 external/bsd/wpa/dist/src/eap_peer/eap_sim.c                           |    61 +-
 external/bsd/wpa/dist/src/eap_peer/eap_tls.c                           |    34 +-
 external/bsd/wpa/dist/src/eap_peer/eap_tls_common.c                    |    44 +
 external/bsd/wpa/dist/src/eap_peer/eap_tls_common.h                    |     5 +
 external/bsd/wpa/dist/src/eap_peer/eap_ttls.c                          |    48 +-
 external/bsd/wpa/dist/src/eap_peer/ikev2.c                             |     3 +-
 external/bsd/wpa/dist/src/eap_peer/tncc.c                              |     6 +-
 external/bsd/wpa/dist/src/eap_server/eap.h                             |     6 +
 external/bsd/wpa/dist/src/eap_server/eap_i.h                           |     2 +
 external/bsd/wpa/dist/src/eap_server/eap_server_aka.c                  |     6 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_eke.c                  |     9 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_fast.c                 |     9 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_gpsk.c                 |    12 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_gtc.c                  |     3 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_ikev2.c                |     5 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_mschapv2.c             |     5 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_pax.c                  |     3 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_psk.c                  |    12 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_sake.c                 |     9 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_sim.c                  |     6 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_tls.c                  |    19 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_ttls.c                 |    21 +-
 external/bsd/wpa/dist/src/eap_server/eap_server_wsc.c                  |     2 +-
 external/bsd/wpa/dist/src/eap_server/eap_tls_common.h                  |     7 +-
 external/bsd/wpa/dist/src/eap_server/ikev2.c                           |     6 +-
 external/bsd/wpa/dist/src/eap_server/tncs.c                            |     6 +-
 external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm.c                   |    17 +-
 external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm.h                   |     1 +
 external/bsd/wpa/dist/src/eapol_supp/eapol_supp_sm.c                   |   113 +-
 external/bsd/wpa/dist/src/eapol_supp/eapol_supp_sm.h                   |    50 +-
 external/bsd/wpa/dist/src/fst/fst_ctrl_aux.h                           |    22 +-
 external/bsd/wpa/dist/src/fst/fst_ctrl_iface.c                         |     2 +-
 external/bsd/wpa/dist/src/fst/fst_group.c                              |     2 +-
 external/bsd/wpa/dist/src/fst/fst_iface.h                              |     2 +-
 external/bsd/wpa/dist/src/fst/fst_session.c                            |     2 -
 external/bsd/wpa/dist/src/l2_packet/l2_packet.h                        |     1 +
 external/bsd/wpa/dist/src/l2_packet/l2_packet_linux.c                  |    29 +
 external/bsd/wpa/dist/src/l2_packet/l2_packet_privsep.c                |     4 +-
 external/bsd/wpa/dist/src/p2p/p2p.h                                    |     3 +
 external/bsd/wpa/dist/src/p2p/p2p_go_neg.c                             |   114 +-
 external/bsd/wpa/dist/src/p2p/p2p_group.c                              |     2 +
 external/bsd/wpa/dist/src/p2p/p2p_i.h                                  |     7 +
 external/bsd/wpa/dist/src/p2p/p2p_pd.c                                 |     5 +-
 external/bsd/wpa/dist/src/p2p/p2p_sd.c                                 |     8 +-
 external/bsd/wpa/dist/src/pae/ieee802_1x_cp.c                          |     4 +
 external/bsd/wpa/dist/src/pae/ieee802_1x_kay.c                         |   392 +-
 external/bsd/wpa/dist/src/pae/ieee802_1x_kay.h                         |   136 +-
 external/bsd/wpa/dist/src/pae/ieee802_1x_kay_i.h                       |   180 +-
 external/bsd/wpa/dist/src/pae/ieee802_1x_secy_ops.c                    |   161 +-
 external/bsd/wpa/dist/src/pae/ieee802_1x_secy_ops.h                    |    11 +-
 external/bsd/wpa/dist/src/radius/radius.c                              |    21 +-
 external/bsd/wpa/dist/src/radius/radius.h                              |    10 +
 external/bsd/wpa/dist/src/radius/radius_client.c                       |     4 +-
 external/bsd/wpa/dist/src/radius/radius_das.h                          |     5 +
 external/bsd/wpa/dist/src/radius/radius_server.c                       |   654 +-
 external/bsd/wpa/dist/src/radius/radius_server.h                       |     5 +
 external/bsd/wpa/dist/src/rsn_supp/Makefile                            |     2 -
 external/bsd/wpa/dist/src/rsn_supp/pmksa_cache.c                       |   135 +-
 external/bsd/wpa/dist/src/rsn_supp/pmksa_cache.h                       |    45 +-
 external/bsd/wpa/dist/src/rsn_supp/preauth.c                           |    11 +-
 external/bsd/wpa/dist/src/rsn_supp/wpa.h                               |    69 +-
 external/bsd/wpa/dist/src/rsn_supp/wpa_ie.c                            |    68 +-
 external/bsd/wpa/dist/src/rsn_supp/wpa_ie.h                            |    10 -
 external/bsd/wpa/dist/src/tls/libtommath.c                             |   222 +-
 external/bsd/wpa/dist/src/tls/rsa.c                                    |     2 +-
 external/bsd/wpa/dist/src/tls/tlsv1_client.c                           |     2 +-
 external/bsd/wpa/dist/src/tls/tlsv1_client_read.c                      |     9 +-
 external/bsd/wpa/dist/src/tls/tlsv1_common.c                           |     8 +-
 external/bsd/wpa/dist/src/tls/tlsv1_cred.c                             |     6 +-
 external/bsd/wpa/dist/src/tls/tlsv1_server.c                           |     2 +-
 external/bsd/wpa/dist/src/tls/x509v3.c                                 |    15 +-
 external/bsd/wpa/dist/src/utils/Makefile                               |     1 +
 external/bsd/wpa/dist/src/utils/base64.c                               |   139 +-
 external/bsd/wpa/dist/src/utils/base64.h                               |     4 +
 external/bsd/wpa/dist/src/utils/browser-wpadebug.c                     |     7 +-
 external/bsd/wpa/dist/src/utils/crc32.c                                |    85 +
 external/bsd/wpa/dist/src/utils/crc32.h                                |    14 +
 external/bsd/wpa/dist/src/utils/http_curl.c                            |    34 +-
 external/bsd/wpa/dist/src/utils/json.c                                 |   569 +
 external/bsd/wpa/dist/src/utils/json.h                                 |    42 +
 external/bsd/wpa/dist/src/utils/os_none.c                              |     6 +
 external/bsd/wpa/dist/src/utils/os_win32.c                             |    10 +
 external/bsd/wpa/dist/src/utils/trace.c                                |    37 +-
 external/bsd/wpa/dist/src/utils/utils_module_tests.c                   |    81 +
 external/bsd/wpa/dist/src/utils/uuid.c                                 |    25 +
 external/bsd/wpa/dist/src/utils/uuid.h                                 |     1 +
 external/bsd/wpa/dist/src/utils/wpa_debug.c                            |    28 +-
 external/bsd/wpa/dist/src/utils/wpa_debug.h                            |     3 +
 external/bsd/wpa/dist/src/utils/wpabuf.c                               |     6 +-
 external/bsd/wpa/dist/src/utils/xml-utils.c                            |     8 +-
 external/bsd/wpa/dist/src/wps/wps.c                                    |    14 +-
 external/bsd/wpa/dist/src/wps/wps_common.c                             |     1 +
 external/bsd/wpa/dist/src/wps/wps_er.c                                 |     9 +-
 external/bsd/wpa/dist/src/wps/wps_registrar.c                          |    11 +-
 external/bsd/wpa/dist/wpa_supplicant/Android.mk                        |   158 +-
 external/bsd/wpa/dist/wpa_supplicant/ChangeLog                         |    70 +
 external/bsd/wpa/dist/wpa_supplicant/README-HS20                       |    19 +-
 external/bsd/wpa/dist/wpa_supplicant/android.config                    |    81 +-
 external/bsd/wpa/dist/wpa_supplicant/ap.c                              |   207 +-
 external/bsd/wpa/dist/wpa_supplicant/ap.h                              |    21 +-
 external/bsd/wpa/dist/wpa_supplicant/autoscan.c                        |     9 +-
 external/bsd/wpa/dist/wpa_supplicant/bgscan.c                          |     2 -
 external/bsd/wpa/dist/wpa_supplicant/bgscan_learn.c                    |     3 -
 external/bsd/wpa/dist/wpa_supplicant/bgscan_simple.c                   |    10 +-
 external/bsd/wpa/dist/wpa_supplicant/bss.c                             |    64 +-
 external/bsd/wpa/dist/wpa_supplicant/bss.h                             |     8 +
 external/bsd/wpa/dist/wpa_supplicant/config.h                          |   152 +-
 external/bsd/wpa/dist/wpa_supplicant/config_file.c                     |   184 +-
 external/bsd/wpa/dist/wpa_supplicant/config_ssid.h                     |   197 +-
 external/bsd/wpa/dist/wpa_supplicant/config_winreg.c                   |    12 +-
 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface_named_pipe.c           |     6 +-
 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface_udp.c                  |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/ctrl_iface_unix.c                 |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new.c                   |   258 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new.h                   |    42 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers.c          |   432 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers.h          |    28 +
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_p2p.c      |    82 +-
 external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_wps.c      |   354 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/eapol_test.8          |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/eapol_test.sgml       |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_background.8      |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_background.sgml   |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_cli.8             |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_cli.sgml          |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_gui.8             |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_gui.sgml          |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_passphrase.8      |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_passphrase.sgml   |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_priv.8            |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_priv.sgml         |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.8      |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.sgml   |     6 +-
 external/bsd/wpa/dist/wpa_supplicant/dpp_supplicant.c                  |  2613 +++
 external/bsd/wpa/dist/wpa_supplicant/dpp_supplicant.h                  |    39 +
 external/bsd/wpa/dist/wpa_supplicant/examples/dpp-qrcode.py            |   130 +
 external/bsd/wpa/dist/wpa_supplicant/examples/wps-ap-cli               |     6 +-
 external/bsd/wpa/dist/wpa_supplicant/gas_query.c                       |   126 +-
 external/bsd/wpa/dist/wpa_supplicant/gas_query.h                       |     4 +-
 external/bsd/wpa/dist/wpa_supplicant/hs20_supplicant.c                 |   114 +-
 external/bsd/wpa/dist/wpa_supplicant/hs20_supplicant.h                 |     3 +
 external/bsd/wpa/dist/wpa_supplicant/ibss_rsn.c                        |    47 +-
 external/bsd/wpa/dist/wpa_supplicant/interworking.c                    |   165 +-
 external/bsd/wpa/dist/wpa_supplicant/interworking.h                    |     2 +-
 external/bsd/wpa/dist/wpa_supplicant/mbo.c                             |   393 +-
 external/bsd/wpa/dist/wpa_supplicant/mesh.c                            |    54 +-
 external/bsd/wpa/dist/wpa_supplicant/mesh_mpm.c                        |    32 +-
 external/bsd/wpa/dist/wpa_supplicant/mesh_rsn.c                        |    67 +-
 external/bsd/wpa/dist/wpa_supplicant/notify.c                          |    56 +-
 external/bsd/wpa/dist/wpa_supplicant/notify.h                          |    12 +-
 external/bsd/wpa/dist/wpa_supplicant/offchannel.c                      |     5 +-
 external/bsd/wpa/dist/wpa_supplicant/op_classes.c                      |   325 +
 external/bsd/wpa/dist/wpa_supplicant/p2p_supplicant.c                  |   290 +-
 external/bsd/wpa/dist/wpa_supplicant/preauth_test.c                    |    15 +-
 external/bsd/wpa/dist/wpa_supplicant/rrm.c                             |  1460 +
 external/bsd/wpa/dist/wpa_supplicant/scan.c                            |   379 +-
 external/bsd/wpa/dist/wpa_supplicant/sme.c                             |   811 +-
 external/bsd/wpa/dist/wpa_supplicant/sme.h                             |    14 +
 external/bsd/wpa/dist/wpa_supplicant/wifi_display.c                    |    13 +
 external/bsd/wpa/dist/wpa_supplicant/wmm_ac.c                          |     5 +-
 external/bsd/wpa/dist/wpa_supplicant/wnm_sta.h                         |    18 +-
 external/bsd/wpa/dist/wpa_supplicant/wpa_passphrase.c                  |     8 +-
 external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.conf               |   192 +-
 external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant_template.conf      |     1 +
 external/bsd/wpa/dist/wpa_supplicant/wpas_glue.c                       |   169 +-
 external/bsd/wpa/dist/wpa_supplicant/wpas_kay.c                        |   166 +-
 external/bsd/wpa/dist/wpa_supplicant/wpas_kay.h                        |    10 +
 external/bsd/wpa/dist/wpa_supplicant/wps_supplicant.c                  |    20 +-
 354 files changed, 53036 insertions(+), 4667 deletions(-)

diffs (truncated from 77893 to 300 lines):

diff -r 677122efaa80 -r e288c0ae68dd external/bsd/wpa/dist/CONTRIBUTIONS
--- a/external/bsd/wpa/dist/CONTRIBUTIONS       Fri Jan 04 19:13:58 2019 +0000
+++ b/external/bsd/wpa/dist/CONTRIBUTIONS       Fri Jan 04 19:29:14 2019 +0000
@@ -140,7 +140,7 @@
 
 Modified BSD license (no advertisement clause):
 
-Copyright (c) 2002-2016, Jouni Malinen <j%w1.fi@localhost> and contributors
+Copyright (c) 2002-2018, Jouni Malinen <j%w1.fi@localhost> and contributors
 All Rights Reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -r 677122efaa80 -r e288c0ae68dd external/bsd/wpa/dist/COPYING
--- a/external/bsd/wpa/dist/COPYING     Fri Jan 04 19:13:58 2019 +0000
+++ b/external/bsd/wpa/dist/COPYING     Fri Jan 04 19:29:14 2019 +0000
@@ -1,7 +1,7 @@
 wpa_supplicant and hostapd
 --------------------------
 
-Copyright (c) 2002-2016, Jouni Malinen <j%w1.fi@localhost> and contributors
+Copyright (c) 2002-2018, Jouni Malinen <j%w1.fi@localhost> and contributors
 All Rights Reserved.
 
 
diff -r 677122efaa80 -r e288c0ae68dd external/bsd/wpa/dist/README
--- a/external/bsd/wpa/dist/README      Fri Jan 04 19:13:58 2019 +0000
+++ b/external/bsd/wpa/dist/README      Fri Jan 04 19:29:14 2019 +0000
@@ -1,7 +1,7 @@
 wpa_supplicant and hostapd
 --------------------------
 
-Copyright (c) 2002-2016, Jouni Malinen <j%w1.fi@localhost> and contributors
+Copyright (c) 2002-2018, Jouni Malinen <j%w1.fi@localhost> and contributors
 All Rights Reserved.
 
 These programs are licensed under the BSD license (the one with
diff -r 677122efaa80 -r e288c0ae68dd external/bsd/wpa/dist/hostapd/Android.mk
--- a/external/bsd/wpa/dist/hostapd/Android.mk  Fri Jan 04 19:13:58 2019 +0000
+++ b/external/bsd/wpa/dist/hostapd/Android.mk  Fri Jan 04 19:29:14 2019 +0000
@@ -38,6 +38,9 @@
 L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\"
 L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/hostapd\"
 
+# Use Android specific directory for hostapd_cli command completion history
+L_CFLAGS += -DCONFIG_HOSTAPD_CLI_HISTORY_DIR=\"/data/misc/wifi\"
+
 # To force sizeof(enum) = 4
 ifeq ($(TARGET_ARCH),arm)
 L_CFLAGS += -mabi=aapcs-linux
@@ -212,11 +215,6 @@
 CONFIG_L2_PACKET=y
 endif
 
-ifdef CONFIG_PEERKEY
-L_CFLAGS += -DCONFIG_PEERKEY
-OBJS += src/ap/peerkey_auth.c
-endif
-
 ifdef CONFIG_HS20
 NEED_AES_OMAC1=y
 CONFIG_PROXYARP=y
@@ -244,11 +242,20 @@
 endif
 
 ifdef CONFIG_IEEE80211R
-L_CFLAGS += -DCONFIG_IEEE80211R
+L_CFLAGS += -DCONFIG_IEEE80211R -DCONFIG_IEEE80211R_AP
 OBJS += src/ap/wpa_auth_ft.c
 NEED_SHA256=y
 NEED_AES_OMAC1=y
 NEED_AES_UNWRAP=y
+NEED_AES_SIV=y
+NEED_ETH_P_OUI=y
+NEED_SHA256=y
+NEED_HMAC_SHA256_KDF=y
+endif
+
+ifdef NEED_ETH_P_OUI
+L_CFLAGS += -DCONFIG_ETH_P_OUI
+OBJS += src/ap/eth_p_oui.c
 endif
 
 ifdef CONFIG_SAE
@@ -258,8 +265,30 @@
 NEED_DH_GROUPS=y
 endif
 
+ifdef CONFIG_OWE
+L_CFLAGS += -DCONFIG_OWE
+NEED_ECC=y
+NEED_HMAC_SHA256_KDF=y
+NEED_HMAC_SHA384_KDF=y
+NEED_HMAC_SHA512_KDF=y
+NEED_SHA256=y
+NEED_SHA384=y
+NEED_SHA512=y
+endif
+
+ifdef CONFIG_FILS
+L_CFLAGS += -DCONFIG_FILS
+OBJS += src/ap/fils_hlp.c
+NEED_SHA384=y
+NEED_AES_SIV=y
+ifdef CONFIG_FILS_SK_PFS
+L_CFLAGS += -DCONFIG_FILS_SK_PFS
+NEED_ECC=y
+endif
+endif
+
 ifdef CONFIG_WNM
-L_CFLAGS += -DCONFIG_WNM
+L_CFLAGS += -DCONFIG_WNM -DCONFIG_WNM_AP
 OBJS += src/ap/wnm_ap.c
 endif
 
@@ -271,6 +300,10 @@
 L_CFLAGS += -DCONFIG_IEEE80211AC
 endif
 
+ifdef CONFIG_IEEE80211AX
+L_CFLAGS += -DCONFIG_IEEE80211AX
+endif
+
 ifdef CONFIG_MBO
 L_CFLAGS += -DCONFIG_MBO
 OBJS += src/ap/mbo_ap.c
@@ -422,6 +455,7 @@
 L_CFLAGS += -DEAP_SERVER_PWD
 OBJS += src/eap_server/eap_server_pwd.c src/eap_common/eap_pwd_common.c
 NEED_SHA256=y
+NEED_ECC=y
 endif
 
 ifdef CONFIG_EAP_EKE
@@ -499,6 +533,23 @@
 
 endif
 
+ifdef CONFIG_DPP
+L_CFLAGS += -DCONFIG_DPP
+OBJS += src/common/dpp.c
+OBJS += src/ap/dpp_hostapd.c
+OBJS += src/ap/gas_query_ap.c
+NEED_AES_SIV=y
+NEED_HMAC_SHA256_KDF=y
+NEED_HMAC_SHA384_KDF=y
+NEED_HMAC_SHA512_KDF=y
+NEED_SHA256=y
+NEED_SHA384=y
+NEED_SHA512=y
+NEED_JSON=y
+NEED_GAS=y
+NEED_BASE64=y
+endif
+
 ifdef CONFIG_EAP_IKEV2
 L_CFLAGS += -DEAP_SERVER_IKEV2
 OBJS += src/eap_server/eap_server_ikev2.c src/eap_server/ikev2.c
@@ -581,25 +632,40 @@
 NEED_TLS_PRF_SHA256=y
 LIBS += -lcrypto
 LIBS_h += -lcrypto
+ifndef CONFIG_TLS_DEFAULT_CIPHERS
+CONFIG_TLS_DEFAULT_CIPHERS = "DEFAULT:!EXP:!LOW"
+endif
+L_CFLAGS += -DTLS_DEFAULT_CIPHERS=\"$(CONFIG_TLS_DEFAULT_CIPHERS)\"
 endif
 
 ifeq ($(CONFIG_TLS), gnutls)
+ifndef CONFIG_CRYPTO
+# default to libgcrypt
+CONFIG_CRYPTO=gnutls
+endif
 ifdef TLS_FUNCS
 OBJS += src/crypto/tls_gnutls.c
 LIBS += -lgnutls -lgpg-error
 endif
-OBJS += src/crypto/crypto_gnutls.c
-HOBJS += src/crypto/crypto_gnutls.c
+OBJS += src/crypto/crypto_$(CONFIG_CRYPTO).c
+HOBJS += src/crypto/crypto_$(CONFIG_CRYPTO).c
 ifdef NEED_FIPS186_2_PRF
 OBJS += src/crypto/fips_prf_internal.c
 OBJS += src/crypto/sha1-internal.c
 endif
+ifeq ($(CONFIG_CRYPTO), gnutls)
 LIBS += -lgcrypt
 LIBS_h += -lgcrypt
-CONFIG_INTERNAL_SHA256=y
 CONFIG_INTERNAL_RC4=y
 CONFIG_INTERNAL_DH_GROUP5=y
 endif
+ifeq ($(CONFIG_CRYPTO), nettle)
+LIBS += -lnettle -lgmp
+LIBS_p += -lnettle -lgmp
+CONFIG_INTERNAL_RC4=y
+CONFIG_INTERNAL_DH_GROUP5=y
+endif
+endif
 
 ifeq ($(CONFIG_TLS), internal)
 ifndef CONFIG_CRYPTO
@@ -715,6 +781,12 @@
 ifdef NEED_AES_EAX
 AESOBJS += src/crypto/aes-eax.c
 NEED_AES_CTR=y
+NEED_AES_OMAC1=y
+endif
+ifdef NEED_AES_SIV
+AESOBJS += src/crypto/aes-siv.c
+NEED_AES_CTR=y
+NEED_AES_OMAC1=y
 endif
 ifdef NEED_AES_CTR
 AESOBJS += src/crypto/aes-ctr.c
@@ -749,8 +821,10 @@
 SHA1OBJS =
 ifdef NEED_SHA1
 ifneq ($(CONFIG_TLS), openssl)
+ifneq ($(CONFIG_TLS), gnutls)
 SHA1OBJS += src/crypto/sha1.c
 endif
+endif
 SHA1OBJS += src/crypto/sha1-prf.c
 ifdef CONFIG_INTERNAL_SHA1
 SHA1OBJS += src/crypto/sha1-internal.c
@@ -774,8 +848,10 @@
 endif
 
 ifneq ($(CONFIG_TLS), openssl)
+ifneq ($(CONFIG_TLS), gnutls)
 OBJS += src/crypto/md5.c
 endif
+endif
 
 ifdef NEED_MD5
 ifdef CONFIG_INTERNAL_MD5
@@ -811,8 +887,10 @@
 ifdef NEED_SHA256
 L_CFLAGS += -DCONFIG_SHA256
 ifneq ($(CONFIG_TLS), openssl)
+ifneq ($(CONFIG_TLS), gnutls)
 OBJS += src/crypto/sha256.c
 endif
+endif
 OBJS += src/crypto/sha256-prf.c
 ifdef CONFIG_INTERNAL_SHA256
 OBJS += src/crypto/sha256-internal.c
@@ -820,11 +898,36 @@
 ifdef NEED_TLS_PRF_SHA256
 OBJS += src/crypto/sha256-tlsprf.c
 endif
+ifdef NEED_HMAC_SHA256_KDF
+OBJS += src/crypto/sha256-kdf.c
+endif
+ifdef NEED_HMAC_SHA384_KDF
+OBJS += src/crypto/sha384-kdf.c
+endif
+ifdef NEED_HMAC_SHA512_KDF
+OBJS += src/crypto/sha512-kdf.c
+endif
 endif
 ifdef NEED_SHA384
 L_CFLAGS += -DCONFIG_SHA384
+ifneq ($(CONFIG_TLS), openssl)
+ifneq ($(CONFIG_TLS), gnutls)
+OBJS += src/crypto/sha384.c
+endif
+endif
 OBJS += src/crypto/sha384-prf.c
 endif
+ifdef NEED_SHA512
+L_CFLAGS += -DCONFIG_SHA512
+ifneq ($(CONFIG_TLS), openssl)
+ifneq ($(CONFIG_TLS), linux)
+ifneq ($(CONFIG_TLS), gnutls)
+OBJS += src/crypto/sha512.c
+endif
+endif
+endif
+OBJS += src/crypto/sha512-prf.c
+endif
 
 ifdef CONFIG_INTERNAL_SHA384
 L_CFLAGS += -DCONFIG_INTERNAL_SHA384
@@ -881,6 +984,11 @@
 OBJS += src/utils/base64.c
 endif
 
+ifdef NEED_JSON
+OBJS += src/utils/json.c
+L_CFLAGS += -DCONFIG_JSON
+endif
+
 ifdef NEED_AP_MLME
 OBJS += src/ap/wmm.c
 OBJS += src/ap/ap_list.c
@@ -897,6 +1005,10 @@
 OBJS += src/ap/ieee802_11_vht.c
 endif




Home | Main Index | Thread Index | Old Index