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 Import wpa_supplicant and hostapd
details: https://anonhg.NetBSD.org/src/rev/4cd4d7ac8183
branches: trunk
changeset: 349049:4cd4d7ac8183
user: christos <christos%NetBSD.org@localhost>
date: Mon Nov 21 16:42:45 2016 +0000
description:
Import wpa_supplicant and hostapd
diffstat:
external/bsd/wpa/dist/CONTRIBUTIONS | 30 +-
external/bsd/wpa/dist/COPYING | 2 +-
external/bsd/wpa/dist/README | 2 +-
external/bsd/wpa/dist/hostapd/Android.mk | 98 +-
external/bsd/wpa/dist/hostapd/ChangeLog | 109 +
external/bsd/wpa/dist/hostapd/Makefile | 161 +-
external/bsd/wpa/dist/hostapd/README | 2 +-
external/bsd/wpa/dist/hostapd/android.config | 17 +
external/bsd/wpa/dist/hostapd/config_file.c | 374 +-
external/bsd/wpa/dist/hostapd/config_file.h | 2 +-
external/bsd/wpa/dist/hostapd/ctrl_iface.c | 1562 +++-
external/bsd/wpa/dist/hostapd/defconfig | 29 +
external/bsd/wpa/dist/hostapd/hapd_module_tests.c | 1 +
external/bsd/wpa/dist/hostapd/hlr_auc_gw.c | 180 +-
external/bsd/wpa/dist/hostapd/hlr_auc_gw.milenage_db | 4 +-
external/bsd/wpa/dist/hostapd/hostapd.android.rc | 20 +
external/bsd/wpa/dist/hostapd/hostapd.conf | 250 +-
external/bsd/wpa/dist/hs20/client/Android.mk | 2 +-
external/bsd/wpa/dist/hs20/client/Makefile | 7 +
external/bsd/wpa/dist/hs20/client/est.c | 60 +-
external/bsd/wpa/dist/hs20/client/osu_client.c | 112 +-
external/bsd/wpa/dist/hs20/client/spp_client.c | 15 +-
external/bsd/wpa/dist/src/Makefile | 1 +
external/bsd/wpa/dist/src/ap/Makefile | 65 +-
external/bsd/wpa/dist/src/ap/accounting.c | 260 +-
external/bsd/wpa/dist/src/ap/accounting.h | 7 +-
external/bsd/wpa/dist/src/ap/acs.c | 19 +-
external/bsd/wpa/dist/src/ap/ap_config.c | 123 +-
external/bsd/wpa/dist/src/ap/ap_config.h | 90 +-
external/bsd/wpa/dist/src/ap/ap_drv_ops.h | 19 +-
external/bsd/wpa/dist/src/ap/ap_list.c | 13 +-
external/bsd/wpa/dist/src/ap/ap_list.h | 5 +
external/bsd/wpa/dist/src/ap/ap_mlme.c | 3 +
external/bsd/wpa/dist/src/ap/authsrv.c | 21 +-
external/bsd/wpa/dist/src/ap/beacon.c | 413 +-
external/bsd/wpa/dist/src/ap/beacon.h | 8 +
external/bsd/wpa/dist/src/ap/ctrl_iface_ap.c | 134 +-
external/bsd/wpa/dist/src/ap/ctrl_iface_ap.h | 8 +
external/bsd/wpa/dist/src/ap/dfs.c | 58 +-
external/bsd/wpa/dist/src/ap/dhcp_snoop.c | 3 +-
external/bsd/wpa/dist/src/ap/eap_user_db.c | 16 +-
external/bsd/wpa/dist/src/ap/gas_serv.c | 297 +-
external/bsd/wpa/dist/src/ap/gas_serv.h | 19 +
external/bsd/wpa/dist/src/ap/hw_features.c | 69 +-
external/bsd/wpa/dist/src/ap/hw_features.h | 5 +
external/bsd/wpa/dist/src/ap/iapp.c | 17 +-
external/bsd/wpa/dist/src/ap/ieee802_11.c | 803 +-
external/bsd/wpa/dist/src/ap/ieee802_11.h | 41 +-
external/bsd/wpa/dist/src/ap/ieee802_11_auth.c | 165 +-
external/bsd/wpa/dist/src/ap/ieee802_11_auth.h | 6 +-
external/bsd/wpa/dist/src/ap/ieee802_11_ht.c | 48 +-
external/bsd/wpa/dist/src/ap/ieee802_11_shared.c | 78 +
external/bsd/wpa/dist/src/ap/ieee802_11_vht.c | 205 +-
external/bsd/wpa/dist/src/ap/ieee802_1x.c | 291 +-
external/bsd/wpa/dist/src/ap/ieee802_1x.h | 3 +-
external/bsd/wpa/dist/src/ap/mbo_ap.c | 244 +
external/bsd/wpa/dist/src/ap/mbo_ap.h | 51 +
external/bsd/wpa/dist/src/ap/ndisc_snoop.c | 52 +-
external/bsd/wpa/dist/src/ap/neighbor_db.c | 133 +
external/bsd/wpa/dist/src/ap/neighbor_db.h | 24 +
external/bsd/wpa/dist/src/ap/pmksa_cache_auth.c | 111 +-
external/bsd/wpa/dist/src/ap/pmksa_cache_auth.h | 14 +-
external/bsd/wpa/dist/src/ap/rrm.c | 544 +
external/bsd/wpa/dist/src/ap/rrm.h | 28 +
external/bsd/wpa/dist/src/ap/sta_info.c | 359 +-
external/bsd/wpa/dist/src/ap/sta_info.h | 86 +-
external/bsd/wpa/dist/src/ap/taxonomy.c | 291 +
external/bsd/wpa/dist/src/ap/taxonomy.h | 24 +
external/bsd/wpa/dist/src/ap/utils.c | 11 +
external/bsd/wpa/dist/src/ap/vlan.c | 34 +
external/bsd/wpa/dist/src/ap/vlan.h | 30 +
external/bsd/wpa/dist/src/ap/vlan_full.c | 752 ++
external/bsd/wpa/dist/src/ap/vlan_ifconfig.c | 69 +
external/bsd/wpa/dist/src/ap/vlan_init.c | 882 +--
external/bsd/wpa/dist/src/ap/vlan_init.h | 19 +-
external/bsd/wpa/dist/src/ap/vlan_ioctl.c | 155 +
external/bsd/wpa/dist/src/ap/vlan_util.c | 87 +-
external/bsd/wpa/dist/src/ap/vlan_util.h | 18 +-
external/bsd/wpa/dist/src/ap/wnm_ap.c | 39 +-
external/bsd/wpa/dist/src/ap/wnm_ap.h | 3 +-
external/bsd/wpa/dist/src/ap/wpa_auth.h | 57 +-
external/bsd/wpa/dist/src/ap/wpa_auth_ft.c | 31 +-
external/bsd/wpa/dist/src/ap/wpa_auth_glue.c | 42 +-
external/bsd/wpa/dist/src/ap/wpa_auth_i.h | 6 +-
external/bsd/wpa/dist/src/ap/wpa_auth_ie.c | 39 +-
external/bsd/wpa/dist/src/ap/wps_hostapd.c | 121 +-
external/bsd/wpa/dist/src/ap/x_snoop.c | 8 +
external/bsd/wpa/dist/src/common/Makefile | 26 +-
external/bsd/wpa/dist/src/common/cli.c | 267 +
external/bsd/wpa/dist/src/common/cli.h | 47 +
external/bsd/wpa/dist/src/common/common_module_tests.c | 38 +-
external/bsd/wpa/dist/src/common/ctrl_iface_common.c | 173 +
external/bsd/wpa/dist/src/common/ctrl_iface_common.h | 38 +
external/bsd/wpa/dist/src/common/defs.h | 25 +-
external/bsd/wpa/dist/src/common/eapol_common.h | 2 +-
external/bsd/wpa/dist/src/common/hw_features_common.c | 103 +-
external/bsd/wpa/dist/src/common/hw_features_common.h | 1 -
external/bsd/wpa/dist/src/common/ieee802_11_common.c | 480 +-
external/bsd/wpa/dist/src/common/ieee802_11_common.h | 54 +-
external/bsd/wpa/dist/src/common/ieee802_11_defs.h | 358 +-
external/bsd/wpa/dist/src/common/ieee802_1x_defs.h | 2 +-
external/bsd/wpa/dist/src/common/linux_bridge.h | 24 +
external/bsd/wpa/dist/src/common/linux_vlan.h | 52 +
external/bsd/wpa/dist/src/common/privsep_commands.h | 35 +-
external/bsd/wpa/dist/src/common/qca-vendor.h | 1348 +++-
external/bsd/wpa/dist/src/common/sae.c | 421 +-
external/bsd/wpa/dist/src/common/sae.h | 4 +
external/bsd/wpa/dist/src/common/version.h | 6 +-
external/bsd/wpa/dist/src/common/wpa_common.c | 319 +-
external/bsd/wpa/dist/src/common/wpa_common.h | 20 +-
external/bsd/wpa/dist/src/common/wpa_ctrl.c | 28 +-
external/bsd/wpa/dist/src/common/wpa_ctrl.h | 52 +
external/bsd/wpa/dist/src/common/wpa_helpers.c | 3 +-
external/bsd/wpa/dist/src/crypto/Makefile | 4 +-
external/bsd/wpa/dist/src/crypto/aes-cbc.c | 6 +
external/bsd/wpa/dist/src/crypto/aes-omac1.c | 3 +
external/bsd/wpa/dist/src/crypto/crypto.h | 55 +-
external/bsd/wpa/dist/src/crypto/crypto_internal.c | 50 +
external/bsd/wpa/dist/src/crypto/crypto_module_tests.c | 116 +-
external/bsd/wpa/dist/src/crypto/crypto_openssl.c | 524 +-
external/bsd/wpa/dist/src/crypto/dh_group5.c | 1 +
external/bsd/wpa/dist/src/crypto/dh_groups.c | 9 +-
external/bsd/wpa/dist/src/crypto/fips_prf_openssl.c | 41 +-
external/bsd/wpa/dist/src/crypto/md4-internal.c | 3 +
external/bsd/wpa/dist/src/crypto/md5-internal.c | 3 +
external/bsd/wpa/dist/src/crypto/ms_funcs.c | 31 +-
external/bsd/wpa/dist/src/crypto/ms_funcs.h | 2 +
external/bsd/wpa/dist/src/crypto/random.c | 1 +
external/bsd/wpa/dist/src/crypto/sha1-internal.c | 4 +-
external/bsd/wpa/dist/src/crypto/sha1-tlsprf.c | 5 +
external/bsd/wpa/dist/src/crypto/sha1-tprf.c | 2 +
external/bsd/wpa/dist/src/crypto/sha256-internal.c | 3 +
external/bsd/wpa/dist/src/crypto/sha256-kdf.c | 3 +
external/bsd/wpa/dist/src/crypto/sha256-prf.c | 26 +-
external/bsd/wpa/dist/src/crypto/sha256.h | 12 +-
external/bsd/wpa/dist/src/crypto/sha384-internal.c | 92 +
external/bsd/wpa/dist/src/crypto/sha384-prf.c | 100 +
external/bsd/wpa/dist/src/crypto/sha384.h | 5 +
external/bsd/wpa/dist/src/crypto/sha384_i.h | 23 +
external/bsd/wpa/dist/src/crypto/sha512-internal.c | 264 +
external/bsd/wpa/dist/src/crypto/sha512_i.h | 25 +
external/bsd/wpa/dist/src/crypto/tls.h | 127 +-
external/bsd/wpa/dist/src/crypto/tls_gnutls.c | 131 +-
external/bsd/wpa/dist/src/crypto/tls_internal.c | 174 +-
external/bsd/wpa/dist/src/crypto/tls_none.c | 62 +-
external/bsd/wpa/dist/src/crypto/tls_openssl.c | 1141 ++-
external/bsd/wpa/dist/src/crypto/tls_openssl.h | 19 +
external/bsd/wpa/dist/src/crypto/tls_openssl_ocsp.c | 846 ++
external/bsd/wpa/dist/src/drivers/driver_atheros.c | 251 +-
external/bsd/wpa/dist/src/drivers/driver_common.c | 57 +-
external/bsd/wpa/dist/src/drivers/driver_hostap.c | 52 +-
external/bsd/wpa/dist/src/drivers/driver_hostap.h | 2 +-
external/bsd/wpa/dist/src/drivers/driver_macsec_qca.c | 14 +-
external/bsd/wpa/dist/src/drivers/driver_ndis.c | 24 +-
external/bsd/wpa/dist/src/drivers/driver_nl80211.c | 1636 +++-
external/bsd/wpa/dist/src/drivers/driver_nl80211.h | 43 +-
external/bsd/wpa/dist/src/drivers/driver_nl80211_android.c | 34 +-
external/bsd/wpa/dist/src/drivers/driver_nl80211_capa.c | 332 +-
external/bsd/wpa/dist/src/drivers/driver_nl80211_event.c | 366 +-
external/bsd/wpa/dist/src/drivers/driver_nl80211_monitor.c | 2 +-
external/bsd/wpa/dist/src/drivers/driver_nl80211_scan.c | 416 +-
external/bsd/wpa/dist/src/drivers/driver_privsep.c | 98 +-
external/bsd/wpa/dist/src/drivers/driver_roboswitch.c | 6 +-
external/bsd/wpa/dist/src/drivers/driver_wext.c | 163 +-
external/bsd/wpa/dist/src/drivers/driver_wired.c | 11 +-
external/bsd/wpa/dist/src/drivers/drivers.c | 38 +-
external/bsd/wpa/dist/src/drivers/drivers.mak | 17 +-
external/bsd/wpa/dist/src/drivers/drivers.mk | 13 +-
external/bsd/wpa/dist/src/drivers/linux_ioctl.c | 23 +
external/bsd/wpa/dist/src/drivers/linux_ioctl.h | 1 +
external/bsd/wpa/dist/src/drivers/nl80211_copy.h | 543 +-
external/bsd/wpa/dist/src/drivers/rfkill.c | 46 +-
external/bsd/wpa/dist/src/eap_common/Makefile | 29 +-
external/bsd/wpa/dist/src/eap_common/eap_common.c | 2 +-
external/bsd/wpa/dist/src/eap_common/eap_eke_common.c | 42 +-
external/bsd/wpa/dist/src/eap_common/eap_fast_common.c | 64 +-
external/bsd/wpa/dist/src/eap_common/eap_fast_common.h | 6 +-
external/bsd/wpa/dist/src/eap_common/eap_gpsk_common.c | 9 +-
external/bsd/wpa/dist/src/eap_common/eap_pax_common.c | 6 +-
external/bsd/wpa/dist/src/eap_common/eap_pwd_common.c | 37 +-
external/bsd/wpa/dist/src/eap_common/eap_pwd_common.h | 13 +-
external/bsd/wpa/dist/src/eap_common/eap_sake_common.c | 88 +-
external/bsd/wpa/dist/src/eap_common/ikev2_common.c | 21 +-
external/bsd/wpa/dist/src/eap_peer/Makefile | 18 +-
external/bsd/wpa/dist/src/eap_peer/eap.c | 94 +-
external/bsd/wpa/dist/src/eap_peer/eap.h | 2 +-
external/bsd/wpa/dist/src/eap_peer/eap_aka.c | 15 +-
external/bsd/wpa/dist/src/eap_peer/eap_config.h | 20 +-
external/bsd/wpa/dist/src/eap_peer/eap_eke.c | 112 +-
external/bsd/wpa/dist/src/eap_peer/eap_fast.c | 161 +-
external/bsd/wpa/dist/src/eap_peer/eap_fast_pac.c | 9 +-
external/bsd/wpa/dist/src/eap_peer/eap_gpsk.c | 33 +-
external/bsd/wpa/dist/src/eap_peer/eap_gtc.c | 6 +-
external/bsd/wpa/dist/src/eap_peer/eap_i.h | 10 +-
external/bsd/wpa/dist/src/eap_peer/eap_ikev2.c | 6 +-
external/bsd/wpa/dist/src/eap_peer/eap_leap.c | 6 +-
external/bsd/wpa/dist/src/eap_peer/eap_md5.c | 6 +-
external/bsd/wpa/dist/src/eap_peer/eap_methods.c | 17 +-
external/bsd/wpa/dist/src/eap_peer/eap_methods.h | 1 -
external/bsd/wpa/dist/src/eap_peer/eap_mschapv2.c | 12 +-
external/bsd/wpa/dist/src/eap_peer/eap_otp.c | 6 +-
external/bsd/wpa/dist/src/eap_peer/eap_pax.c | 51 +-
external/bsd/wpa/dist/src/eap_peer/eap_peap.c | 94 +-
external/bsd/wpa/dist/src/eap_peer/eap_psk.c | 6 +-
external/bsd/wpa/dist/src/eap_peer/eap_sake.c | 50 +-
external/bsd/wpa/dist/src/eap_peer/eap_sim.c | 12 +-
external/bsd/wpa/dist/src/eap_peer/eap_tls.c | 78 +-
external/bsd/wpa/dist/src/eap_peer/eap_tls_common.c | 156 +-
external/bsd/wpa/dist/src/eap_peer/eap_tls_common.h | 2 +-
external/bsd/wpa/dist/src/eap_peer/eap_tnc.c | 18 +-
external/bsd/wpa/dist/src/eap_peer/eap_ttls.c | 169 +-
external/bsd/wpa/dist/src/eap_peer/eap_vendor_test.c | 6 +-
external/bsd/wpa/dist/src/eap_peer/eap_wsc.c | 15 +-
external/bsd/wpa/dist/src/eap_peer/ikev2.c | 4 +-
external/bsd/wpa/dist/src/eap_peer/tncc.c | 19 +-
external/bsd/wpa/dist/src/eap_server/Makefile | 19 +-
external/bsd/wpa/dist/src/eap_server/eap.h | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_i.h | 3 +-
external/bsd/wpa/dist/src/eap_server/eap_methods.h | 1 -
external/bsd/wpa/dist/src/eap_server/eap_server_aka.c | 13 +-
external/bsd/wpa/dist/src/eap_server/eap_server_eke.c | 30 +-
external/bsd/wpa/dist/src/eap_server/eap_server_fast.c | 58 +-
external/bsd/wpa/dist/src/eap_server/eap_server_gpsk.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_gtc.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_identity.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_ikev2.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_md5.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_methods.c | 15 +-
external/bsd/wpa/dist/src/eap_server/eap_server_mschapv2.c | 19 +-
external/bsd/wpa/dist/src/eap_server/eap_server_pax.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_peap.c | 167 +-
external/bsd/wpa/dist/src/eap_server/eap_server_psk.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_sake.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_sim.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_tls.c | 76 +-
external/bsd/wpa/dist/src/eap_server/eap_server_tnc.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_ttls.c | 117 +-
external/bsd/wpa/dist/src/eap_server/eap_server_vendor_test.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_server_wsc.c | 6 +-
external/bsd/wpa/dist/src/eap_server/eap_sim_db.c | 88 +-
external/bsd/wpa/dist/src/eap_server/eap_sim_db.h | 2 +-
external/bsd/wpa/dist/src/eap_server/eap_tls_common.h | 2 +-
external/bsd/wpa/dist/src/eap_server/ikev2.c | 6 +-
external/bsd/wpa/dist/src/eap_server/tncs.c | 14 +-
external/bsd/wpa/dist/src/eapol_auth/Makefile | 14 +-
external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm.c | 122 +-
external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm.h | 6 +-
external/bsd/wpa/dist/src/eapol_auth/eapol_auth_sm_i.h | 12 +-
external/bsd/wpa/dist/src/eapol_supp/Makefile | 16 +-
external/bsd/wpa/dist/src/eapol_supp/eapol_supp_sm.c | 25 +-
external/bsd/wpa/dist/src/fst/Makefile | 8 +
external/bsd/wpa/dist/src/fst/fst.c | 231 +
external/bsd/wpa/dist/src/fst/fst.h | 296 +
external/bsd/wpa/dist/src/fst/fst_ctrl_aux.c | 70 +
external/bsd/wpa/dist/src/fst/fst_ctrl_aux.h | 91 +
external/bsd/wpa/dist/src/fst/fst_ctrl_defs.h | 109 +
external/bsd/wpa/dist/src/fst/fst_ctrl_iface.c | 948 ++
external/bsd/wpa/dist/src/fst/fst_ctrl_iface.h | 45 +
external/bsd/wpa/dist/src/fst/fst_defs.h | 87 +
external/bsd/wpa/dist/src/fst/fst_group.c | 522 +
external/bsd/wpa/dist/src/fst/fst_group.h | 69 +
external/bsd/wpa/dist/src/fst/fst_iface.c | 80 +
external/bsd/wpa/dist/src/fst/fst_iface.h | 136 +
external/bsd/wpa/dist/src/fst/fst_internal.h | 49 +
external/bsd/wpa/dist/src/fst/fst_session.c | 1611 ++++
external/bsd/wpa/dist/src/fst/fst_session.h | 80 +
external/bsd/wpa/dist/src/l2_packet/Makefile | 14 +-
external/bsd/wpa/dist/src/l2_packet/l2_packet_linux.c | 40 +-
external/bsd/wpa/dist/src/l2_packet/l2_packet_pcap.c | 12 +
external/bsd/wpa/dist/src/p2p/Makefile | 27 +-
external/bsd/wpa/dist/src/p2p/p2p.h | 201 +-
external/bsd/wpa/dist/src/p2p/p2p_build.c | 364 +-
external/bsd/wpa/dist/src/p2p/p2p_dev_disc.c | 2 +-
external/bsd/wpa/dist/src/p2p/p2p_go_neg.c | 240 +-
external/bsd/wpa/dist/src/p2p/p2p_group.c | 61 +-
external/bsd/wpa/dist/src/p2p/p2p_i.h | 52 +-
external/bsd/wpa/dist/src/p2p/p2p_invitation.c | 27 +-
external/bsd/wpa/dist/src/p2p/p2p_parse.c | 115 +-
external/bsd/wpa/dist/src/p2p/p2p_pd.c | 1192 ++-
external/bsd/wpa/dist/src/p2p/p2p_sd.c | 74 +-
external/bsd/wpa/dist/src/p2p/p2p_utils.c | 58 +-
external/bsd/wpa/dist/src/pae/ieee802_1x_cp.c | 56 +-
external/bsd/wpa/dist/src/pae/ieee802_1x_cp.h | 14 +-
external/bsd/wpa/dist/src/pae/ieee802_1x_kay.c | 1196 +-
external/bsd/wpa/dist/src/pae/ieee802_1x_kay.h | 13 +-
external/bsd/wpa/dist/src/pae/ieee802_1x_kay_i.h | 164 +-
external/bsd/wpa/dist/src/pae/ieee802_1x_secy_ops.c | 5 +-
external/bsd/wpa/dist/src/pae/ieee802_1x_secy_ops.h | 3 +-
external/bsd/wpa/dist/src/radius/Makefile | 1 +
external/bsd/wpa/dist/src/radius/radius.c | 134 +-
external/bsd/wpa/dist/src/radius/radius.h | 19 +-
external/bsd/wpa/dist/src/radius/radius_client.c | 150 +-
external/bsd/wpa/dist/src/radius/radius_client.h | 3 +
external/bsd/wpa/dist/src/radius/radius_das.h | 1 +
external/bsd/wpa/dist/src/radius/radius_server.c | 20 +-
external/bsd/wpa/dist/src/radius/radius_server.h | 2 +
external/bsd/wpa/dist/src/rsn_supp/Makefile | 28 +-
external/bsd/wpa/dist/src/rsn_supp/pmksa_cache.c | 13 +-
external/bsd/wpa/dist/src/rsn_supp/pmksa_cache.h | 8 +-
external/bsd/wpa/dist/src/rsn_supp/preauth.c | 6 +-
external/bsd/wpa/dist/src/rsn_supp/preauth.h | 6 +-
external/bsd/wpa/dist/src/rsn_supp/tdls.c | 50 +-
external/bsd/wpa/dist/src/rsn_supp/wpa.c | 192 +-
external/bsd/wpa/dist/src/rsn_supp/wpa.h | 14 +-
external/bsd/wpa/dist/src/rsn_supp/wpa_ft.c | 4 +-
external/bsd/wpa/dist/src/rsn_supp/wpa_i.h | 16 +-
external/bsd/wpa/dist/src/rsn_supp/wpa_ie.c | 24 +-
external/bsd/wpa/dist/src/rsn_supp/wpa_ie.h | 2 -
external/bsd/wpa/dist/src/tls/Makefile | 1 +
external/bsd/wpa/dist/src/tls/asn1.h | 4 +-
external/bsd/wpa/dist/src/tls/libtommath.c | 5 +-
external/bsd/wpa/dist/src/tls/pkcs5.c | 446 +-
external/bsd/wpa/dist/src/tls/tlsv1_client.c | 63 +-
external/bsd/wpa/dist/src/tls/tlsv1_client.h | 12 +-
external/bsd/wpa/dist/src/tls/tlsv1_client_i.h | 18 +-
external/bsd/wpa/dist/src/tls/tlsv1_client_ocsp.c | 803 ++
external/bsd/wpa/dist/src/tls/tlsv1_client_read.c | 487 +-
external/bsd/wpa/dist/src/tls/tlsv1_client_write.c | 158 +-
external/bsd/wpa/dist/src/tls/tlsv1_common.c | 37 +-
external/bsd/wpa/dist/src/tls/tlsv1_common.h | 5 +-
external/bsd/wpa/dist/src/tls/tlsv1_cred.c | 777 ++-
external/bsd/wpa/dist/src/tls/tlsv1_cred.h | 8 +
external/bsd/wpa/dist/src/tls/tlsv1_server.c | 8 +-
external/bsd/wpa/dist/src/tls/tlsv1_server.h | 2 +-
external/bsd/wpa/dist/src/tls/tlsv1_server_i.h | 3 +
external/bsd/wpa/dist/src/tls/tlsv1_server_read.c | 86 +
external/bsd/wpa/dist/src/tls/tlsv1_server_write.c | 168 +-
external/bsd/wpa/dist/src/tls/x509v3.c | 304 +-
external/bsd/wpa/dist/src/tls/x509v3.h | 36 +-
external/bsd/wpa/dist/src/utils/browser-android.c | 6 +-
external/bsd/wpa/dist/src/utils/browser-wpadebug.c | 6 +-
external/bsd/wpa/dist/src/utils/edit_simple.c | 6 +
external/bsd/wpa/dist/src/utils/eloop_win.c | 6 +
external/bsd/wpa/dist/src/utils/ext_password.c | 4 -
external/bsd/wpa/dist/src/utils/ext_password_i.h | 6 +
external/bsd/wpa/dist/src/utils/http_curl.c | 88 +-
external/bsd/wpa/dist/src/utils/includes.h | 7 +-
external/bsd/wpa/dist/src/utils/module_tests.h | 20 +
external/bsd/wpa/dist/src/utils/os_internal.c | 6 +
external/bsd/wpa/dist/src/utils/os_none.c | 6 +
external/bsd/wpa/dist/src/utils/os_win32.c | 18 +
external/bsd/wpa/dist/src/utils/pcsc_funcs.c | 29 +-
external/bsd/wpa/dist/src/utils/platform.h | 4 +-
external/bsd/wpa/dist/src/utils/radiotap.c | 6 +-
external/bsd/wpa/dist/src/utils/radiotap_iter.h | 2 +-
external/bsd/wpa/dist/src/utils/trace.c | 9 +
external/bsd/wpa/dist/src/utils/utils_module_tests.c | 441 +-
external/bsd/wpa/dist/src/utils/wpa_debug.c | 114 +-
external/bsd/wpa/dist/src/utils/wpa_debug.h | 27 +-
external/bsd/wpa/dist/src/utils/wpabuf.c | 32 +-
external/bsd/wpa/dist/src/utils/wpabuf.h | 17 +-
external/bsd/wpa/dist/src/utils/xml_libxml2.c | 2 +
external/bsd/wpa/dist/src/wps/Makefile | 39 +-
external/bsd/wpa/dist/src/wps/http_client.c | 42 +-
external/bsd/wpa/dist/src/wps/http_server.c | 8 +-
external/bsd/wpa/dist/src/wps/ndef.c | 16 +-
external/bsd/wpa/dist/src/wps/wps.c | 21 +-
external/bsd/wpa/dist/src/wps/wps.h | 21 +-
external/bsd/wpa/dist/src/wps/wps_attr_build.c | 31 +-
external/bsd/wpa/dist/src/wps/wps_attr_parse.c | 47 +-
external/bsd/wpa/dist/src/wps/wps_attr_parse.h | 41 +-
external/bsd/wpa/dist/src/wps/wps_common.c | 51 +-
external/bsd/wpa/dist/src/wps/wps_defs.h | 10 +
external/bsd/wpa/dist/src/wps/wps_enrollee.c | 40 +-
external/bsd/wpa/dist/src/wps/wps_er.c | 27 +-
external/bsd/wpa/dist/src/wps/wps_er_ssdp.c | 4 +-
external/bsd/wpa/dist/src/wps/wps_i.h | 4 +-
external/bsd/wpa/dist/src/wps/wps_module_tests.c | 5 +-
external/bsd/wpa/dist/src/wps/wps_registrar.c | 91 +-
external/bsd/wpa/dist/src/wps/wps_upnp.c | 18 +-
external/bsd/wpa/dist/src/wps/wps_upnp.h | 3 +
external/bsd/wpa/dist/src/wps/wps_upnp_ap.c | 6 +-
external/bsd/wpa/dist/src/wps/wps_upnp_event.c | 8 +-
external/bsd/wpa/dist/src/wps/wps_upnp_i.h | 3 +-
external/bsd/wpa/dist/src/wps/wps_upnp_ssdp.c | 25 +-
external/bsd/wpa/dist/src/wps/wps_upnp_web.c | 103 +-
external/bsd/wpa/dist/src/wps/wps_validate.c | 2 +
external/bsd/wpa/dist/wpa_supplicant/Android.mk | 240 +-
external/bsd/wpa/dist/wpa_supplicant/ChangeLog | 207 +
external/bsd/wpa/dist/wpa_supplicant/README-HS20 | 67 +-
external/bsd/wpa/dist/wpa_supplicant/README-P2P | 22 +-
external/bsd/wpa/dist/wpa_supplicant/android.config | 15 +-
external/bsd/wpa/dist/wpa_supplicant/ap.c | 246 +-
external/bsd/wpa/dist/wpa_supplicant/ap.h | 12 +-
external/bsd/wpa/dist/wpa_supplicant/autoscan.c | 34 +-
external/bsd/wpa/dist/wpa_supplicant/autoscan.h | 10 +
external/bsd/wpa/dist/wpa_supplicant/bgscan.c | 6 -
external/bsd/wpa/dist/wpa_supplicant/bgscan.h | 9 +
external/bsd/wpa/dist/wpa_supplicant/binder/.clang-format | 9 +
external/bsd/wpa/dist/wpa_supplicant/binder/binder.cpp | 104 +
external/bsd/wpa/dist/wpa_supplicant/binder/binder.h | 46 +
external/bsd/wpa/dist/wpa_supplicant/binder/binder_constants.cpp | 18 +
external/bsd/wpa/dist/wpa_supplicant/binder/binder_constants.h | 21 +
external/bsd/wpa/dist/wpa_supplicant/binder/binder_i.h | 28 +
external/bsd/wpa/dist/wpa_supplicant/binder/binder_manager.cpp | 100 +
external/bsd/wpa/dist/wpa_supplicant/binder/binder_manager.h | 58 +
external/bsd/wpa/dist/wpa_supplicant/binder/fi/w1/wpa_supplicant/IIface.aidl | 16 +
external/bsd/wpa/dist/wpa_supplicant/binder/fi/w1/wpa_supplicant/ISupplicant.aidl | 59 +
external/bsd/wpa/dist/wpa_supplicant/binder/fi/w1/wpa_supplicant/ISupplicantCallbacks.aidl | 20 +
external/bsd/wpa/dist/wpa_supplicant/binder/iface.cpp | 16 +
external/bsd/wpa/dist/wpa_supplicant/binder/iface.h | 42 +
external/bsd/wpa/dist/wpa_supplicant/binder/supplicant.cpp | 127 +
external/bsd/wpa/dist/wpa_supplicant/binder/supplicant.h | 55 +
external/bsd/wpa/dist/wpa_supplicant/bss.c | 173 +-
external/bsd/wpa/dist/wpa_supplicant/bss.h | 22 +-
external/bsd/wpa/dist/wpa_supplicant/config.h | 172 +-
external/bsd/wpa/dist/wpa_supplicant/config_file.c | 112 +-
external/bsd/wpa/dist/wpa_supplicant/config_ssid.h | 62 +-
external/bsd/wpa/dist/wpa_supplicant/config_winreg.c | 1 +
external/bsd/wpa/dist/wpa_supplicant/ctrl_iface_named_pipe.c | 3 +-
external/bsd/wpa/dist/wpa_supplicant/ctrl_iface_udp.c | 173 +-
external/bsd/wpa/dist/wpa_supplicant/ctrl_iface_unix.c | 460 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus-wpa_supplicant.conf | 2 -
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_common_i.h | 10 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_dict_helpers.c | 74 -
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_dict_helpers.h | 15 -
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new.c | 739 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new.h | 50 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers.c | 781 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers.h | 269 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_p2p.c | 492 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_p2p.h | 154 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_handlers_wps.c | 50 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_helpers.c | 14 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_helpers.h | 12 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_new_introspect.c | 4 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_old.c | 10 +-
external/bsd/wpa/dist/wpa_supplicant/dbus/dbus_old_handlers.c | 47 +-
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 | 15 +-
external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_gui.sgml | 19 +-
external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_passphrase.8 | 4 +-
external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_passphrase.sgml | 2 +-
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 | 7 +-
external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5 | 2 +-
external/bsd/wpa/dist/wpa_supplicant/doc/docbook/wpa_supplicant.sgml | 9 +-
external/bsd/wpa/dist/wpa_supplicant/driver_i.h | 120 +-
external/bsd/wpa/dist/wpa_supplicant/eapol_test.c | 147 +-
external/bsd/wpa/dist/wpa_supplicant/eapol_test.py | 142 +
external/bsd/wpa/dist/wpa_supplicant/gas_query.c | 154 +-
external/bsd/wpa/dist/wpa_supplicant/gas_query.h | 2 -
external/bsd/wpa/dist/wpa_supplicant/hs20_supplicant.c | 331 +-
external/bsd/wpa/dist/wpa_supplicant/hs20_supplicant.h | 15 +-
external/bsd/wpa/dist/wpa_supplicant/ibss_rsn.c | 18 +-
external/bsd/wpa/dist/wpa_supplicant/ibss_rsn.h | 3 +-
external/bsd/wpa/dist/wpa_supplicant/interworking.c | 247 +-
external/bsd/wpa/dist/wpa_supplicant/interworking.h | 3 +-
external/bsd/wpa/dist/wpa_supplicant/libwpa_test.c | 32 +
external/bsd/wpa/dist/wpa_supplicant/mbo.c | 836 ++
external/bsd/wpa/dist/wpa_supplicant/mesh.c | 147 +-
external/bsd/wpa/dist/wpa_supplicant/mesh.h | 3 +
external/bsd/wpa/dist/wpa_supplicant/mesh_mpm.c | 383 +-
external/bsd/wpa/dist/wpa_supplicant/mesh_mpm.h | 5 +-
external/bsd/wpa/dist/wpa_supplicant/mesh_rsn.c | 380 +-
external/bsd/wpa/dist/wpa_supplicant/mesh_rsn.h | 11 +-
external/bsd/wpa/dist/wpa_supplicant/notify.c | 83 +-
external/bsd/wpa/dist/wpa_supplicant/notify.h | 12 +-
external/bsd/wpa/dist/wpa_supplicant/offchannel.c | 52 +-
external/bsd/wpa/dist/wpa_supplicant/p2p_supplicant.c | 3691 ++++-----
external/bsd/wpa/dist/wpa_supplicant/p2p_supplicant.h | 59 +-
external/bsd/wpa/dist/wpa_supplicant/p2p_supplicant_sd.c | 1273 +++
external/bsd/wpa/dist/wpa_supplicant/preauth_test.c | 2 +-
external/bsd/wpa/dist/wpa_supplicant/scan.c | 547 +-
external/bsd/wpa/dist/wpa_supplicant/scan.h | 13 +-
external/bsd/wpa/dist/wpa_supplicant/sme.c | 177 +-
external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-nl80211.service.arg.in | 2 +
external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant-wired.service.arg.in | 2 +
external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant.service.arg.in | 2 +
external/bsd/wpa/dist/wpa_supplicant/systemd/wpa_supplicant.service.in | 6 +-
external/bsd/wpa/dist/wpa_supplicant/wmm_ac.h | 2 +-
external/bsd/wpa/dist/wpa_supplicant/wnm_sta.h | 2 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/addinterface.cpp | 8 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/addinterface.h | 6 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/eventhistory.cpp | 6 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/eventhistory.h | 2 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/main.cpp | 21 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp | 33 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/networkconfig.h | 2 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/peers.cpp | 46 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/peers.h | 2 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/scanresults.cpp | 6 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/scanresults.h | 2 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/scanresultsitem.h | 2 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp | 4 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/userdatarequest.h | 2 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpa_gui.pro | 1 +
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpagui.cpp | 190 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_gui-qt4/wpagui.h | 36 +-
external/bsd/wpa/dist/wpa_supplicant/wpa_supplicant.conf | 225 +-
external/bsd/wpa/dist/wpa_supplicant/wpas_glue.c | 72 +-
external/bsd/wpa/dist/wpa_supplicant/wpas_glue.h | 3 +
external/bsd/wpa/dist/wpa_supplicant/wpas_kay.c | 11 +-
external/bsd/wpa/dist/wpa_supplicant/wpas_module_tests.c | 29 +-
external/bsd/wpa/dist/wpa_supplicant/wps_supplicant.c | 168 +-
external/bsd/wpa/dist/wpa_supplicant/wps_supplicant.h | 8 +
502 files changed, 43641 insertions(+), 10909 deletions(-)
diffs (truncated from 88170 to 300 lines):
diff -r e41d6b6e84f5 -r 4cd4d7ac8183 external/bsd/wpa/dist/CONTRIBUTIONS
--- a/external/bsd/wpa/dist/CONTRIBUTIONS Mon Nov 21 16:34:34 2016 +0000
+++ b/external/bsd/wpa/dist/CONTRIBUTIONS Mon Nov 21 16:42:45 2016 +0000
@@ -29,6 +29,34 @@
unfortunately be accepted.
+The preferred method of submitting the contribution to the project is by
+email to the hostap mailing list:
+hostap%lists.infradead.org@localhost
+Note that the list may require subscription before accepting message
+without moderation. You can subscribe to the list at this address:
+http://lists.infradead.org/mailman/listinfo/hostap
+
+The message should contain an inlined patch against the current
+development branch (i.e., the master branch of
+git://w1.fi/hostap.git). Please make sure the software you use for
+sending the patch does not corrupt whitespace. If that cannot be fixed
+for some reason, it is better to include an attached version of the
+patch file than just send a whitespace damaged version in the message
+body.
+
+The patches should be separate logical changes rather than doing
+everything in a single patch. In other words, please keep cleanup, new
+features, and bug fixes all in their own patches. Each patch needs a
+commit log that describes the changes (what the changes fix, what
+functionality is added, why the changes are useful, etc.).
+
+Please try to follow the coding style used in the project.
+
+In general, the best way of generating a suitable formatted patch file
+is by committing the changes to a cloned git repository and using git
+format-patch. The patch can then be sent, e.g., with git send-email.
+
+
History of license and contributions terms
------------------------------------------
@@ -112,7 +140,7 @@
Modified BSD license (no advertisement clause):
-Copyright (c) 2002-2015, Jouni Malinen <j%w1.fi@localhost> and contributors
+Copyright (c) 2002-2016, Jouni Malinen <j%w1.fi@localhost> and contributors
All Rights Reserved.
Redistribution and use in source and binary forms, with or without
diff -r e41d6b6e84f5 -r 4cd4d7ac8183 external/bsd/wpa/dist/COPYING
--- a/external/bsd/wpa/dist/COPYING Mon Nov 21 16:34:34 2016 +0000
+++ b/external/bsd/wpa/dist/COPYING Mon Nov 21 16:42:45 2016 +0000
@@ -1,7 +1,7 @@
wpa_supplicant and hostapd
--------------------------
-Copyright (c) 2002-2015, Jouni Malinen <j%w1.fi@localhost> and contributors
+Copyright (c) 2002-2016, Jouni Malinen <j%w1.fi@localhost> and contributors
All Rights Reserved.
diff -r e41d6b6e84f5 -r 4cd4d7ac8183 external/bsd/wpa/dist/README
--- a/external/bsd/wpa/dist/README Mon Nov 21 16:34:34 2016 +0000
+++ b/external/bsd/wpa/dist/README Mon Nov 21 16:42:45 2016 +0000
@@ -1,7 +1,7 @@
wpa_supplicant and hostapd
--------------------------
-Copyright (c) 2002-2015, Jouni Malinen <j%w1.fi@localhost> and contributors
+Copyright (c) 2002-2016, Jouni Malinen <j%w1.fi@localhost> and contributors
All Rights Reserved.
These programs are licensed under the BSD license (the one with
diff -r e41d6b6e84f5 -r 4cd4d7ac8183 external/bsd/wpa/dist/hostapd/Android.mk
--- a/external/bsd/wpa/dist/hostapd/Android.mk Mon Nov 21 16:34:34 2016 +0000
+++ b/external/bsd/wpa/dist/hostapd/Android.mk Mon Nov 21 16:42:45 2016 +0000
@@ -29,8 +29,9 @@
# Set Android extended P2P functionality
L_CFLAGS += -DANDROID_P2P
+
ifeq ($(BOARD_HOSTAPD_PRIVATE_LIB),)
-L_CFLAGS += -DANDROID_P2P_STUB
+L_CFLAGS += -DANDROID_LIB_STUB
endif
# Use Android specific directory for control interface sockets
@@ -45,7 +46,6 @@
INCLUDES = $(LOCAL_PATH)
INCLUDES += $(LOCAL_PATH)/src
INCLUDES += $(LOCAL_PATH)/src/utils
-INCLUDES += external/openssl/include
INCLUDES += system/security/keystore/include
ifdef CONFIG_DRIVER_NL80211
ifneq ($(wildcard external/libnl),)
@@ -96,6 +96,8 @@
OBJS += src/ap/ieee802_11_shared.c
OBJS += src/ap/beacon.c
OBJS += src/ap/bss_load.c
+OBJS += src/ap/neighbor_db.c
+OBJS += src/ap/rrm.c
OBJS_d =
OBJS_p =
LIBS =
@@ -126,6 +128,15 @@
endif
OBJS += src/utils/eloop.c
+
+ifdef CONFIG_ELOOP_POLL
+L_CFLAGS += -DCONFIG_ELOOP_POLL
+endif
+
+ifdef CONFIG_ELOOP_EPOLL
+L_CFLAGS += -DCONFIG_ELOOP_EPOLL
+endif
+
OBJS += src/utils/common.c
OBJS += src/utils/wpa_debug.c
OBJS += src/utils/wpabuf.c
@@ -166,17 +177,25 @@
L_CFLAGS += -DCONFIG_NO_VLAN
else
OBJS += src/ap/vlan_init.c
+OBJS += src/ap/vlan_ifconfig.c
+OBJS += src/ap/vlan.c
+ifdef CONFIG_FULL_DYNAMIC_VLAN
+# Define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
+# and VLAN interfaces for the VLAN feature.
+L_CFLAGS += -DCONFIG_FULL_DYNAMIC_VLAN
+OBJS += src/ap/vlan_full.c
ifdef CONFIG_VLAN_NETLINK
-ifdef CONFIG_FULL_DYNAMIC_VLAN
OBJS += src/ap/vlan_util.c
+else
+OBJS += src/ap/vlan_ioctl.c
endif
-L_CFLAGS += -DCONFIG_VLAN_NETLINK
endif
endif
ifdef CONFIG_NO_CTRL_IFACE
L_CFLAGS += -DCONFIG_NO_CTRL_IFACE
else
+OBJS += src/common/ctrl_iface_common.c
OBJS += ctrl_iface.c
OBJS += src/ap/ctrl_iface_ap.c
endif
@@ -252,6 +271,27 @@
L_CFLAGS += -DCONFIG_IEEE80211AC
endif
+ifdef CONFIG_MBO
+L_CFLAGS += -DCONFIG_MBO
+OBJS += src/ap/mbo_ap.c
+endif
+
+ifdef CONFIG_FST
+L_CFLAGS += -DCONFIG_FST
+OBJS += src/fst/fst.c
+OBJS += src/fst/fst_group.c
+OBJS += src/fst/fst_iface.c
+OBJS += src/fst/fst_session.c
+OBJS += src/fst/fst_ctrl_aux.c
+ifdef CONFIG_FST_TEST
+L_CFLAGS += -DCONFIG_FST_TEST
+endif
+ifndef CONFIG_NO_CTRL_IFACE
+OBJS += src/fst/fst_ctrl_iface.c
+endif
+endif
+
+
include $(LOCAL_PATH)/src/drivers/drivers.mk
OBJS += $(DRV_AP_OBJS)
@@ -529,6 +569,7 @@
ifeq ($(CONFIG_TLS), openssl)
ifdef TLS_FUNCS
OBJS += src/crypto/tls_openssl.c
+OBJS += src/crypto/tls_openssl_ocsp.c
LIBS += -lssl
endif
OBJS += src/crypto/crypto_openssl.c
@@ -536,6 +577,8 @@
ifdef NEED_FIPS186_2_PRF
OBJS += src/crypto/fips_prf_openssl.c
endif
+NEED_SHA256=y
+NEED_TLS_PRF_SHA256=y
LIBS += -lcrypto
LIBS_h += -lcrypto
endif
@@ -558,17 +601,6 @@
CONFIG_INTERNAL_DH_GROUP5=y
endif
-ifeq ($(CONFIG_TLS), schannel)
-ifdef TLS_FUNCS
-OBJS += src/crypto/tls_schannel.c
-endif
-OBJS += src/crypto/crypto_cryptoapi.c
-OBJS_p += src/crypto/crypto_cryptoapi.c
-CONFIG_INTERNAL_SHA256=y
-CONFIG_INTERNAL_RC4=y
-CONFIG_INTERNAL_DH_GROUP5=y
-endif
-
ifeq ($(CONFIG_TLS), internal)
ifndef CONFIG_CRYPTO
CONFIG_CRYPTO=internal
@@ -634,6 +666,8 @@
CONFIG_INTERNAL_MD4=y
CONFIG_INTERNAL_MD5=y
CONFIG_INTERNAL_SHA256=y
+CONFIG_INTERNAL_SHA384=y
+CONFIG_INTERNAL_SHA512=y
CONFIG_INTERNAL_RC4=y
CONFIG_INTERNAL_DH_GROUP5=y
endif
@@ -699,8 +733,10 @@
endif
ifdef NEED_AES_CBC
NEED_AES_DEC=y
+ifneq ($(CONFIG_TLS), openssl)
AESOBJS += src/crypto/aes-cbc.c
endif
+endif
ifdef NEED_AES_DEC
ifdef CONFIG_INTERNAL_AES
AESOBJS += src/crypto/aes-internal-dec.c
@@ -760,11 +796,17 @@
endif
endif
+ifdef CONFIG_NO_RC4
+L_CFLAGS += -DCONFIG_NO_RC4
+endif
+
ifdef NEED_RC4
ifdef CONFIG_INTERNAL_RC4
+ifndef CONFIG_NO_RC4
OBJS += src/crypto/rc4.c
endif
endif
+endif
ifdef NEED_SHA256
L_CFLAGS += -DCONFIG_SHA256
@@ -781,6 +823,17 @@
endif
ifdef NEED_SHA384
L_CFLAGS += -DCONFIG_SHA384
+OBJS += src/crypto/sha384-prf.c
+endif
+
+ifdef CONFIG_INTERNAL_SHA384
+L_CFLAGS += -DCONFIG_INTERNAL_SHA384
+OBJS += src/crypto/sha384-internal.c
+endif
+
+ifdef CONFIG_INTERNAL_SHA512
+L_CFLAGS += -DCONFIG_INTERNAL_SHA512
+OBJS += src/crypto/sha512-internal.c
endif
ifdef NEED_DH_GROUPS
@@ -806,8 +859,10 @@
HOBJS += src/crypto/random.c
HOBJS += src/utils/eloop.c
HOBJS += $(SHA1OBJS)
+ifneq ($(CONFIG_TLS), openssl)
HOBJS += src/crypto/md5.c
endif
+endif
ifdef CONFIG_RADIUS_SERVER
L_CFLAGS += -DRADIUS_SERVER
@@ -822,12 +877,6 @@
L_CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
endif
-ifdef CONFIG_FULL_DYNAMIC_VLAN
-# define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
-# and vlan interfaces for the vlan feature.
-L_CFLAGS += -DCONFIG_FULL_DYNAMIC_VLAN
-endif
-
ifdef NEED_BASE64
OBJS += src/utils/base64.c
endif
@@ -898,8 +947,12 @@
L_CFLAGS += -DCONFIG_ANDROID_LOG
endif
-OBJS_c = hostapd_cli.c src/common/wpa_ctrl.c src/utils/os_$(CONFIG_OS).c
+OBJS_c = hostapd_cli.c
+OBJS_c += src/common/wpa_ctrl.c
+OBJS_c += src/utils/os_$(CONFIG_OS).c
+OBJS_c += src/common/cli.c
OBJS_c += src/utils/eloop.c
+OBJS_c += src/utils/common.c
Home |
Main Index |
Thread Index |
Old Index