git: b51f459a2098 - main - wpa: Import wpa_supplicant/hostapd commit f91680c15
Cy Schubert
cy at FreeBSD.org
Sat Apr 17 14:28:23 UTC 2021
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=b51f459a2098622c31ed54f5c1bf0e03efce403b
commit b51f459a2098622c31ed54f5c1bf0e03efce403b
Merge: 13c4641188d4 efec8223892b
Author: Cy Schubert <cy at FreeBSD.org>
AuthorDate: 2021-04-17 14:21:12 +0000
Commit: Cy Schubert <cy at FreeBSD.org>
CommitDate: 2021-04-17 14:21:12 +0000
wpa: Import wpa_supplicant/hostapd commit f91680c15
This is the April update to vendor/wpa committed upstream
2021/04/07.
This is MFV efec8223892b3e677acb46eae84ec3534989971f.
Suggested by: philip
Reviewed by: philip
MFC after: 2 months
Differential Revision: https://reviews.freebsd.org/D29744
contrib/wpa/.gitignore | 8 +
contrib/wpa/Android.mk | 10 +
contrib/wpa/build_release | 47 +
contrib/wpa/doc/.gitignore | 14 +
contrib/wpa/doc/Makefile | 42 +
contrib/wpa/doc/code_structure.doxygen | 315 +
contrib/wpa/doc/ctrl_iface.doxygen | 1054 ++
contrib/wpa/doc/dbus.doxygen | 2394 +++++
contrib/wpa/doc/directories.doxygen | 90 +
contrib/wpa/doc/doxygen.conf | 1547 +++
contrib/wpa/doc/driver_wrapper.doxygen | 180 +
contrib/wpa/doc/eap.doxygen | 87 +
contrib/wpa/doc/eap_server.doxygen | 56 +
contrib/wpa/doc/hostapd.fig | 264 +
contrib/wpa/doc/hostapd_ctrl_iface.doxygen | 66 +
contrib/wpa/doc/mainpage.doxygen | 95 +
contrib/wpa/doc/p2p.doxygen | 471 +
contrib/wpa/doc/p2p_arch.dot | 85 +
contrib/wpa/doc/p2p_arch2.dot | 85 +
contrib/wpa/doc/p2p_sm.dot | 62 +
contrib/wpa/doc/porting.doxygen | 209 +
contrib/wpa/doc/testing_tools.doxygen | 201 +
contrib/wpa/doc/wpa_supplicant.fig | 247 +
contrib/wpa/eap_example/.gitignore | 4 +
contrib/wpa/eap_example/Makefile | 119 +
contrib/wpa/eap_example/README | 42 +
contrib/wpa/eap_example/ca.pem | 55 +
contrib/wpa/eap_example/dh.conf | 5 +
contrib/wpa/eap_example/eap_example.c | 47 +
contrib/wpa/eap_example/eap_example_peer.c | 377 +
contrib/wpa/eap_example/eap_example_server.c | 300 +
contrib/wpa/eap_example/server-key.pem | 15 +
contrib/wpa/eap_example/server.key | 16 +
contrib/wpa/eap_example/server.pem | 64 +
contrib/wpa/hostapd/.gitignore | 5 +
contrib/wpa/hostapd/sae_pk_gen.c | 196 +
contrib/wpa/hs20/server/.gitignore | 1 +
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/radius_example/.gitignore | 2 +
contrib/wpa/radius_example/Makefile | 28 +
contrib/wpa/radius_example/README | 35 +
contrib/wpa/radius_example/radius_example.c | 153 +
contrib/wpa/src/build.rules | 109 +
contrib/wpa/src/common/brcm_vendor.h | 156 +
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 | 1794 ++++
contrib/wpa/src/common/ptksa_cache.c | 321 +
contrib/wpa/src/common/ptksa_cache.h | 79 +
contrib/wpa/src/common/sae_pk.c | 884 ++
contrib/wpa/src/crypto/sha384-tlsprf.c | 71 +
contrib/wpa/src/eap_peer/.gitignore | 1 +
contrib/wpa/src/objs.mk | 3 +
contrib/wpa/src/utils/config.c | 97 +
contrib/wpa/src/utils/config.h | 29 +
contrib/wpa/src/utils/ext_password_file.c | 136 +
contrib/wpa/tests/.gitignore | 3 +
contrib/wpa/tests/Makefile | 99 +
contrib/wpa/tests/README | 123 +
contrib/wpa/tests/cipher-and-key-mgmt-testing.txt | 377 +
contrib/wpa/tests/fuzzing/README | 23 +
contrib/wpa/tests/fuzzing/ap-mgmt/.gitignore | 1 +
contrib/wpa/tests/fuzzing/ap-mgmt/Makefile | 44 +
contrib/wpa/tests/fuzzing/ap-mgmt/ap-mgmt.c | 167 +
.../tests/fuzzing/ap-mgmt/corpus/multi-sae-ffc.dat | Bin 0 -> 506 bytes
.../wpa/tests/fuzzing/ap-mgmt/corpus/multi-sae.dat | Bin 0 -> 346 bytes
contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi.dat | Bin 0 -> 246 bytes
contrib/wpa/tests/fuzzing/asn1/.gitignore | 1 +
contrib/wpa/tests/fuzzing/asn1/Makefile | 23 +
contrib/wpa/tests/fuzzing/asn1/asn1.c | 184 +
contrib/wpa/tests/fuzzing/asn1/corpus/ca.der | Bin 0 -> 560 bytes
.../asn1/corpus/ocsp-multi-server-cache.der | Bin 0 -> 346 bytes
contrib/wpa/tests/fuzzing/asn1/corpus/ocsp-req.der | Bin 0 -> 76 bytes
contrib/wpa/tests/fuzzing/build-test.sh | 19 +
contrib/wpa/tests/fuzzing/dpp-uri/.gitignore | 1 +
contrib/wpa/tests/fuzzing/dpp-uri/Makefile | 43 +
contrib/wpa/tests/fuzzing/dpp-uri/corpus/1.dat | 1 +
contrib/wpa/tests/fuzzing/dpp-uri/corpus/2.dat | 1 +
contrib/wpa/tests/fuzzing/dpp-uri/corpus/3.dat | 1 +
contrib/wpa/tests/fuzzing/dpp-uri/dpp-uri.c | 51 +
contrib/wpa/tests/fuzzing/eap-aka-peer/.gitignore | 1 +
contrib/wpa/tests/fuzzing/eap-aka-peer/Makefile | 26 +
.../tests/fuzzing/eap-aka-peer/corpus/server.msg | Bin 0 -> 520 bytes
.../wpa/tests/fuzzing/eap-aka-peer/eap-aka-peer.c | 131 +
.../wpa/tests/fuzzing/eap-mschapv2-peer/.gitignore | 1 +
.../wpa/tests/fuzzing/eap-mschapv2-peer/Makefile | 25 +
.../fuzzing/eap-mschapv2-peer/corpus/server.msg | Bin 0 -> 304 bytes
.../fuzzing/eap-mschapv2-peer/eap-mschapv2-peer.c | 152 +
contrib/wpa/tests/fuzzing/eap-sim-peer/.gitignore | 1 +
contrib/wpa/tests/fuzzing/eap-sim-peer/Makefile | 26 +
.../tests/fuzzing/eap-sim-peer/corpus/server.msg | Bin 0 -> 340 bytes
.../wpa/tests/fuzzing/eap-sim-peer/eap-sim-peer.c | 125 +
.../wpa/tests/fuzzing/eapol-key-auth/.gitignore | 1 +
contrib/wpa/tests/fuzzing/eapol-key-auth/Makefile | 34 +
.../tests/fuzzing/eapol-key-auth/corpus/supp.msg | Bin 0 -> 549 bytes
.../tests/fuzzing/eapol-key-auth/eapol-key-auth.c | 328 +
.../wpa/tests/fuzzing/eapol-key-supp/.gitignore | 1 +
contrib/wpa/tests/fuzzing/eapol-key-supp/Makefile | 30 +
.../tests/fuzzing/eapol-key-supp/corpus/auth.msg | Bin 0 -> 580 bytes
.../tests/fuzzing/eapol-key-supp/eapol-key-supp.c | 331 +
contrib/wpa/tests/fuzzing/eapol-supp/.gitignore | 1 +
contrib/wpa/tests/fuzzing/eapol-supp/Makefile | 28 +
.../fuzzing/eapol-supp/corpus/eap-req-identity.dat | Bin 0 -> 9 bytes
.../fuzzing/eapol-supp/corpus/eap-req-sim.dat | Bin 0 -> 24 bytes
.../fuzzing/eapol-supp/corpus/eapol-key-m1.dat | Bin 0 -> 99 bytes
contrib/wpa/tests/fuzzing/eapol-supp/eapol-supp.c | 198 +
contrib/wpa/tests/fuzzing/fuzzer-common.c | 56 +
contrib/wpa/tests/fuzzing/fuzzer-common.h | 14 +
contrib/wpa/tests/fuzzing/json/.gitignore | 1 +
contrib/wpa/tests/fuzzing/json/Makefile | 23 +
contrib/wpa/tests/fuzzing/json/corpus/1.json | 1 +
contrib/wpa/tests/fuzzing/json/corpus/2.json | 1 +
contrib/wpa/tests/fuzzing/json/corpus/3.json | 1 +
contrib/wpa/tests/fuzzing/json/json.c | 38 +
contrib/wpa/tests/fuzzing/p2p/.gitignore | 1 +
contrib/wpa/tests/fuzzing/p2p/Makefile | 23 +
.../wpa/tests/fuzzing/p2p/corpus/go-neg-req.dat | Bin 0 -> 155 bytes
.../tests/fuzzing/p2p/corpus/invitation-req.dat | Bin 0 -> 123 bytes
.../wpa/tests/fuzzing/p2p/corpus/p2ps-pd-req.dat | Bin 0 -> 189 bytes
.../wpa/tests/fuzzing/p2p/corpus/proberesp-go.dat | Bin 0 -> 306 bytes
contrib/wpa/tests/fuzzing/p2p/corpus/proberesp.dat | Bin 0 -> 209 bytes
contrib/wpa/tests/fuzzing/p2p/p2p.c | 178 +
contrib/wpa/tests/fuzzing/rules.include | 31 +
contrib/wpa/tests/fuzzing/sae/.gitignore | 1 +
contrib/wpa/tests/fuzzing/sae/Makefile | 28 +
.../sae/corpus/sae-commit-h2e-rejected-groups.dat | Bin 0 -> 102 bytes
.../fuzzing/sae/corpus/sae-commit-h2e-token.dat | Bin 0 -> 101 bytes
.../tests/fuzzing/sae/corpus/sae-commit-pw-id.dat | Bin 0 -> 101 bytes
.../tests/fuzzing/sae/corpus/sae-commit-token.dat | Bin 0 -> 130 bytes
.../tests/fuzzing/sae/corpus/sae-commit-valid.dat | Bin 0 -> 98 bytes
contrib/wpa/tests/fuzzing/sae/sae.c | 39 +
contrib/wpa/tests/fuzzing/tls-client/.gitignore | 1 +
contrib/wpa/tests/fuzzing/tls-client/Makefile | 32 +
.../wpa/tests/fuzzing/tls-client/corpus/server.msg | Bin 0 -> 1902 bytes
contrib/wpa/tests/fuzzing/tls-client/tls-client.c | 154 +
contrib/wpa/tests/fuzzing/tls-server/.gitignore | 1 +
contrib/wpa/tests/fuzzing/tls-server/Makefile | 32 +
.../wpa/tests/fuzzing/tls-server/corpus/client.msg | Bin 0 -> 391 bytes
contrib/wpa/tests/fuzzing/tls-server/tls-server.c | 157 +
contrib/wpa/tests/fuzzing/wnm/.gitignore | 1 +
contrib/wpa/tests/fuzzing/wnm/Makefile | 60 +
.../wpa/tests/fuzzing/wnm/corpus/bss-tm-req.dat | Bin 0 -> 31 bytes
.../wpa/tests/fuzzing/wnm/corpus/oss-fuzz-0001.dat | Bin 0 -> 64 bytes
.../wpa/tests/fuzzing/wnm/corpus/oss-fuzz-0002.dat | Bin 0 -> 104 bytes
contrib/wpa/tests/fuzzing/wnm/corpus/wnm-notif.dat | Bin 0 -> 56 bytes
contrib/wpa/tests/fuzzing/wnm/wnm.c | 99 +
contrib/wpa/tests/fuzzing/x509/.gitignore | 1 +
contrib/wpa/tests/fuzzing/x509/Makefile | 27 +
contrib/wpa/tests/fuzzing/x509/corpus/ca.der | Bin 0 -> 560 bytes
.../wpa/tests/fuzzing/x509/corpus/oss-fuzz-15408 | 1 +
contrib/wpa/tests/fuzzing/x509/x509.c | 25 +
contrib/wpa/tests/hwsim/.gitignore | 1 +
contrib/wpa/tests/hwsim/README | 220 +
contrib/wpa/tests/hwsim/auth_serv/as.conf | 27 +
contrib/wpa/tests/hwsim/auth_serv/as2.conf | 24 +
.../tests/hwsim/auth_serv/ca-and-crl-expired.pem | 90 +
contrib/wpa/tests/hwsim/auth_serv/ca-and-crl.pem | 90 +
.../wpa/tests/hwsim/auth_serv/ca-incorrect-key.pem | 28 +
contrib/wpa/tests/hwsim/auth_serv/ca-incorrect.der | Bin 0 -> 902 bytes
contrib/wpa/tests/hwsim/auth_serv/ca-incorrect.pem | 79 +
contrib/wpa/tests/hwsim/auth_serv/ca-key.pem | 28 +
contrib/wpa/tests/hwsim/auth_serv/ca.der | Bin 0 -> 868 bytes
contrib/wpa/tests/hwsim/auth_serv/ca.pem | 79 +
contrib/wpa/tests/hwsim/auth_serv/dh.conf | 8 +
contrib/wpa/tests/hwsim/auth_serv/dh2.conf | 8 +
.../wpa/tests/hwsim/auth_serv/dh_param_3072.pem | 11 +
contrib/wpa/tests/hwsim/auth_serv/dsaparam.pem | 14 +
contrib/wpa/tests/hwsim/auth_serv/eap_user.conf | 167 +
.../wpa/tests/hwsim/auth_serv/eap_user_vlan.conf | 7 +
.../wpa/tests/hwsim/auth_serv/ec-ca-openssl.cnf | 111 +
contrib/wpa/tests/hwsim/auth_serv/ec-ca.key | 8 +
contrib/wpa/tests/hwsim/auth_serv/ec-ca.pem | 13 +
contrib/wpa/tests/hwsim/auth_serv/ec-generate.sh | 53 +
contrib/wpa/tests/hwsim/auth_serv/ec-server.key | 8 +
contrib/wpa/tests/hwsim/auth_serv/ec-server.pem | 53 +
contrib/wpa/tests/hwsim/auth_serv/ec-user.key | 8 +
contrib/wpa/tests/hwsim/auth_serv/ec-user.pem | 52 +
contrib/wpa/tests/hwsim/auth_serv/ec2-ca.key | 9 +
contrib/wpa/tests/hwsim/auth_serv/ec2-ca.pem | 15 +
contrib/wpa/tests/hwsim/auth_serv/ec2-generate.sh | 67 +
contrib/wpa/tests/hwsim/auth_serv/ec2-server.key | 9 +
contrib/wpa/tests/hwsim/auth_serv/ec2-server.pem | 58 +
.../wpa/tests/hwsim/auth_serv/ec2-user-p256.key | 8 +
.../wpa/tests/hwsim/auth_serv/ec2-user-p256.pem | 56 +
contrib/wpa/tests/hwsim/auth_serv/ec2-user.key | 9 +
contrib/wpa/tests/hwsim/auth_serv/ec2-user.pem | 57 +
contrib/wpa/tests/hwsim/auth_serv/hlr_auc_gw.gsm | 17 +
.../tests/hwsim/auth_serv/hlr_auc_gw.milenage_db | 16 +
.../hwsim/auth_serv/iCA-server/ca-and-root.pem | 160 +
.../tests/hwsim/auth_serv/iCA-server/cacert.pem | 81 +
.../wpa/tests/hwsim/auth_serv/iCA-server/careq.pem | 16 +
.../wpa/tests/hwsim/auth_serv/iCA-server/index.txt | 2 +
.../hwsim/auth_serv/iCA-server/index.txt.attr | 1 +
.../hwsim/auth_serv/iCA-server/private/cakey.pem | 28 +
.../wpa/tests/hwsim/auth_serv/iCA-server/serial | 1 +
.../hwsim/auth_serv/iCA-server/server-revoked.key | 28 +
.../hwsim/auth_serv/iCA-server/server-revoked.pem | 86 +
.../hwsim/auth_serv/iCA-server/server-revoked.req | 16 +
.../iCA-server/server-revoked_and_ica.pem | 167 +
.../tests/hwsim/auth_serv/iCA-server/server.key | 28 +
.../tests/hwsim/auth_serv/iCA-server/server.pem | 86 +
.../tests/hwsim/auth_serv/iCA-server/server.req | 16 +
.../hwsim/auth_serv/iCA-server/server_and_ica.pem | 167 +
.../tests/hwsim/auth_serv/iCA-user/ca-and-root.pem | 160 +
.../wpa/tests/hwsim/auth_serv/iCA-user/cacert.pem | 81 +
.../wpa/tests/hwsim/auth_serv/iCA-user/careq.pem | 16 +
.../wpa/tests/hwsim/auth_serv/iCA-user/index.txt | 1 +
.../tests/hwsim/auth_serv/iCA-user/index.txt.attr | 1 +
.../hwsim/auth_serv/iCA-user/private/cakey.pem | 28 +
contrib/wpa/tests/hwsim/auth_serv/iCA-user/serial | 1 +
.../wpa/tests/hwsim/auth_serv/iCA-user/user.key | 28 +
.../wpa/tests/hwsim/auth_serv/iCA-user/user.pem | 85 +
.../wpa/tests/hwsim/auth_serv/iCA-user/user.req | 16 +
.../hwsim/auth_serv/iCA-user/user_and_ica.pem | 166 +
contrib/wpa/tests/hwsim/auth_serv/ica-generate.sh | 87 +
.../wpa/tests/hwsim/auth_serv/index-revoked.txt | 8 +
.../wpa/tests/hwsim/auth_serv/index-unknown.txt | 1 +
contrib/wpa/tests/hwsim/auth_serv/index.txt | 8 +
.../hwsim/auth_serv/ocsp-multi-server-cache.der | Bin 0 -> 493 bytes
contrib/wpa/tests/hwsim/auth_serv/ocsp-req.der | Bin 0 -> 76 bytes
.../wpa/tests/hwsim/auth_serv/ocsp-responder.csr | 16 +
.../wpa/tests/hwsim/auth_serv/ocsp-responder.key | 28 +
.../wpa/tests/hwsim/auth_serv/ocsp-responder.pem | 76 +
.../tests/hwsim/auth_serv/ocsp-server-cache.der | Bin 0 -> 490 bytes
.../hwsim/auth_serv/ocsp-server-cache.der-invalid | Bin 0 -> 343 bytes
contrib/wpa/tests/hwsim/auth_serv/openssl2.cnf | 147 +
.../wpa/tests/hwsim/auth_serv/radius_clients.conf | 1 +
.../tests/hwsim/auth_serv/radius_clients_ipv6.conf | 1 +
.../tests/hwsim/auth_serv/radius_clients_none.conf | 4 +
contrib/wpa/tests/hwsim/auth_serv/rootCA/index.txt | 6 +
.../tests/hwsim/auth_serv/rootCA/index.txt.attr | 1 +
contrib/wpa/tests/hwsim/auth_serv/rootCA/serial | 1 +
contrib/wpa/tests/hwsim/auth_serv/rsa3072-ca.key | 40 +
contrib/wpa/tests/hwsim/auth_serv/rsa3072-ca.pem | 27 +
.../wpa/tests/hwsim/auth_serv/rsa3072-generate.sh | 83 +
.../wpa/tests/hwsim/auth_serv/rsa3072-server.key | 40 +
.../wpa/tests/hwsim/auth_serv/rsa3072-server.pem | 106 +
.../wpa/tests/hwsim/auth_serv/rsa3072-server.req | 22 +
.../tests/hwsim/auth_serv/rsa3072-user-rsa2048.key | 28 +
.../tests/hwsim/auth_serv/rsa3072-user-rsa2048.pem | 96 +
.../tests/hwsim/auth_serv/rsa3072-user-rsa2048.req | 16 +
contrib/wpa/tests/hwsim/auth_serv/rsa3072-user.key | 40 +
contrib/wpa/tests/hwsim/auth_serv/rsa3072-user.pem | 106 +
contrib/wpa/tests/hwsim/auth_serv/rsa3072-user.req | 21 +
.../wpa/tests/hwsim/auth_serv/server-certpol.csr | 22 +
.../wpa/tests/hwsim/auth_serv/server-certpol.key | 40 +
.../wpa/tests/hwsim/auth_serv/server-certpol.pem | 102 +
.../wpa/tests/hwsim/auth_serv/server-certpol2.csr | 22 +
.../wpa/tests/hwsim/auth_serv/server-certpol2.key | 40 +
.../wpa/tests/hwsim/auth_serv/server-certpol2.pem | 102 +
.../hwsim/auth_serv/server-eku-client-server.csr | 16 +
.../hwsim/auth_serv/server-eku-client-server.key | 28 +
.../hwsim/auth_serv/server-eku-client-server.pem | 85 +
.../tests/hwsim/auth_serv/server-eku-client.csr | 16 +
.../tests/hwsim/auth_serv/server-eku-client.key | 28 +
.../tests/hwsim/auth_serv/server-eku-client.pem | 85 +
.../wpa/tests/hwsim/auth_serv/server-expired.csr | 16 +
.../wpa/tests/hwsim/auth_serv/server-expired.key | 28 +
.../wpa/tests/hwsim/auth_serv/server-expired.pem | 85 +
.../wpa/tests/hwsim/auth_serv/server-extra.pkcs12 | Bin 0 -> 3418 bytes
.../tests/hwsim/auth_serv/server-long-duration.csr | 27 +
.../tests/hwsim/auth_serv/server-long-duration.key | 52 +
.../tests/hwsim/auth_serv/server-long-duration.pem | 107 +
.../tests/hwsim/auth_serv/server-no-dnsname.csr | 16 +
.../tests/hwsim/auth_serv/server-no-dnsname.key | 28 +
.../tests/hwsim/auth_serv/server-no-dnsname.pem | 85 +
contrib/wpa/tests/hwsim/auth_serv/server.csr | 16 +
contrib/wpa/tests/hwsim/auth_serv/server.key | 28 +
contrib/wpa/tests/hwsim/auth_serv/server.pem | 87 +
contrib/wpa/tests/hwsim/auth_serv/server.pkcs12 | Bin 0 -> 2549 bytes
.../wpa/tests/hwsim/auth_serv/sha384-server.key | 40 +
.../wpa/tests/hwsim/auth_serv/sha384-server.pem | 115 +
contrib/wpa/tests/hwsim/auth_serv/sha384-user.key | 38 +
contrib/wpa/tests/hwsim/auth_serv/sha384-user.pem | 113 +
contrib/wpa/tests/hwsim/auth_serv/sha512-ca.key | 52 +
contrib/wpa/tests/hwsim/auth_serv/sha512-ca.pem | 32 +
.../wpa/tests/hwsim/auth_serv/sha512-generate.sh | 75 +
.../wpa/tests/hwsim/auth_serv/sha512-server.key | 45 +
.../wpa/tests/hwsim/auth_serv/sha512-server.pem | 120 +
contrib/wpa/tests/hwsim/auth_serv/sha512-user.key | 44 +
contrib/wpa/tests/hwsim/auth_serv/sha512-user.pem | 119 +
contrib/wpa/tests/hwsim/auth_serv/update.sh | 181 +
contrib/wpa/tests/hwsim/auth_serv/user.csr | 16 +
contrib/wpa/tests/hwsim/auth_serv/user.key | 28 +
contrib/wpa/tests/hwsim/auth_serv/user.key.pkcs8 | 30 +
.../tests/hwsim/auth_serv/user.key.pkcs8.pkcs5v15 | 29 +
contrib/wpa/tests/hwsim/auth_serv/user.pem | 85 +
contrib/wpa/tests/hwsim/auth_serv/user.pkcs12 | Bin 0 -> 2517 bytes
contrib/wpa/tests/hwsim/auth_serv/user.rsa-key | 27 +
contrib/wpa/tests/hwsim/auth_serv/user2.pkcs12 | Bin 0 -> 3558 bytes
contrib/wpa/tests/hwsim/auth_serv/user3.pkcs12 | Bin 0 -> 3524 bytes
contrib/wpa/tests/hwsim/build.sh | 83 +
contrib/wpa/tests/hwsim/check_kernel.py | 31 +
contrib/wpa/tests/hwsim/devdetail.xml | 47 +
contrib/wpa/tests/hwsim/devinfo.xml | 7 +
contrib/wpa/tests/hwsim/dictionary.radius | 20 +
contrib/wpa/tests/hwsim/example-hostapd.config | 116 +
contrib/wpa/tests/hwsim/example-setup.txt | 191 +
.../wpa/tests/hwsim/example-wpa_supplicant.config | 160 +
contrib/wpa/tests/hwsim/fst_module_aux.py | 832 ++
contrib/wpa/tests/hwsim/fst_test_common.py | 97 +
contrib/wpa/tests/hwsim/hostapd.py | 882 ++
contrib/wpa/tests/hwsim/hostapd.vlan | 2 +
contrib/wpa/tests/hwsim/hostapd.vlan2 | 3 +
contrib/wpa/tests/hwsim/hostapd.wlan3.vlan | 2 +
contrib/wpa/tests/hwsim/hostapd.wlan4.vlan | 2 +
contrib/wpa/tests/hwsim/hostapd.wpa_psk | 5 +
contrib/wpa/tests/hwsim/hwsim.py | 114 +
contrib/wpa/tests/hwsim/hwsim_utils.py | 246 +
contrib/wpa/tests/hwsim/multi-bss-acs.conf | 28 +
.../tests/hwsim/multi-bss-iface-per_sta_vif.conf | 42 +
contrib/wpa/tests/hwsim/multi-bss-iface.conf | 40 +
contrib/wpa/tests/hwsim/multi-bss.conf | 21 +
contrib/wpa/tests/hwsim/netlink.py | 237 +
contrib/wpa/tests/hwsim/nl80211.py | 357 +
contrib/wpa/tests/hwsim/owe-bss-1.conf | 12 +
contrib/wpa/tests/hwsim/owe-bss-2.conf | 16 +
contrib/wpa/tests/hwsim/p2p0.conf | 3 +
contrib/wpa/tests/hwsim/p2p1.conf | 3 +
contrib/wpa/tests/hwsim/p2p2.conf | 3 +
contrib/wpa/tests/hwsim/p2p_utils.py | 394 +
contrib/wpa/tests/hwsim/pps-mo-1.xml | 62 +
contrib/wpa/tests/hwsim/radius_das.py | 47 +
contrib/wpa/tests/hwsim/remotehost.py | 258 +
contrib/wpa/tests/hwsim/rfkill.py | 152 +
contrib/wpa/tests/hwsim/run-all.sh | 162 +
contrib/wpa/tests/hwsim/run-tests.py | 692 ++
contrib/wpa/tests/hwsim/start.sh | 213 +
contrib/wpa/tests/hwsim/stop.sh | 80 +
contrib/wpa/tests/hwsim/test_ap_acs.py | 688 ++
contrib/wpa/tests/hwsim/test_ap_ciphers.py | 1200 +++
contrib/wpa/tests/hwsim/test_ap_config.py | 581 +
contrib/wpa/tests/hwsim/test_ap_csa.py | 189 +
contrib/wpa/tests/hwsim/test_ap_dynamic.py | 586 +
contrib/wpa/tests/hwsim/test_ap_eap.py | 7492 +++++++++++++
contrib/wpa/tests/hwsim/test_ap_ft.py | 3461 ++++++
contrib/wpa/tests/hwsim/test_ap_hs20.py | 6496 ++++++++++++
contrib/wpa/tests/hwsim/test_ap_ht.py | 1644 +++
contrib/wpa/tests/hwsim/test_ap_mixed.py | 101 +
contrib/wpa/tests/hwsim/test_ap_open.py | 1017 ++
contrib/wpa/tests/hwsim/test_ap_params.py | 972 ++
contrib/wpa/tests/hwsim/test_ap_pmf.py | 1204 +++
contrib/wpa/tests/hwsim/test_ap_psk.py | 3553 +++++++
contrib/wpa/tests/hwsim/test_ap_qosmap.py | 169 +
contrib/wpa/tests/hwsim/test_ap_roam.py | 395 +
contrib/wpa/tests/hwsim/test_ap_tdls.py | 652 ++
contrib/wpa/tests/hwsim/test_ap_track.py | 437 +
contrib/wpa/tests/hwsim/test_ap_vht.py | 1333 +++
contrib/wpa/tests/hwsim/test_ap_vlan.py | 807 ++
contrib/wpa/tests/hwsim/test_ap_wps.py | 10568 +++++++++++++++++++
contrib/wpa/tests/hwsim/test_authsrv.py | 262 +
contrib/wpa/tests/hwsim/test_autoscan.py | 81 +
contrib/wpa/tests/hwsim/test_bgscan.py | 315 +
contrib/wpa/tests/hwsim/test_cert_check.py | 312 +
contrib/wpa/tests/hwsim/test_cfg80211.py | 150 +
contrib/wpa/tests/hwsim/test_connect_cmd.py | 235 +
contrib/wpa/tests/hwsim/test_dbus.py | 6093 +++++++++++
contrib/wpa/tests/hwsim/test_dfs.py | 767 ++
contrib/wpa/tests/hwsim/test_dpp.py | 6874 ++++++++++++
contrib/wpa/tests/hwsim/test_eap.py | 602 ++
contrib/wpa/tests/hwsim/test_eap_proto.py | 10377 ++++++++++++++++++
contrib/wpa/tests/hwsim/test_erp.py | 741 ++
contrib/wpa/tests/hwsim/test_ext_password.py | 112 +
contrib/wpa/tests/hwsim/test_fils.py | 2411 +++++
contrib/wpa/tests/hwsim/test_fst_config.py | 553 +
contrib/wpa/tests/hwsim/test_fst_module.py | 2825 +++++
contrib/wpa/tests/hwsim/test_gas.py | 2053 ++++
contrib/wpa/tests/hwsim/test_hapd_ctrl.py | 1071 ++
contrib/wpa/tests/hwsim/test_he.py | 1188 +++
contrib/wpa/tests/hwsim/test_hostapd_oom.py | 173 +
contrib/wpa/tests/hwsim/test_hs20_filter.py | 205 +
contrib/wpa/tests/hwsim/test_hs20_pps_mo.py | 43 +
contrib/wpa/tests/hwsim/test_ibss.py | 601 ++
contrib/wpa/tests/hwsim/test_ieee8021x.py | 531 +
contrib/wpa/tests/hwsim/test_kernel.py | 128 +
contrib/wpa/tests/hwsim/test_macsec.py | 890 ++
contrib/wpa/tests/hwsim/test_mbo.py | 613 ++
contrib/wpa/tests/hwsim/test_module_tests.py | 28 +
contrib/wpa/tests/hwsim/test_monitor_interface.py | 94 +
contrib/wpa/tests/hwsim/test_mscs.py | 231 +
contrib/wpa/tests/hwsim/test_multi_ap.py | 363 +
contrib/wpa/tests/hwsim/test_nfc_p2p.py | 848 ++
contrib/wpa/tests/hwsim/test_nfc_wps.py | 709 ++
contrib/wpa/tests/hwsim/test_oce.py | 185 +
contrib/wpa/tests/hwsim/test_ocv.py | 1247 +++
contrib/wpa/tests/hwsim/test_offchannel_tx.py | 50 +
contrib/wpa/tests/hwsim/test_owe.py | 928 ++
contrib/wpa/tests/hwsim/test_p2p_autogo.py | 936 ++
contrib/wpa/tests/hwsim/test_p2p_channel.py | 1384 +++
contrib/wpa/tests/hwsim/test_p2p_concurrency.py | 286 +
contrib/wpa/tests/hwsim/test_p2p_device.py | 552 +
contrib/wpa/tests/hwsim/test_p2p_discovery.py | 871 ++
contrib/wpa/tests/hwsim/test_p2p_ext.py | 384 +
contrib/wpa/tests/hwsim/test_p2p_grpform.py | 1185 +++
contrib/wpa/tests/hwsim/test_p2p_invitation.py | 195 +
contrib/wpa/tests/hwsim/test_p2p_messages.py | 2143 ++++
contrib/wpa/tests/hwsim/test_p2p_persistent.py | 676 ++
contrib/wpa/tests/hwsim/test_p2p_service.py | 586 +
contrib/wpa/tests/hwsim/test_p2p_set.py | 128 +
contrib/wpa/tests/hwsim/test_p2p_wifi_display.py | 475 +
contrib/wpa/tests/hwsim/test_p2ps.py | 1689 +++
contrib/wpa/tests/hwsim/test_pasn.py | 850 ++
contrib/wpa/tests/hwsim/test_pmksa_cache.py | 1267 +++
contrib/wpa/tests/hwsim/test_radio_work.py | 133 +
contrib/wpa/tests/hwsim/test_radius.py | 1710 +++
contrib/wpa/tests/hwsim/test_rfkill.py | 242 +
contrib/wpa/tests/hwsim/test_rrm.py | 2142 ++++
contrib/wpa/tests/hwsim/test_sae.py | 2722 +++++
contrib/wpa/tests/hwsim/test_sae_pk.py | 462 +
contrib/wpa/tests/hwsim/test_scan.py | 2025 ++++
contrib/wpa/tests/hwsim/test_sigma_dut.py | 5264 +++++++++
contrib/wpa/tests/hwsim/test_ssid.py | 127 +
contrib/wpa/tests/hwsim/test_sta_dynamic.py | 329 +
contrib/wpa/tests/hwsim/test_suite_b.py | 739 ++
contrib/wpa/tests/hwsim/test_tnc.py | 194 +
contrib/wpa/tests/hwsim/test_wep.py | 172 +
contrib/wpa/tests/hwsim/test_wext.py | 254 +
contrib/wpa/tests/hwsim/test_wmediumd.py | 480 +
contrib/wpa/tests/hwsim/test_wnm.py | 1984 ++++
contrib/wpa/tests/hwsim/test_wpas_ap.py | 905 ++
contrib/wpa/tests/hwsim/test_wpas_config.py | 656 ++
contrib/wpa/tests/hwsim/test_wpas_ctrl.py | 2159 ++++
contrib/wpa/tests/hwsim/test_wpas_mesh.py | 2534 +++++
contrib/wpa/tests/hwsim/test_wpas_wmm_ac.py | 400 +
contrib/wpa/tests/hwsim/tnc/.gitignore | 4 +
contrib/wpa/tests/hwsim/tnc/Makefile | 23 +
contrib/wpa/tests/hwsim/tnc/hostap2_imc.c | 183 +
contrib/wpa/tests/hwsim/tnc/hostap2_imv.c | 203 +
contrib/wpa/tests/hwsim/tnc/hostap_imc.c | 72 +
contrib/wpa/tests/hwsim/tnc/hostap_imv.c | 66 +
contrib/wpa/tests/hwsim/tnc/tnc_config | 4 +
contrib/wpa/tests/hwsim/tshark.py | 124 +
contrib/wpa/tests/hwsim/utils.py | 314 +
contrib/wpa/tests/hwsim/vm/.gitignore | 1 +
contrib/wpa/tests/hwsim/vm/README | 80 +
contrib/wpa/tests/hwsim/vm/bisect-run.sh | 43 +
contrib/wpa/tests/hwsim/vm/build-codecov.sh | 57 +
contrib/wpa/tests/hwsim/vm/combine-codecov.sh | 39 +
contrib/wpa/tests/hwsim/vm/dbus.conf | 34 +
contrib/wpa/tests/hwsim/vm/example-vm-setup.txt | 95 +
contrib/wpa/tests/hwsim/vm/inside.sh | 169 +
contrib/wpa/tests/hwsim/vm/kernel-config | 175 +
contrib/wpa/tests/hwsim/vm/kernel-config.uml | 131 +
contrib/wpa/tests/hwsim/vm/parallel-vm.py | 669 ++
contrib/wpa/tests/hwsim/vm/process-codecov.sh | 36 +
contrib/wpa/tests/hwsim/vm/uevent.sh | 9 +
contrib/wpa/tests/hwsim/vm/vm-run.sh | 202 +
contrib/wpa/tests/hwsim/w1fi_logo.png | Bin 0 -> 7549 bytes
contrib/wpa/tests/hwsim/wlantest.py | 277 +
contrib/wpa/tests/hwsim/wpasupplicant.py | 1649 +++
contrib/wpa/tests/hwsim/wps-ctrl-cred | Bin 0 -> 67 bytes
contrib/wpa/tests/hwsim/wps-ctrl-cred2 | Bin 0 -> 59 bytes
contrib/wpa/tests/hwsim/wps-mixed-cred | Bin 0 -> 112 bytes
contrib/wpa/tests/hwsim/wps-wep-cred | Bin 0 -> 53 bytes
contrib/wpa/tests/remote/config.py | 87 +
contrib/wpa/tests/remote/hwsim_wrapper.py | 126 +
contrib/wpa/tests/remote/monitor.py | 193 +
contrib/wpa/tests/remote/run-tests.py | 408 +
contrib/wpa/tests/remote/rutils.py | 567 +
contrib/wpa/tests/remote/test_devices.py | 124 +
contrib/wpa/tests/remote/test_example.py | 141 +
contrib/wpa/tests/remote/test_monitor.py | 52 +
contrib/wpa/tests/test-aes.c | 624 ++
contrib/wpa/tests/test-base64.c | 42 +
contrib/wpa/tests/test-https.c | 225 +
contrib/wpa/tests/test-https_server.c | 275 +
contrib/wpa/tests/test-list.c | 72 +
contrib/wpa/tests/test-md4.c | 93 +
contrib/wpa/tests/test-milenage.c | 814 ++
contrib/wpa/tests/test-rc4.c | 250 +
contrib/wpa/tests/test-rsa-sig-ver.c | 206 +
contrib/wpa/tests/test-sha1.c | 119 +
contrib/wpa/tests/test-sha256.c | 119 +
contrib/wpa/tests/test-x509v3.c | 62 +
contrib/wpa/tests/test_x509v3_nist.sh | 144 +
contrib/wpa/tests/test_x509v3_nist2.sh | 177 +
contrib/wpa/wlantest/.gitignore | 4 +
contrib/wpa/wlantest/Makefile | 87 +
contrib/wpa/wlantest/bip.c | 133 +
contrib/wpa/wlantest/bss.c | 373 +
contrib/wpa/wlantest/ccmp.c | 367 +
contrib/wpa/wlantest/ctrl.c | 1471 +++
contrib/wpa/wlantest/gcmp.c | 160 +
contrib/wpa/wlantest/inject.c | 341 +
contrib/wpa/wlantest/monitor.c | 172 +
contrib/wpa/wlantest/process.c | 409 +
contrib/wpa/wlantest/readpcap.c | 190 +
contrib/wpa/wlantest/rx_data.c | 904 ++
contrib/wpa/wlantest/rx_eapol.c | 1317 +++
contrib/wpa/wlantest/rx_ip.c | 184 +
contrib/wpa/wlantest/rx_mgmt.c | 2642 +++++
contrib/wpa/wlantest/rx_tdls.c | 618 ++
contrib/wpa/wlantest/sta.c | 232 +
contrib/wpa/wlantest/test_vectors.c | 937 ++
contrib/wpa/wlantest/tkip.c | 428 +
contrib/wpa/wlantest/wep.c | 104 +
contrib/wpa/wlantest/wired.c | 295 +
contrib/wpa/wlantest/wlantest.c | 505 +
contrib/wpa/wlantest/wlantest.h | 336 +
contrib/wpa/wlantest/wlantest_cli.c | 1865 ++++
contrib/wpa/wlantest/wlantest_ctrl.h | 171 +
contrib/wpa/wlantest/writepcap.c | 373 +
contrib/wpa/wpa_supplicant/bssid_ignore.c | 221 +
contrib/wpa/wpa_supplicant/bssid_ignore.h | 33 +
contrib/wpa/wpa_supplicant/examples/dpp-nfc.py | 1186 +++
contrib/wpa/wpa_supplicant/pasn_supplicant.c | 1710 +++
contrib/wpa/wpa_supplicant/robust_av.c | 155 +
contrib/wpa/wpa_supplicant/twt.c | 142 +
.../wpa_supplicant/wpa_gui-qt4/icons/.gitignore | 2 +
contrib/wpa/wpadebug/.gitignore | 4 +
contrib/wpa/wpadebug/AndroidManifest.xml | 86 +
contrib/wpa/wpadebug/README | 78 +
contrib/wpa/wpadebug/build.xml | 17 +
contrib/wpa/wpadebug/project.properties | 2 +
contrib/wpa/wpadebug/res/layout/cred_edit.xml | 117 +
contrib/wpa/wpadebug/res/layout/input_uri.xml | 26 +
contrib/wpa/wpadebug/res/layout/main.xml | 160 +
contrib/wpa/wpadebug/res/layout/qrcode.xml | 13 +
contrib/wpa/wpadebug/res/raw/shell_commands.txt | 2 +
contrib/wpa/wpadebug/res/raw/wpa_commands.txt | 9 +
.../src/w1/fi/wpadebug/CommandListActivity.java | 130 +
.../src/w1/fi/wpadebug/DisplayMessageActivity.java | 49 +
.../wpa/wpadebug/src/w1/fi/wpadebug/InputUri.java | 108 +
.../wpadebug/src/w1/fi/wpadebug/MainActivity.java | 209 +
.../src/w1/fi/wpadebug/QrCodeDisplayActivity.java | 109 +
.../src/w1/fi/wpadebug/QrCodeReadActivity.java | 40 +
.../src/w1/fi/wpadebug/QrCodeScannerActivity.java | 82 +
.../wpadebug/src/w1/fi/wpadebug/WifiReceiver.java | 95 +
.../src/w1/fi/wpadebug/WpaCommandListActivity.java | 112 +
.../src/w1/fi/wpadebug/WpaCredActivity.java | 263 +
.../src/w1/fi/wpadebug/WpaCredEditActivity.java | 55 +
.../src/w1/fi/wpadebug/WpaNfcActivity.java | 131 +
.../src/w1/fi/wpadebug/WpaWebViewActivity.java | 146 +
contrib/wpa/wpaspy/Makefile | 15 +
contrib/wpa/wpaspy/setup.py | 22 +
contrib/wpa/wpaspy/test.py | 82 +
contrib/wpa/wpaspy/wpaspy.c | 245 +
contrib/wpa/wpaspy/wpaspy.py | 149 +
sys/dev/netmap/netmap.c | 32 +-
sys/dev/netmap/netmap_kern.h | 10 +
576 files changed, 200752 insertions(+), 30 deletions(-)
diff --cc contrib/wpa/.gitignore
index 000000000000,000000000000..b064303ced30
new file mode 100644
--- /dev/null
+++ b/contrib/wpa/.gitignore
@@@ -1,0 -1,0 +1,8 @@@
++*.pyc
++*~
++tests/hwsim/logs
++tests/remote/logs
++wpaspy/build
++**/parallel-vm.log
++tags
++build/
diff --cc contrib/wpa/Android.mk
index 000000000000,bd7a4097444b..bd7a4097444b
mode 000000,100644..100644
--- a/contrib/wpa/Android.mk
+++ b/contrib/wpa/Android.mk
diff --cc contrib/wpa/build_release
index 000000000000,3aa9bf31963a..3aa9bf31963a
mode 000000,100755..100755
--- a/contrib/wpa/build_release
+++ b/contrib/wpa/build_release
diff --cc contrib/wpa/doc/.gitignore
index 000000000000,28c3fe4e99c3..28c3fe4e99c3
mode 000000,100644..100644
--- a/contrib/wpa/doc/.gitignore
+++ b/contrib/wpa/doc/.gitignore
diff --cc contrib/wpa/doc/Makefile
index 000000000000,62af04a74f1f..62af04a74f1f
mode 000000,100644..100644
--- a/contrib/wpa/doc/Makefile
+++ b/contrib/wpa/doc/Makefile
diff --cc contrib/wpa/doc/code_structure.doxygen
index 000000000000,454f179753d3..454f179753d3
mode 000000,100644..100644
--- a/contrib/wpa/doc/code_structure.doxygen
+++ b/contrib/wpa/doc/code_structure.doxygen
diff --cc contrib/wpa/doc/ctrl_iface.doxygen
index 000000000000,7dccdc797ef3..7dccdc797ef3
mode 000000,100644..100644
--- a/contrib/wpa/doc/ctrl_iface.doxygen
+++ b/contrib/wpa/doc/ctrl_iface.doxygen
diff --cc contrib/wpa/doc/dbus.doxygen
index 000000000000,8231aac41805..8231aac41805
mode 000000,100644..100644
--- a/contrib/wpa/doc/dbus.doxygen
+++ b/contrib/wpa/doc/dbus.doxygen
diff --cc contrib/wpa/doc/directories.doxygen
index 000000000000,15e5bdae463c..15e5bdae463c
mode 000000,100644..100644
--- a/contrib/wpa/doc/directories.doxygen
+++ b/contrib/wpa/doc/directories.doxygen
diff --cc contrib/wpa/doc/doxygen.conf
index 000000000000,3f01173930c4..3f01173930c4
mode 000000,100644..100644
--- a/contrib/wpa/doc/doxygen.conf
+++ b/contrib/wpa/doc/doxygen.conf
diff --cc contrib/wpa/doc/driver_wrapper.doxygen
index 000000000000,66211b3abdfb..66211b3abdfb
mode 000000,100644..100644
--- a/contrib/wpa/doc/driver_wrapper.doxygen
+++ b/contrib/wpa/doc/driver_wrapper.doxygen
diff --cc contrib/wpa/doc/eap.doxygen
index 000000000000,472e882004d3..472e882004d3
mode 000000,100644..100644
--- a/contrib/wpa/doc/eap.doxygen
+++ b/contrib/wpa/doc/eap.doxygen
diff --cc contrib/wpa/doc/eap_server.doxygen
index 000000000000,f60ac79b1e01..f60ac79b1e01
mode 000000,100644..100644
--- a/contrib/wpa/doc/eap_server.doxygen
+++ b/contrib/wpa/doc/eap_server.doxygen
diff --cc contrib/wpa/doc/hostapd.fig
index 000000000000,ea4ab3a2894e..ea4ab3a2894e
mode 000000,100644..100644
--- a/contrib/wpa/doc/hostapd.fig
+++ b/contrib/wpa/doc/hostapd.fig
diff --cc contrib/wpa/doc/hostapd_ctrl_iface.doxygen
index 000000000000,4d2bac82c43f..4d2bac82c43f
mode 000000,100644..100644
--- a/contrib/wpa/doc/hostapd_ctrl_iface.doxygen
+++ b/contrib/wpa/doc/hostapd_ctrl_iface.doxygen
diff --cc contrib/wpa/doc/mainpage.doxygen
index 000000000000,329afea3fa6a..329afea3fa6a
mode 000000,100644..100644
--- a/contrib/wpa/doc/mainpage.doxygen
+++ b/contrib/wpa/doc/mainpage.doxygen
diff --cc contrib/wpa/doc/p2p.doxygen
index 000000000000,d4d86e3edfa2..d4d86e3edfa2
mode 000000,100644..100644
--- a/contrib/wpa/doc/p2p.doxygen
+++ b/contrib/wpa/doc/p2p.doxygen
diff --cc contrib/wpa/doc/p2p_arch.dot
index 000000000000,27ae0e2509d4..27ae0e2509d4
mode 000000,100644..100644
--- a/contrib/wpa/doc/p2p_arch.dot
+++ b/contrib/wpa/doc/p2p_arch.dot
diff --cc contrib/wpa/doc/p2p_arch2.dot
index 000000000000,9c7b4b57a17f..9c7b4b57a17f
mode 000000,100644..100644
--- a/contrib/wpa/doc/p2p_arch2.dot
+++ b/contrib/wpa/doc/p2p_arch2.dot
diff --cc contrib/wpa/doc/p2p_sm.dot
index 000000000000,640caefcc6ad..640caefcc6ad
mode 000000,100644..100644
--- a/contrib/wpa/doc/p2p_sm.dot
+++ b/contrib/wpa/doc/p2p_sm.dot
diff --cc contrib/wpa/doc/porting.doxygen
index 000000000000,b4b78ef0504a..b4b78ef0504a
mode 000000,100644..100644
--- a/contrib/wpa/doc/porting.doxygen
+++ b/contrib/wpa/doc/porting.doxygen
diff --cc contrib/wpa/doc/testing_tools.doxygen
index 000000000000,d12652415634..d12652415634
mode 000000,100644..100644
--- a/contrib/wpa/doc/testing_tools.doxygen
+++ b/contrib/wpa/doc/testing_tools.doxygen
diff --cc contrib/wpa/doc/wpa_supplicant.fig
index 000000000000,d2c4306b8e03..d2c4306b8e03
mode 000000,100644..100644
--- a/contrib/wpa/doc/wpa_supplicant.fig
+++ b/contrib/wpa/doc/wpa_supplicant.fig
diff --cc contrib/wpa/eap_example/.gitignore
index 000000000000,4d6d2d1301b2..4d6d2d1301b2
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/.gitignore
+++ b/contrib/wpa/eap_example/.gitignore
diff --cc contrib/wpa/eap_example/Makefile
index 000000000000,691466f03c9a..691466f03c9a
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/Makefile
+++ b/contrib/wpa/eap_example/Makefile
diff --cc contrib/wpa/eap_example/README
index 000000000000,0c2921e3be93..0c2921e3be93
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/README
+++ b/contrib/wpa/eap_example/README
diff --cc contrib/wpa/eap_example/ca.pem
index 000000000000,b128893a1e7b..b128893a1e7b
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/ca.pem
+++ b/contrib/wpa/eap_example/ca.pem
diff --cc contrib/wpa/eap_example/dh.conf
index 000000000000,7bc83251c592..7bc83251c592
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/dh.conf
+++ b/contrib/wpa/eap_example/dh.conf
diff --cc contrib/wpa/eap_example/eap_example.c
index 000000000000,8a48cd34b030..8a48cd34b030
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/eap_example.c
+++ b/contrib/wpa/eap_example/eap_example.c
diff --cc contrib/wpa/eap_example/eap_example_peer.c
index 000000000000,5fe0cb7fa7f6..5fe0cb7fa7f6
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/eap_example_peer.c
+++ b/contrib/wpa/eap_example/eap_example_peer.c
diff --cc contrib/wpa/eap_example/eap_example_server.c
index 000000000000,3a132bb3466e..3a132bb3466e
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/eap_example_server.c
+++ b/contrib/wpa/eap_example/eap_example_server.c
diff --cc contrib/wpa/eap_example/server-key.pem
index 000000000000,0fe2cec47330..0fe2cec47330
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/server-key.pem
+++ b/contrib/wpa/eap_example/server-key.pem
diff --cc contrib/wpa/eap_example/server.key
index 000000000000,1416327bef21..1416327bef21
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/server.key
+++ b/contrib/wpa/eap_example/server.key
diff --cc contrib/wpa/eap_example/server.pem
index 000000000000,93b39b9d5027..93b39b9d5027
mode 000000,100644..100644
--- a/contrib/wpa/eap_example/server.pem
+++ b/contrib/wpa/eap_example/server.pem
diff --cc contrib/wpa/hostapd/.gitignore
index 000000000000,857f3dc4196c..857f3dc4196c
mode 000000,100644..100644
--- a/contrib/wpa/hostapd/.gitignore
+++ b/contrib/wpa/hostapd/.gitignore
diff --cc contrib/wpa/hostapd/sae_pk_gen.c
index 000000000000,c31eff75b538..c31eff75b538
mode 000000,100644..100644
--- a/contrib/wpa/hostapd/sae_pk_gen.c
+++ b/contrib/wpa/hostapd/sae_pk_gen.c
diff --cc contrib/wpa/hs20/server/.gitignore
index 000000000000,fecb096c128a..fecb096c128a
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/.gitignore
+++ b/contrib/wpa/hs20/server/.gitignore
diff --cc contrib/wpa/hs20/server/Makefile
index 000000000000,0cab6d6b010a..0cab6d6b010a
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/Makefile
+++ b/contrib/wpa/hs20/server/Makefile
diff --cc contrib/wpa/hs20/server/ca/clean.sh
index 000000000000,c72dcbda45e9..c72dcbda45e9
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/clean.sh
+++ b/contrib/wpa/hs20/server/ca/clean.sh
diff --cc contrib/wpa/hs20/server/ca/est-csrattrs.cnf
index 000000000000,b50ea00d0b77..b50ea00d0b77
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/ca/est-csrattrs.cnf
+++ b/contrib/wpa/hs20/server/ca/est-csrattrs.cnf
diff --cc contrib/wpa/hs20/server/ca/est-csrattrs.sh
index 000000000000,0b73a0408284..0b73a0408284
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/est-csrattrs.sh
+++ b/contrib/wpa/hs20/server/ca/est-csrattrs.sh
diff --cc contrib/wpa/hs20/server/ca/hs20.oid
index 000000000000,a829ff29bf44..a829ff29bf44
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/ca/hs20.oid
+++ b/contrib/wpa/hs20/server/ca/hs20.oid
diff --cc contrib/wpa/hs20/server/ca/ocsp-req.sh
index 000000000000,931a20696d02..931a20696d02
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/ocsp-req.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-req.sh
diff --cc contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
index 000000000000,116c6e1c3d01..116c6e1c3d01
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
diff --cc contrib/wpa/hs20/server/ca/ocsp-responder.sh
index 000000000000,620947d01af0..620947d01af0
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/ocsp-responder.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-responder.sh
diff --cc contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
index 000000000000,f2b23250cadd..f2b23250cadd
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
diff --cc contrib/wpa/hs20/server/ca/openssl-root.cnf
index 000000000000,5bc50be1dbc9..5bc50be1dbc9
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/ca/openssl-root.cnf
+++ b/contrib/wpa/hs20/server/ca/openssl-root.cnf
diff --cc contrib/wpa/hs20/server/ca/openssl.cnf
index 000000000000,61410138340f..61410138340f
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/ca/openssl.cnf
+++ b/contrib/wpa/hs20/server/ca/openssl.cnf
diff --cc contrib/wpa/hs20/server/ca/setup.sh
index 000000000000,78abcccff455..78abcccff455
mode 000000,100755..100755
--- a/contrib/wpa/hs20/server/ca/setup.sh
+++ b/contrib/wpa/hs20/server/ca/setup.sh
diff --cc contrib/wpa/hs20/server/ca/w1fi_logo.png
index 000000000000,ac7c259fff2e..ac7c259fff2e
mode 000000,100644..100644
Binary files differ
diff --cc contrib/wpa/hs20/server/hs20-osu-server.txt
index 000000000000,22478ad9d2cb..22478ad9d2cb
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/hs20-osu-server.txt
+++ b/contrib/wpa/hs20/server/hs20-osu-server.txt
diff --cc contrib/wpa/hs20/server/hs20_spp_server.c
index 000000000000,347c40a73d6a..347c40a73d6a
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/hs20_spp_server.c
+++ b/contrib/wpa/hs20/server/hs20_spp_server.c
diff --cc contrib/wpa/hs20/server/spp_server.c
index 000000000000,a50e9074f7b4..a50e9074f7b4
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/spp_server.c
+++ b/contrib/wpa/hs20/server/spp_server.c
diff --cc contrib/wpa/hs20/server/spp_server.h
index 000000000000,421974c607b8..421974c607b8
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/spp_server.h
+++ b/contrib/wpa/hs20/server/spp_server.h
diff --cc contrib/wpa/hs20/server/sql-example.txt
index 000000000000,20dcf2f5c688..20dcf2f5c688
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/sql-example.txt
+++ b/contrib/wpa/hs20/server/sql-example.txt
diff --cc contrib/wpa/hs20/server/sql.txt
index 000000000000,2cc6edea4063..2cc6edea4063
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/sql.txt
+++ b/contrib/wpa/hs20/server/sql.txt
diff --cc contrib/wpa/hs20/server/www/add-free.php
index 000000000000,1efc65563274..1efc65563274
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/add-free.php
+++ b/contrib/wpa/hs20/server/www/add-free.php
diff --cc contrib/wpa/hs20/server/www/add-mo.php
index 000000000000,a3b4513531f8..a3b4513531f8
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/add-mo.php
+++ b/contrib/wpa/hs20/server/www/add-mo.php
diff --cc contrib/wpa/hs20/server/www/cert-enroll.php
index 000000000000,f023ca5a5b03..f023ca5a5b03
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/cert-enroll.php
+++ b/contrib/wpa/hs20/server/www/cert-enroll.php
diff --cc contrib/wpa/hs20/server/www/config.php
index 000000000000,4272b102a88c..4272b102a88c
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/config.php
+++ b/contrib/wpa/hs20/server/www/config.php
diff --cc contrib/wpa/hs20/server/www/est.php
index 000000000000,b7fb260d56c4..b7fb260d56c4
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/est.php
+++ b/contrib/wpa/hs20/server/www/est.php
diff --cc contrib/wpa/hs20/server/www/free-remediation.php
index 000000000000,5648b30e8d6b..5648b30e8d6b
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/free-remediation.php
+++ b/contrib/wpa/hs20/server/www/free-remediation.php
diff --cc contrib/wpa/hs20/server/www/free.php
index 000000000000,8195069ed8ff..8195069ed8ff
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/free.php
+++ b/contrib/wpa/hs20/server/www/free.php
diff --cc contrib/wpa/hs20/server/www/redirect.php
index 000000000000,8fc9cd644273..8fc9cd644273
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/redirect.php
+++ b/contrib/wpa/hs20/server/www/redirect.php
diff --cc contrib/wpa/hs20/server/www/remediation-pw.php
index 000000000000,76fdccbdf9f7..76fdccbdf9f7
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/remediation-pw.php
+++ b/contrib/wpa/hs20/server/www/remediation-pw.php
diff --cc contrib/wpa/hs20/server/www/remediation.php
index 000000000000,3628065ac225..3628065ac225
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/remediation.php
+++ b/contrib/wpa/hs20/server/www/remediation.php
diff --cc contrib/wpa/hs20/server/www/signup.php
index 000000000000,80a9d403e8fc..80a9d403e8fc
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/signup.php
+++ b/contrib/wpa/hs20/server/www/signup.php
diff --cc contrib/wpa/hs20/server/www/spp.php
index 000000000000,c56d3d69e0ed..c56d3d69e0ed
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/spp.php
+++ b/contrib/wpa/hs20/server/www/spp.php
diff --cc contrib/wpa/hs20/server/www/terms.php
index 000000000000,acba23ef1ad7..acba23ef1ad7
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/terms.php
+++ b/contrib/wpa/hs20/server/www/terms.php
diff --cc contrib/wpa/hs20/server/www/users.php
index 000000000000,2bd555275dda..2bd555275dda
mode 000000,100644..100644
--- a/contrib/wpa/hs20/server/www/users.php
+++ b/contrib/wpa/hs20/server/www/users.php
diff --cc contrib/wpa/radius_example/.gitignore
index 000000000000,c43e0faab91c..c43e0faab91c
mode 000000,100644..100644
--- a/contrib/wpa/radius_example/.gitignore
+++ b/contrib/wpa/radius_example/.gitignore
diff --cc contrib/wpa/radius_example/Makefile
index 000000000000,d58a82c340c6..d58a82c340c6
mode 000000,100644..100644
--- a/contrib/wpa/radius_example/Makefile
+++ b/contrib/wpa/radius_example/Makefile
diff --cc contrib/wpa/radius_example/README
index 000000000000,ec458e3ad7f5..ec458e3ad7f5
mode 000000,100644..100644
--- a/contrib/wpa/radius_example/README
+++ b/contrib/wpa/radius_example/README
diff --cc contrib/wpa/radius_example/radius_example.c
index 000000000000,8b0f47586b05..8b0f47586b05
mode 000000,100644..100644
--- a/contrib/wpa/radius_example/radius_example.c
+++ b/contrib/wpa/radius_example/radius_example.c
diff --cc contrib/wpa/src/build.rules
index 000000000000,acda8847284d..acda8847284d
mode 000000,100644..100644
--- a/contrib/wpa/src/build.rules
+++ b/contrib/wpa/src/build.rules
diff --cc contrib/wpa/src/common/brcm_vendor.h
index 000000000000,f163dea73768..f163dea73768
mode 000000,100644..100644
*** 9830 LINES SKIPPED ***
More information about the dev-commits-src-all
mailing list