git: 0a6760a1de32 - stable/13 - wpa: Import wpa_supplicant/hostapd commits up to b4f7506ff
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 04 Nov 2021 18:32:07 UTC
The branch stable/13 has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=0a6760a1de32bf5df91ef926eba25b3f74b4f84f
commit 0a6760a1de32bf5df91ef926eba25b3f74b4f84f
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-09-03 13:07:19 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2021-11-04 18:30:24 +0000
wpa: Import wpa_supplicant/hostapd commits up to b4f7506ff
Merge vendor commits 40c7ff83e74eabba5a7e2caefeea12372b2d3f9a,
efec8223892b3e677acb46eae84ec3534989971f, and
2f6c3ea9600b494d24cac5a38c1cea0ac192245e.
Tested by: philip
(cherry picked from commit c1d255d3ffdbe447de3ab875bf4e7d7accc5bfc5)
---
contrib/wpa/CONTRIBUTIONS | 5 +-
contrib/wpa/hostapd/Android.mk | 1152 ++
contrib/wpa/hostapd/ChangeLog | 4 +-
contrib/wpa/hostapd/Makefile | 1375 +++
contrib/wpa/hostapd/android.config | 214 +
contrib/wpa/hostapd/config_file.c | 453 +-
contrib/wpa/hostapd/ctrl_iface.c | 908 +-
contrib/wpa/hostapd/defconfig | 35 +-
contrib/wpa/hostapd/hostapd.android.rc | 19 +
contrib/wpa/hostapd/hostapd.conf | 367 +-
contrib/wpa/hostapd/hostapd.wpa_psk | 6 +
contrib/wpa/hostapd/hostapd_cli.c | 128 +-
contrib/wpa/hostapd/main.c | 22 +-
contrib/wpa/hostapd/sae_pk_gen.c | 196 +
contrib/wpa/hs20/client/Makefile | 55 +-
contrib/wpa/hs20/client/est.c | 7 +-
contrib/wpa/hs20/client/oma_dm_client.c | 2 +-
contrib/wpa/hs20/client/osu_client.c | 27 +-
contrib/wpa/hs20/client/osu_client.h | 2 +
contrib/wpa/hs20/client/spp_client.c | 2 +-
contrib/wpa/hs20/server/Makefile | 42 +
contrib/wpa/hs20/server/ca/clean.sh | 13 +
contrib/wpa/hs20/server/ca/est-csrattrs.cnf | 17 +
contrib/wpa/hs20/server/ca/est-csrattrs.sh | 4 +
contrib/wpa/hs20/server/ca/hs20.oid | 7 +
contrib/wpa/hs20/server/ca/ocsp-req.sh | 11 +
contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh | 3 +
contrib/wpa/hs20/server/ca/ocsp-responder.sh | 3 +
contrib/wpa/hs20/server/ca/ocsp-update-cache.sh | 11 +
contrib/wpa/hs20/server/ca/openssl-root.cnf | 125 +
contrib/wpa/hs20/server/ca/openssl.cnf | 200 +
contrib/wpa/hs20/server/ca/setup.sh | 209 +
contrib/wpa/hs20/server/ca/w1fi_logo.png | Bin 0 -> 7549 bytes
contrib/wpa/hs20/server/hs20-osu-server.txt | 262 +
contrib/wpa/hs20/server/hs20_spp_server.c | 207 +
contrib/wpa/hs20/server/spp_server.c | 2933 +++++
contrib/wpa/hs20/server/spp_server.h | 36 +
contrib/wpa/hs20/server/sql-example.txt | 17 +
contrib/wpa/hs20/server/sql.txt | 108 +
contrib/wpa/hs20/server/www/add-free.php | 50 +
contrib/wpa/hs20/server/www/add-mo.php | 56 +
contrib/wpa/hs20/server/www/cert-enroll.php | 39 +
contrib/wpa/hs20/server/www/config.php | 7 +
contrib/wpa/hs20/server/www/est.php | 232 +
contrib/wpa/hs20/server/www/free-remediation.php | 19 +
contrib/wpa/hs20/server/www/free.php | 23 +
contrib/wpa/hs20/server/www/redirect.php | 32 +
contrib/wpa/hs20/server/www/remediation-pw.php | 41 +
contrib/wpa/hs20/server/www/remediation.php | 55 +
contrib/wpa/hs20/server/www/signup.php | 59 +
contrib/wpa/hs20/server/www/spp.php | 168 +
contrib/wpa/hs20/server/www/terms.php | 87 +
contrib/wpa/hs20/server/www/users.php | 377 +
contrib/wpa/src/Makefile | 12 +
contrib/wpa/src/ap/Makefile | 60 +
contrib/wpa/src/ap/acs.c | 357 +-
contrib/wpa/src/ap/airtime_policy.c | 12 +-
contrib/wpa/src/ap/ap_config.c | 298 +-
contrib/wpa/src/ap/ap_config.h | 135 +-
contrib/wpa/src/ap/ap_drv_ops.c | 158 +-
contrib/wpa/src/ap/ap_drv_ops.h | 51 +-
contrib/wpa/src/ap/ap_list.c | 4 -
contrib/wpa/src/ap/authsrv.c | 87 +-
contrib/wpa/src/ap/beacon.c | 609 +-
contrib/wpa/src/ap/beacon.h | 2 +
contrib/wpa/src/ap/ctrl_iface_ap.c | 85 +-
contrib/wpa/src/ap/dfs.c | 330 +-
contrib/wpa/src/ap/dfs.h | 3 +
contrib/wpa/src/ap/dhcp_snoop.c | 8 +-
contrib/wpa/src/ap/dpp_hostapd.c | 1025 +-
contrib/wpa/src/ap/dpp_hostapd.h | 11 +
contrib/wpa/src/ap/drv_callbacks.c | 362 +-
contrib/wpa/src/ap/fils_hlp.c | 36 +-
contrib/wpa/src/ap/gas_serv.c | 10 +-
contrib/wpa/src/ap/hostapd.c | 282 +-
contrib/wpa/src/ap/hostapd.h | 59 +-
contrib/wpa/src/ap/hs20.c | 6 +-
contrib/wpa/src/ap/hw_features.c | 373 +-
contrib/wpa/src/ap/hw_features.h | 22 +-
contrib/wpa/src/ap/ieee802_11.c | 2516 +++-
contrib/wpa/src/ap/ieee802_11.h | 24 +-
contrib/wpa/src/ap/ieee802_11_auth.c | 172 +-
contrib/wpa/src/ap/ieee802_11_auth.h | 17 +-
contrib/wpa/src/ap/ieee802_11_he.c | 189 +-
contrib/wpa/src/ap/ieee802_11_ht.c | 30 +-
contrib/wpa/src/ap/ieee802_11_shared.c | 189 +-
contrib/wpa/src/ap/ieee802_11_vht.c | 176 +-
contrib/wpa/src/ap/ieee802_1x.c | 482 +-
contrib/wpa/src/ap/ieee802_1x.h | 7 +-
contrib/wpa/src/ap/neighbor_db.c | 58 +-
contrib/wpa/src/ap/neighbor_db.h | 1 +
contrib/wpa/src/ap/pmksa_cache_auth.c | 6 +
contrib/wpa/src/ap/preauth_auth.c | 2 +-
contrib/wpa/src/ap/sta_info.c | 111 +-
contrib/wpa/src/ap/sta_info.h | 54 +-
contrib/wpa/src/ap/utils.c | 4 +
contrib/wpa/src/ap/vlan_init.c | 5 +-
contrib/wpa/src/ap/wmm.c | 14 +-
contrib/wpa/src/ap/wnm_ap.c | 83 +-
contrib/wpa/src/ap/wpa_auth.c | 1415 ++-
contrib/wpa/src/ap/wpa_auth.h | 103 +-
contrib/wpa/src/ap/wpa_auth_ft.c | 385 +-
contrib/wpa/src/ap/wpa_auth_glue.c | 343 +-
contrib/wpa/src/ap/wpa_auth_i.h | 71 +-
contrib/wpa/src/ap/wpa_auth_ie.c | 444 +-
contrib/wpa/src/ap/wpa_auth_ie.h | 35 -
contrib/wpa/src/ap/wpa_auth_kay.c | 12 +-
contrib/wpa/src/ap/wps_hostapd.c | 237 +-
contrib/wpa/src/build.rules | 109 +
contrib/wpa/src/common/Makefile | 16 +
contrib/wpa/src/common/brcm_vendor.h | 156 +
contrib/wpa/src/common/common_module_tests.c | 513 +-
contrib/wpa/src/common/defs.h | 86 +-
contrib/wpa/src/common/dhcp.h | 2 +-
contrib/wpa/src/common/dpp.c | 11695 +++++-------------
contrib/wpa/src/common/dpp.h | 248 +-
contrib/wpa/src/common/dpp_auth.c | 1977 +++
contrib/wpa/src/common/dpp_backup.c | 1265 ++
contrib/wpa/src/common/dpp_crypto.c | 3329 +++++
contrib/wpa/src/common/dpp_i.h | 160 +
contrib/wpa/src/common/dpp_pkex.c | 1324 ++
contrib/wpa/src/common/dpp_reconfig.c | 958 ++
contrib/wpa/src/common/dpp_tcp.c | 1824 +++
contrib/wpa/src/common/gas_server.c | 140 +-
contrib/wpa/src/common/gas_server.h | 9 +-
contrib/wpa/src/common/hw_features_common.c | 427 +-
contrib/wpa/src/common/hw_features_common.h | 26 +-
contrib/wpa/src/common/ieee802_11_common.c | 789 +-
contrib/wpa/src/common/ieee802_11_common.h | 70 +-
contrib/wpa/src/common/ieee802_11_defs.h | 249 +-
contrib/wpa/src/common/linux_bridge.h | 39 +
contrib/wpa/src/common/linux_vlan.h | 52 +
contrib/wpa/src/common/ocv.c | 39 +-
contrib/wpa/src/common/ocv.h | 13 +-
contrib/wpa/src/common/privsep_commands.h | 1 +
contrib/wpa/src/common/ptksa_cache.c | 321 +
contrib/wpa/src/common/ptksa_cache.h | 79 +
contrib/wpa/src/common/qca-vendor.h | 4187 ++++++-
contrib/wpa/src/common/sae.c | 1387 ++-
contrib/wpa/src/common/sae.h | 109 +-
contrib/wpa/src/common/sae_pk.c | 884 ++
contrib/wpa/src/common/version.h | 2 +-
contrib/wpa/src/common/wpa_common.c | 1240 +-
contrib/wpa/src/common/wpa_common.h | 207 +-
contrib/wpa/src/common/wpa_ctrl.c | 5 +-
contrib/wpa/src/common/wpa_ctrl.h | 41 +-
contrib/wpa/src/crypto/Makefile | 60 +
contrib/wpa/src/crypto/crypto.h | 49 +-
contrib/wpa/src/crypto/crypto_module_tests.c | 150 +
contrib/wpa/src/crypto/crypto_openssl.c | 250 +
contrib/wpa/src/crypto/crypto_wolfssl.c | 77 +-
contrib/wpa/src/crypto/sha256.c | 6 +-
contrib/wpa/src/crypto/sha384-tlsprf.c | 71 +
contrib/wpa/src/crypto/sha384.c | 6 +-
contrib/wpa/src/crypto/sha384.h | 3 +
contrib/wpa/src/crypto/sha512.c | 6 +-
contrib/wpa/src/crypto/tls.h | 14 +
contrib/wpa/src/crypto/tls_openssl.c | 304 +-
contrib/wpa/src/crypto/tls_wolfssl.c | 65 +-
contrib/wpa/src/drivers/Makefile | 9 +
contrib/wpa/src/drivers/android_drv.h | 56 +
contrib/wpa/src/drivers/driver.h | 716 +-
contrib/wpa/src/drivers/driver_atheros.c | 41 +-
contrib/wpa/src/drivers/driver_bsd.c | 659 +-
contrib/wpa/src/drivers/driver_common.c | 21 +
contrib/wpa/src/drivers/driver_hostap.c | 24 +-
contrib/wpa/src/drivers/driver_hostap.h | 210 +
contrib/wpa/src/drivers/driver_macsec_linux.c | 87 +-
contrib/wpa/src/drivers/driver_macsec_qca.c | 34 +-
contrib/wpa/src/drivers/driver_ndis.c | 47 +-
contrib/wpa/src/drivers/driver_nl80211.c | 12229 +++++++++++++++++++
contrib/wpa/src/drivers/driver_nl80211.h | 65 +-
contrib/wpa/src/drivers/driver_nl80211_android.c | 4 +-
contrib/wpa/src/drivers/driver_nl80211_capa.c | 579 +-
contrib/wpa/src/drivers/driver_nl80211_event.c | 580 +-
contrib/wpa/src/drivers/driver_nl80211_monitor.c | 3 +
contrib/wpa/src/drivers/driver_nl80211_scan.c | 51 +-
contrib/wpa/src/drivers/driver_none.c | 77 +
contrib/wpa/src/drivers/driver_openbsd.c | 10 +-
contrib/wpa/src/drivers/driver_privsep.c | 18 +-
contrib/wpa/src/drivers/driver_roboswitch.c | 487 +
contrib/wpa/src/drivers/driver_wext.c | 2499 ++++
contrib/wpa/src/drivers/driver_wext.h | 77 +
contrib/wpa/src/drivers/drivers.mak | 220 +
contrib/wpa/src/drivers/drivers.mk | 196 +
contrib/wpa/src/drivers/linux_ioctl.c | 237 +
contrib/wpa/src/drivers/linux_ioctl.h | 23 +
contrib/wpa/src/drivers/linux_wext.h | 45 +
contrib/wpa/src/drivers/netlink.c | 226 +
contrib/wpa/src/drivers/netlink.h | 28 +
contrib/wpa/src/drivers/nl80211_copy.h | 973 +-
contrib/wpa/src/drivers/priv_netlink.h | 109 +
contrib/wpa/src/drivers/rfkill.c | 224 +
contrib/wpa/src/drivers/rfkill.h | 25 +
contrib/wpa/src/eap_common/Makefile | 18 +
contrib/wpa/src/eap_common/eap_common.c | 8 +-
contrib/wpa/src/eap_common/eap_common.h | 8 +-
contrib/wpa/src/eap_common/eap_defs.h | 4 +-
contrib/wpa/src/eap_common/eap_sim_common.c | 28 +
contrib/wpa/src/eap_common/eap_teap_common.c | 72 +-
contrib/wpa/src/eap_common/eap_teap_common.h | 22 +-
contrib/wpa/src/eap_peer/Makefile | 7 +
contrib/wpa/src/eap_peer/eap.c | 220 +-
contrib/wpa/src/eap_peer/eap.h | 13 +-
contrib/wpa/src/eap_peer/eap_aka.c | 48 +-
contrib/wpa/src/eap_peer/eap_config.h | 408 +-
contrib/wpa/src/eap_peer/eap_eke.c | 16 +-
contrib/wpa/src/eap_peer/eap_fast.c | 54 +-
contrib/wpa/src/eap_peer/eap_gpsk.c | 14 +-
contrib/wpa/src/eap_peer/eap_gtc.c | 8 +-
contrib/wpa/src/eap_peer/eap_i.h | 42 +-
contrib/wpa/src/eap_peer/eap_ikev2.c | 28 +-
contrib/wpa/src/eap_peer/eap_leap.c | 44 +-
contrib/wpa/src/eap_peer/eap_md5.c | 12 +-
contrib/wpa/src/eap_peer/eap_methods.c | 12 +-
contrib/wpa/src/eap_peer/eap_methods.h | 14 +-
contrib/wpa/src/eap_peer/eap_mschapv2.c | 32 +-
contrib/wpa/src/eap_peer/eap_otp.c | 8 +-
contrib/wpa/src/eap_peer/eap_pax.c | 50 +-
contrib/wpa/src/eap_peer/eap_peap.c | 71 +-
contrib/wpa/src/eap_peer/eap_psk.c | 22 +-
contrib/wpa/src/eap_peer/eap_pwd.c | 22 +-
contrib/wpa/src/eap_peer/eap_sake.c | 26 +-
contrib/wpa/src/eap_peer/eap_sim.c | 44 +-
contrib/wpa/src/eap_peer/eap_teap.c | 201 +-
contrib/wpa/src/eap_peer/eap_tls.c | 42 +-
contrib/wpa/src/eap_peer/eap_tls_common.c | 103 +-
contrib/wpa/src/eap_peer/eap_tls_common.h | 10 +-
contrib/wpa/src/eap_peer/eap_tnc.c | 32 +-
contrib/wpa/src/eap_peer/eap_ttls.c | 88 +-
contrib/wpa/src/eap_peer/eap_vendor_test.c | 16 +-
contrib/wpa/src/eap_peer/eap_wsc.c | 24 +-
contrib/wpa/src/eap_peer/ikev2.c | 10 +-
contrib/wpa/src/eap_peer/tncc.c | 5 +-
contrib/wpa/src/eap_server/Makefile | 8 +
contrib/wpa/src/eap_server/eap.h | 172 +-
contrib/wpa/src/eap_server/eap_i.h | 67 +-
contrib/wpa/src/eap_server/eap_methods.h | 9 +-
contrib/wpa/src/eap_server/eap_server.c | 291 +-
contrib/wpa/src/eap_server/eap_server_aka.c | 74 +-
contrib/wpa/src/eap_server/eap_server_eke.c | 39 +-
contrib/wpa/src/eap_server/eap_server_fast.c | 106 +-
contrib/wpa/src/eap_server/eap_server_gpsk.c | 37 +-
contrib/wpa/src/eap_server/eap_server_gtc.c | 12 +-
contrib/wpa/src/eap_server/eap_server_identity.c | 14 +-
contrib/wpa/src/eap_server/eap_server_ikev2.c | 22 +-
contrib/wpa/src/eap_server/eap_server_md5.c | 14 +-
contrib/wpa/src/eap_server/eap_server_methods.c | 10 +-
contrib/wpa/src/eap_server/eap_server_mschapv2.c | 22 +-
contrib/wpa/src/eap_server/eap_server_pax.c | 32 +-
contrib/wpa/src/eap_server/eap_server_peap.c | 103 +-
contrib/wpa/src/eap_server/eap_server_psk.c | 34 +-
contrib/wpa/src/eap_server/eap_server_pwd.c | 22 +-
contrib/wpa/src/eap_server/eap_server_sake.c | 38 +-
contrib/wpa/src/eap_server/eap_server_sim.c | 66 +-
contrib/wpa/src/eap_server/eap_server_teap.c | 309 +-
contrib/wpa/src/eap_server/eap_server_tls.c | 54 +-
contrib/wpa/src/eap_server/eap_server_tls_common.c | 93 +-
contrib/wpa/src/eap_server/eap_server_tnc.c | 26 +-
contrib/wpa/src/eap_server/eap_server_ttls.c | 96 +-
.../wpa/src/eap_server/eap_server_vendor_test.c | 12 +-
contrib/wpa/src/eap_server/eap_server_wsc.c | 32 +-
contrib/wpa/src/eap_server/eap_tls_common.h | 2 +-
contrib/wpa/src/eap_server/tncs.c | 5 +-
contrib/wpa/src/eapol_auth/Makefile | 2 +
contrib/wpa/src/eapol_auth/eapol_auth_sm.c | 206 +-
contrib/wpa/src/eapol_auth/eapol_auth_sm.h | 26 +-
contrib/wpa/src/eapol_auth/eapol_auth_sm_i.h | 40 +-
contrib/wpa/src/eapol_supp/Makefile | 5 +
contrib/wpa/src/eapol_supp/eapol_supp_sm.c | 218 +-
contrib/wpa/src/eapol_supp/eapol_supp_sm.h | 29 +-
contrib/wpa/src/fst/fst.c | 25 +-
contrib/wpa/src/fst/fst.h | 23 +-
contrib/wpa/src/fst/fst_ctrl_aux.h | 4 +-
contrib/wpa/src/fst/fst_ctrl_iface.c | 48 +-
contrib/wpa/src/fst/fst_ctrl_iface.h | 2 +-
contrib/wpa/src/fst/fst_group.c | 10 +-
contrib/wpa/src/fst/fst_group.h | 4 +-
contrib/wpa/src/fst/fst_iface.c | 8 +-
contrib/wpa/src/fst/fst_iface.h | 8 +-
contrib/wpa/src/fst/fst_session.c | 96 +-
contrib/wpa/src/fst/fst_session.h | 12 +-
contrib/wpa/src/l2_packet/Makefile | 3 +
contrib/wpa/src/l2_packet/l2_packet.h | 4 +
contrib/wpa/src/l2_packet/l2_packet_freebsd.c | 5 +-
contrib/wpa/src/l2_packet/l2_packet_linux.c | 515 +
contrib/wpa/src/l2_packet/l2_packet_ndis.c | 3 +-
contrib/wpa/src/l2_packet/l2_packet_none.c | 4 +-
contrib/wpa/src/l2_packet/l2_packet_pcap.c | 400 +
contrib/wpa/src/l2_packet/l2_packet_privsep.c | 3 +-
contrib/wpa/src/l2_packet/l2_packet_winpcap.c | 350 +
contrib/wpa/src/lib.rules | 29 +
contrib/wpa/src/objs.mk | 3 +
contrib/wpa/src/p2p/Makefile | 16 +
contrib/wpa/src/p2p/p2p.c | 147 +-
contrib/wpa/src/p2p/p2p.h | 31 +-
contrib/wpa/src/p2p/p2p_go_neg.c | 9 +
contrib/wpa/src/p2p/p2p_i.h | 5 +
contrib/wpa/src/p2p/p2p_invitation.c | 5 +-
contrib/wpa/src/p2p/p2p_utils.c | 39 +
contrib/wpa/src/pae/ieee802_1x_cp.c | 177 +-
contrib/wpa/src/pae/ieee802_1x_cp.h | 10 +-
contrib/wpa/src/pae/ieee802_1x_kay.c | 608 +-
contrib/wpa/src/pae/ieee802_1x_kay.h | 68 +-
contrib/wpa/src/pae/ieee802_1x_kay_i.h | 40 +-
contrib/wpa/src/pae/ieee802_1x_secy_ops.c | 22 +-
contrib/wpa/src/pae/ieee802_1x_secy_ops.h | 8 +-
contrib/wpa/src/radius/Makefile | 9 +
contrib/wpa/src/radius/radius.c | 2 +-
contrib/wpa/src/radius/radius.h | 3 +
contrib/wpa/src/radius/radius_client.c | 55 +-
contrib/wpa/src/radius/radius_client.h | 5 +
contrib/wpa/src/radius/radius_server.c | 283 +-
contrib/wpa/src/radius/radius_server.h | 142 +-
contrib/wpa/src/rsn_supp/Makefile | 14 +
contrib/wpa/src/rsn_supp/pmksa_cache.c | 54 +-
contrib/wpa/src/rsn_supp/pmksa_cache.h | 7 +-
contrib/wpa/src/rsn_supp/preauth.c | 24 +-
contrib/wpa/src/rsn_supp/tdls.c | 71 +-
contrib/wpa/src/rsn_supp/wpa.c | 759 +-
contrib/wpa/src/rsn_supp/wpa.h | 93 +-
contrib/wpa/src/rsn_supp/wpa_ft.c | 399 +-
contrib/wpa/src/rsn_supp/wpa_i.h | 88 +-
contrib/wpa/src/rsn_supp/wpa_ie.c | 317 +-
contrib/wpa/src/rsn_supp/wpa_ie.h | 52 +-
contrib/wpa/src/tls/Makefile | 25 +
contrib/wpa/src/tls/asn1.c | 396 +-
contrib/wpa/src/tls/asn1.h | 146 +-
contrib/wpa/src/tls/pkcs1.c | 55 +-
contrib/wpa/src/tls/pkcs5.c | 78 +-
contrib/wpa/src/tls/pkcs8.c | 59 +-
contrib/wpa/src/tls/rsa.c | 23 +-
contrib/wpa/src/tls/tlsv1_client.c | 29 +-
contrib/wpa/src/tls/tlsv1_client_i.h | 4 +-
contrib/wpa/src/tls/tlsv1_client_ocsp.c | 180 +-
contrib/wpa/src/tls/tlsv1_client_read.c | 10 +-
contrib/wpa/src/tls/tlsv1_client_write.c | 18 +-
contrib/wpa/src/tls/tlsv1_cred.c | 247 +-
contrib/wpa/src/tls/x509v3.c | 419 +-
contrib/wpa/src/tls/x509v3.h | 7 +
contrib/wpa/src/utils/Makefile | 30 +
contrib/wpa/src/utils/base64.c | 59 +-
contrib/wpa/src/utils/base64.h | 13 +-
contrib/wpa/src/utils/browser-android.c | 2 +-
contrib/wpa/src/utils/browser-system.c | 2 +-
contrib/wpa/src/utils/browser-wpadebug.c | 2 +-
contrib/wpa/src/utils/browser.c | 210 +-
contrib/wpa/src/utils/browser.h | 4 +-
contrib/wpa/src/utils/common.c | 38 +-
contrib/wpa/src/utils/common.h | 8 +-
contrib/wpa/src/utils/config.c | 97 +
contrib/wpa/src/utils/config.h | 29 +
contrib/wpa/src/utils/eloop.c | 47 +-
contrib/wpa/src/utils/eloop_win.c | 8 +-
contrib/wpa/src/utils/ext_password.c | 3 +
contrib/wpa/src/utils/ext_password_file.c | 136 +
contrib/wpa/src/utils/ext_password_i.h | 4 +
contrib/wpa/src/utils/http-utils.h | 6 +-
contrib/wpa/src/utils/includes.h | 1 +
contrib/wpa/src/utils/json.c | 122 +-
contrib/wpa/src/utils/json.h | 15 +
contrib/wpa/src/utils/list.h | 8 +-
contrib/wpa/src/utils/os_internal.c | 6 +
contrib/wpa/src/utils/os_unix.c | 46 +-
contrib/wpa/src/utils/platform.h | 23 +-
contrib/wpa/src/utils/radiotap.c | 12 +-
contrib/wpa/src/utils/radiotap.h | 407 +-
contrib/wpa/src/utils/state_machine.h | 8 +-
contrib/wpa/src/utils/trace.c | 11 +
contrib/wpa/src/utils/utils_module_tests.c | 39 +-
contrib/wpa/src/utils/wpa_debug.c | 147 +-
contrib/wpa/src/utils/wpa_debug.h | 3 -
contrib/wpa/src/utils/wpabuf.h | 27 +
contrib/wpa/src/utils/xml_libxml2.c | 2 +-
contrib/wpa/src/wps/Makefile | 28 +
contrib/wpa/src/wps/upnp_xml.c | 2 +-
contrib/wpa/src/wps/wps.h | 23 +-
contrib/wpa/src/wps/wps_attr_build.c | 15 +-
contrib/wpa/src/wps/wps_attr_process.c | 9 +-
contrib/wpa/src/wps/wps_dev_attr.c | 17 +
contrib/wpa/src/wps/wps_dev_attr.h | 1 +
contrib/wpa/src/wps/wps_enrollee.c | 11 +
contrib/wpa/src/wps/wps_er.c | 4 +-
contrib/wpa/src/wps/wps_registrar.c | 139 +-
contrib/wpa/src/wps/wps_upnp.c | 28 +-
contrib/wpa/src/wps/wps_upnp_ap.c | 4 +-
contrib/wpa/src/wps/wps_upnp_event.c | 27 +-
contrib/wpa/src/wps/wps_upnp_i.h | 9 +-
contrib/wpa/src/wps/wps_upnp_web.c | 4 +-
contrib/wpa/wpa_supplicant/Android.mk | 114 +-
contrib/wpa/wpa_supplicant/ChangeLog | 10 +-
contrib/wpa/wpa_supplicant/Makefile | 2073 ++++
contrib/wpa/wpa_supplicant/README | 4 +-
contrib/wpa/wpa_supplicant/README-DPP | 71 +-
contrib/wpa/wpa_supplicant/README-HS20 | 2 +-
contrib/wpa/wpa_supplicant/android.config | 16 +-
contrib/wpa/wpa_supplicant/ap.c | 257 +-
contrib/wpa/wpa_supplicant/binder/binder.h | 2 +-
contrib/wpa/wpa_supplicant/bss.c | 145 +-
contrib/wpa/wpa_supplicant/bss.h | 25 +-
contrib/wpa/wpa_supplicant/bssid_ignore.c | 221 +
contrib/wpa/wpa_supplicant/bssid_ignore.h | 33 +
contrib/wpa/wpa_supplicant/config.c | 644 +-
contrib/wpa/wpa_supplicant/config.h | 129 +-
contrib/wpa/wpa_supplicant/config_file.c | 243 +-
contrib/wpa/wpa_supplicant/config_ssid.h | 155 +-
contrib/wpa/wpa_supplicant/config_winreg.c | 1061 ++
contrib/wpa/wpa_supplicant/ctrl_iface.c | 1375 ++-
contrib/wpa/wpa_supplicant/ctrl_iface.h | 16 +-
contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c | 7 +-
contrib/wpa/wpa_supplicant/ctrl_iface_udp.c | 63 +-
contrib/wpa/wpa_supplicant/ctrl_iface_unix.c | 73 +-
contrib/wpa/wpa_supplicant/dbus/dbus_common.c | 23 +-
contrib/wpa/wpa_supplicant/dbus/dbus_new.c | 76 +-
.../wpa/wpa_supplicant/dbus/dbus_new_handlers.c | 424 +-
.../wpa/wpa_supplicant/dbus/dbus_new_handlers.h | 6 +
.../wpa_supplicant/dbus/dbus_new_handlers_p2p.c | 84 +-
.../wpa/wpa_supplicant/dbus/dbus_new_introspect.c | 2 +-
contrib/wpa/wpa_supplicant/defconfig | 45 +-
contrib/wpa/wpa_supplicant/doc/docbook/Makefile | 28 +
.../wpa/wpa_supplicant/doc/docbook/eapol_test.sgml | 209 +
.../wpa_supplicant/doc/docbook/wpa_background.sgml | 105 +
.../wpa/wpa_supplicant/doc/docbook/wpa_cli.sgml | 360 +
.../wpa/wpa_supplicant/doc/docbook/wpa_gui.sgml | 106 +
.../wpa_supplicant/doc/docbook/wpa_passphrase.sgml | 77 +
.../wpa/wpa_supplicant/doc/docbook/wpa_priv.sgml | 152 +
.../doc/docbook/wpa_supplicant.conf.sgml | 243 +
.../wpa_supplicant/doc/docbook/wpa_supplicant.sgml | 764 ++
contrib/wpa/wpa_supplicant/dpp_supplicant.c | 1808 ++-
contrib/wpa/wpa_supplicant/dpp_supplicant.h | 15 +
contrib/wpa/wpa_supplicant/driver_i.h | 109 +-
contrib/wpa/wpa_supplicant/eapol_test.c | 15 +-
contrib/wpa/wpa_supplicant/events.c | 1537 ++-
contrib/wpa/wpa_supplicant/examples/dpp-nfc.py | 1186 ++
.../wpa_supplicant/examples/p2p-action-udhcp.sh | 4 +-
contrib/wpa/wpa_supplicant/examples/p2p-action.sh | 4 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_connect.py | 18 +-
.../wpa_supplicant/examples/p2p/p2p_disconnect.py | 2 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_find.py | 2 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_flush.py | 2 +-
.../wpa_supplicant/examples/p2p/p2p_group_add.py | 14 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_invite.py | 10 +-
.../wpa/wpa_supplicant/examples/p2p/p2p_listen.py | 2 +-
.../wpa_supplicant/examples/p2p/p2p_stop_find.py | 2 +-
.../wpa/wpa_supplicant/examples/udhcpd-p2p.conf | 12 +-
contrib/wpa/wpa_supplicant/gas_query.c | 62 +-
contrib/wpa/wpa_supplicant/gas_query.h | 2 +-
contrib/wpa/wpa_supplicant/hs20_supplicant.c | 30 +-
contrib/wpa/wpa_supplicant/ibss_rsn.c | 45 +-
contrib/wpa/wpa_supplicant/interworking.c | 66 +-
contrib/wpa/wpa_supplicant/interworking.h | 2 +-
contrib/wpa/wpa_supplicant/main.c | 10 +-
contrib/wpa/wpa_supplicant/main_winmain.c | 78 +
contrib/wpa/wpa_supplicant/main_winsvc.c | 458 +
contrib/wpa/wpa_supplicant/mbo.c | 30 +
contrib/wpa/wpa_supplicant/mesh.c | 243 +-
contrib/wpa/wpa_supplicant/mesh.h | 6 +-
contrib/wpa/wpa_supplicant/mesh_mpm.c | 49 +-
contrib/wpa/wpa_supplicant/mesh_rsn.c | 27 +-
contrib/wpa/wpa_supplicant/nmake.mak | 2 +-
contrib/wpa/wpa_supplicant/notify.c | 10 +-
contrib/wpa/wpa_supplicant/offchannel.c | 6 +-
contrib/wpa/wpa_supplicant/op_classes.c | 239 +-
contrib/wpa/wpa_supplicant/p2p_supplicant.c | 667 +-
contrib/wpa/wpa_supplicant/p2p_supplicant.h | 32 +-
contrib/wpa/wpa_supplicant/pasn_supplicant.c | 1714 +++
contrib/wpa/wpa_supplicant/preauth_test.c | 20 +-
contrib/wpa/wpa_supplicant/robust_av.c | 155 +
contrib/wpa/wpa_supplicant/rrm.c | 91 +-
contrib/wpa/wpa_supplicant/scan.c | 703 +-
contrib/wpa/wpa_supplicant/scan.h | 33 +
contrib/wpa/wpa_supplicant/sme.c | 531 +-
contrib/wpa/wpa_supplicant/sme.h | 8 +-
.../systemd/wpa_supplicant-nl80211.service.arg.in | 2 +-
.../systemd/wpa_supplicant-wired.service.arg.in | 2 +-
.../systemd/wpa_supplicant.service.arg.in | 2 +-
contrib/wpa/wpa_supplicant/twt.c | 142 +
.../vs2005/eapol_test/eapol_test.vcproj | 6 +-
.../vs2005/wpa_supplicant/wpa_supplicant.vcproj | 6 +-
.../wpa/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj | 6 +-
contrib/wpa/wpa_supplicant/wmm_ac.c | 2 +-
contrib/wpa/wpa_supplicant/wnm_sta.c | 33 +-
contrib/wpa/wpa_supplicant/wpa_cli.c | 339 +-
contrib/wpa/wpa_supplicant/wpa_passphrase.c | 8 +-
contrib/wpa/wpa_supplicant/wpa_priv.c | 32 +-
contrib/wpa/wpa_supplicant/wpa_supplicant.c | 1283 +-
contrib/wpa/wpa_supplicant/wpa_supplicant.conf | 196 +-
contrib/wpa/wpa_supplicant/wpa_supplicant_i.h | 249 +-
contrib/wpa/wpa_supplicant/wpas_glue.c | 222 +-
contrib/wpa/wpa_supplicant/wpas_glue.h | 2 +
contrib/wpa/wpa_supplicant/wpas_kay.c | 12 +-
contrib/wpa/wpa_supplicant/wpas_module_tests.c | 85 +-
contrib/wpa/wpa_supplicant/wps_supplicant.c | 85 +-
contrib/wpa/wpa_supplicant/wps_supplicant.h | 5 +
usr.sbin/wpa/src/common/Makefile | 2 +
usr.sbin/wpa/src/crypto/Makefile | 5 +-
usr.sbin/wpa/src/utils/Makefile | 2 +
usr.sbin/wpa/wpa_supplicant/Makefile | 7 +-
498 files changed, 92625 insertions(+), 20522 deletions(-)
diff --git a/contrib/wpa/CONTRIBUTIONS b/contrib/wpa/CONTRIBUTIONS
index c81ad640995a..1b4caf7ac811 100644
--- a/contrib/wpa/CONTRIBUTIONS
+++ b/contrib/wpa/CONTRIBUTIONS
@@ -56,6 +56,9 @@ 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.
+A list of pending patches waiting for review is available in
+Patchwork: https://patchwork.ozlabs.org/project/hostap/list/
+
History of license and contributions terms
------------------------------------------
@@ -140,7 +143,7 @@ The license terms used for hostap.git files
Modified BSD license (no advertisement clause):
-Copyright (c) 2002-2019, Jouni Malinen <j@w1.fi> and contributors
+Copyright (c) 2002-2021, Jouni Malinen <j@w1.fi> and contributors
All Rights Reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/contrib/wpa/hostapd/Android.mk b/contrib/wpa/hostapd/Android.mk
new file mode 100644
index 000000000000..dd8aa2450d7e
--- /dev/null
+++ b/contrib/wpa/hostapd/Android.mk
@@ -0,0 +1,1152 @@
+# Copyright (C) 2008 The Android Open Source Project
+#
+# This software may be distributed under the terms of the BSD license.
+# See README for more details.
+#
+
+LOCAL_PATH := $(call my-dir)
+
+WPA_BUILD_HOSTAPD := false
+ifneq ($(BOARD_HOSTAPD_DRIVER),)
+ WPA_BUILD_HOSTAPD := true
+ CONFIG_DRIVER_$(BOARD_HOSTAPD_DRIVER) := y
+endif
+
+ifeq ($(WPA_BUILD_HOSTAPD),true)
+
+include $(LOCAL_PATH)/android.config
+
+# To ignore possible wrong network configurations
+L_CFLAGS = -DWPA_IGNORE_CONFIG_ERRORS
+
+L_CFLAGS += -DVERSION_STR_POSTFIX=\"-$(PLATFORM_VERSION)\"
+
+# Set Android log name
+L_CFLAGS += -DANDROID_LOG_NAME=\"hostapd\"
+
+# Disable unused parameter warnings
+L_CFLAGS += -Wno-unused-parameter
+
+# Set Android extended P2P functionality
+L_CFLAGS += -DANDROID_P2P
+
+ifeq ($(BOARD_HOSTAPD_PRIVATE_LIB),)
+L_CFLAGS += -DANDROID_LIB_STUB
+endif
+
+ifneq ($(BOARD_HOSTAPD_PRIVATE_LIB_EVENT),)
+L_CFLAGS += -DANDROID_LIB_EVENT
+endif
+
+# Use Android specific directory for control interface sockets
+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
+endif
+
+INCLUDES = $(LOCAL_PATH)
+INCLUDES += $(LOCAL_PATH)/src
+INCLUDES += $(LOCAL_PATH)/src/utils
+INCLUDES += system/security/keystore/include
+ifdef CONFIG_DRIVER_NL80211
+ifneq ($(wildcard external/libnl),)
+INCLUDES += external/libnl/include
+else
+INCLUDES += external/libnl-headers
+endif
+endif
+
+
+ifndef CONFIG_OS
+ifdef CONFIG_NATIVE_WINDOWS
+CONFIG_OS=win32
+else
+CONFIG_OS=unix
+endif
+endif
+
+ifeq ($(CONFIG_OS), internal)
+L_CFLAGS += -DOS_NO_C_LIB_DEFINES
+endif
+
+ifdef CONFIG_NATIVE_WINDOWS
+L_CFLAGS += -DCONFIG_NATIVE_WINDOWS
+LIBS += -lws2_32
+endif
+
+OBJS = main.c
+OBJS += config_file.c
+
+OBJS += src/ap/hostapd.c
+OBJS += src/ap/wpa_auth_glue.c
+OBJS += src/ap/drv_callbacks.c
+OBJS += src/ap/ap_drv_ops.c
+OBJS += src/ap/utils.c
+OBJS += src/ap/authsrv.c
+OBJS += src/ap/ieee802_1x.c
+OBJS += src/ap/ap_config.c
+OBJS += src/ap/eap_user_db.c
+OBJS += src/ap/ieee802_11_auth.c
+OBJS += src/ap/sta_info.c
+OBJS += src/ap/wpa_auth.c
+OBJS += src/ap/tkip_countermeasures.c
+OBJS += src/ap/ap_mlme.c
+OBJS += src/ap/wpa_auth_ie.c
+OBJS += src/ap/preauth_auth.c
+OBJS += src/ap/pmksa_cache_auth.c
+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 =
+LIBS_c =
+HOBJS =
+LIBS_h =
+
+NEED_RC4=y
+NEED_AES=y
+NEED_MD5=y
+NEED_SHA1=y
+
+OBJS += src/drivers/drivers.c
+L_CFLAGS += -DHOSTAPD
+
+ifdef CONFIG_WPA_TRACE
+L_CFLAGS += -DWPA_TRACE
+OBJS += src/utils/trace.c
+HOBJS += src/utils/trace.c
+LDFLAGS += -rdynamic
+L_CFLAGS += -funwind-tables
+ifdef CONFIG_WPA_TRACE_BFD
+L_CFLAGS += -DWPA_TRACE_BFD
+LIBS += -lbfd
+LIBS_c += -lbfd
+LIBS_h += -lbfd
+endif
+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
+OBJS += src/utils/os_$(CONFIG_OS).c
+OBJS += src/utils/ip_addr.c
+OBJS += src/utils/crc32.c
+
+OBJS += src/common/ieee802_11_common.c
+OBJS += src/common/wpa_common.c
+OBJS += src/common/hw_features_common.c
+
+OBJS += src/eapol_auth/eapol_auth_sm.c
+
+
+ifndef CONFIG_NO_DUMP_STATE
+# define HOSTAPD_DUMP_STATE to include support for dumping internal state
+# through control interface commands (undefine it, if you want to save in
+# binary size)
+L_CFLAGS += -DHOSTAPD_DUMP_STATE
+OBJS += src/eapol_auth/eapol_auth_dump.c
+endif
+
+ifdef CONFIG_NO_RADIUS
+L_CFLAGS += -DCONFIG_NO_RADIUS
+CONFIG_NO_ACCOUNTING=y
+else
+OBJS += src/radius/radius.c
+OBJS += src/radius/radius_client.c
+OBJS += src/radius/radius_das.c
+endif
+
+ifdef CONFIG_NO_ACCOUNTING
+L_CFLAGS += -DCONFIG_NO_ACCOUNTING
+else
+OBJS += src/ap/accounting.c
+endif
+
+ifdef CONFIG_NO_VLAN
+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
+OBJS += src/ap/vlan_util.c
+else
+OBJS += src/ap/vlan_ioctl.c
+endif
+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
+
+L_CFLAGS += -DCONFIG_CTRL_IFACE -DCONFIG_CTRL_IFACE_UNIX
+
+ifdef CONFIG_RSN_PREAUTH
+L_CFLAGS += -DCONFIG_RSN_PREAUTH
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_HS20
+CONFIG_PROXYARP=y
+endif
+
+ifdef CONFIG_PROXYARP
+CONFIG_L2_PACKET=y
+endif
+
+ifdef CONFIG_SUITEB
+L_CFLAGS += -DCONFIG_SUITEB
+endif
+
+ifdef CONFIG_SUITEB192
+L_CFLAGS += -DCONFIG_SUITEB192
+NEED_SHA384=y
+endif
+
+ifdef CONFIG_OCV
+L_CFLAGS += -DCONFIG_OCV
+OBJS += src/common/ocv.c
+endif
+
+ifdef CONFIG_IEEE80211R
+L_CFLAGS += -DCONFIG_IEEE80211R -DCONFIG_IEEE80211R_AP
+OBJS += src/ap/wpa_auth_ft.c
+NEED_AES_UNWRAP=y
+NEED_AES_SIV=y
+NEED_ETH_P_OUI=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
+L_CFLAGS += -DCONFIG_SAE
+OBJS += src/common/sae.c
+ifdef CONFIG_SAE_PK
+L_CFLAGS += -DCONFIG_SAE_PK
+OBJS += src/common/sae_pk.c
+endif
+NEED_ECC=y
+NEED_DH_GROUPS=y
+NEED_HMAC_SHA256_KDF=y
+NEED_DRAGONFLY=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_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 -DCONFIG_WNM_AP
+OBJS += src/ap/wnm_ap.c
+endif
+
+ifdef CONFIG_IEEE80211AC
+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
+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
+
+ifdef CONFIG_WEP
+L_CFLAGS += -DCONFIG_WEP
+endif
+
+ifdef CONFIG_NO_TKIP
+L_CFLAGS += -DCONFIG_NO_TKIP
+endif
+
+
+include $(LOCAL_PATH)/src/drivers/drivers.mk
+
+OBJS += $(DRV_AP_OBJS)
+L_CFLAGS += $(DRV_AP_CFLAGS)
+LDFLAGS += $(DRV_AP_LDFLAGS)
+LIBS += $(DRV_AP_LIBS)
+
+ifdef CONFIG_L2_PACKET
+ifdef CONFIG_DNET_PCAP
+ifdef CONFIG_L2_FREEBSD
+LIBS += -lpcap
+OBJS += src/l2_packet/l2_packet_freebsd.c
+else
+LIBS += -ldnet -lpcap
+OBJS += src/l2_packet/l2_packet_pcap.c
+endif
+else
+OBJS += src/l2_packet/l2_packet_linux.c
+endif
+else
+OBJS += src/l2_packet/l2_packet_none.c
+endif
+
+
+ifdef CONFIG_EAP_MD5
+L_CFLAGS += -DEAP_SERVER_MD5
+OBJS += src/eap_server/eap_server_md5.c
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_TLS
+L_CFLAGS += -DEAP_SERVER_TLS
+OBJS += src/eap_server/eap_server_tls.c
+TLS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_UNAUTH_TLS
+L_CFLAGS += -DEAP_SERVER_UNAUTH_TLS
+ifndef CONFIG_EAP_TLS
+OBJS += src/eap_server/eap_server_tls.c
+TLS_FUNCS=y
+endif
+endif
+
+ifdef CONFIG_EAP_PEAP
+L_CFLAGS += -DEAP_SERVER_PEAP
+OBJS += src/eap_server/eap_server_peap.c
+OBJS += src/eap_common/eap_peap_common.c
+TLS_FUNCS=y
+CONFIG_EAP_MSCHAPV2=y
+endif
+
+ifdef CONFIG_EAP_TTLS
+L_CFLAGS += -DEAP_SERVER_TTLS
+OBJS += src/eap_server/eap_server_ttls.c
+TLS_FUNCS=y
+CHAP=y
+endif
+
+ifdef CONFIG_EAP_MSCHAPV2
+L_CFLAGS += -DEAP_SERVER_MSCHAPV2
+OBJS += src/eap_server/eap_server_mschapv2.c
+MS_FUNCS=y
+endif
+
+ifdef CONFIG_EAP_GTC
+L_CFLAGS += -DEAP_SERVER_GTC
+OBJS += src/eap_server/eap_server_gtc.c
+endif
+
+ifdef CONFIG_EAP_SIM
+L_CFLAGS += -DEAP_SERVER_SIM
+OBJS += src/eap_server/eap_server_sim.c
+CONFIG_EAP_SIM_COMMON=y
+NEED_AES_CBC=y
+endif
+
+ifdef CONFIG_EAP_AKA
+L_CFLAGS += -DEAP_SERVER_AKA
+OBJS += src/eap_server/eap_server_aka.c
+CONFIG_EAP_SIM_COMMON=y
+NEED_AES_CBC=y
+endif
+
+ifdef CONFIG_EAP_AKA_PRIME
+L_CFLAGS += -DEAP_SERVER_AKA_PRIME
+endif
+
+ifdef CONFIG_EAP_SIM_COMMON
+OBJS += src/eap_common/eap_sim_common.c
+# Example EAP-SIM/AKA interface for GSM/UMTS authentication. This can be
+# replaced with another file implementing the interface specified in
+# eap_sim_db.h.
+OBJS += src/eap_server/eap_sim_db.c
+NEED_FIPS186_2_PRF=y
+endif
+
+ifdef CONFIG_EAP_PAX
+L_CFLAGS += -DEAP_SERVER_PAX
+OBJS += src/eap_server/eap_server_pax.c src/eap_common/eap_pax_common.c
+endif
+
+ifdef CONFIG_EAP_PSK
+L_CFLAGS += -DEAP_SERVER_PSK
+OBJS += src/eap_server/eap_server_psk.c src/eap_common/eap_psk_common.c
+NEED_AES_ENCBLOCK=y
+NEED_AES_EAX=y
+endif
+
*** 156373 LINES SKIPPED ***