Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Apr 2021 15:48:13 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 0aad5de37cf5 - main - Revert wpa import.
Message-ID:  <202104171548.13HFmD1E076936@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/src/commit/?id=0aad5de37cf518ab1d6cc7bc5d813c41e64ce9b8

commit 0aad5de37cf518ab1d6cc7bc5d813c41e64ce9b8
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2021-04-17 15:44:52 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2021-04-17 15:44:52 +0000

    Revert wpa import.
    
    b51f459a2098622c31ed54f5c1bf0e03efce403b resulted in a mismerge
    due to having to do a remerge because my tree was over a week out of
    date. Changes that were made to fix the build were lost in the remerge
    resulting in build errors that were fixed a week ago.
---
 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/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 -
 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/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 -
 .../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/eap-mschapv2-peer.c  |   152 -
 contrib/wpa/tests/fuzzing/eap-sim-peer/.gitignore  |     1 -
 contrib/wpa/tests/fuzzing/eap-sim-peer/Makefile    |    26 -
 .../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/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/eapol-key-supp.c  |   331 -
 contrib/wpa/tests/fuzzing/eapol-supp/.gitignore    |     1 -
 contrib/wpa/tests/fuzzing/eapol-supp/Makefile      |    28 -
 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 -
 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 -
 contrib/wpa/tests/fuzzing/sae/sae.c                |    39 -
 contrib/wpa/tests/fuzzing/tls-client/.gitignore    |     1 -
 contrib/wpa/tests/fuzzing/tls-client/Makefile      |    32 -
 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 -
 contrib/wpa/tests/fuzzing/tls-server/tls-server.c  |   157 -
 contrib/wpa/tests/fuzzing/wnm/.gitignore           |     1 -
 contrib/wpa/tests/fuzzing/wnm/Makefile             |    60 -
 contrib/wpa/tests/fuzzing/wnm/wnm.c                |    99 -
 contrib/wpa/tests/fuzzing/x509/.gitignore          |     1 -
 contrib/wpa/tests/fuzzing/x509/Makefile            |    27 -
 .../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.pem |    79 -
 contrib/wpa/tests/hwsim/auth_serv/ca-key.pem       |    28 -
 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 -
 .../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 -
 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 -
 .../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 -
 .../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.rsa-key     |    27 -
 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/wlantest.py                |   277 -
 contrib/wpa/tests/hwsim/wpasupplicant.py           |  1649 ---
 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 -
 usr.sbin/wpa/Makefile.inc                          |     1 -
 usr.sbin/wpa/hostapd/Makefile                      |     2 +
 usr.sbin/wpa/hostapd_cli/Makefile                  |     3 +-
 usr.sbin/wpa/wpa_cli/Makefile                      |     9 +-
 usr.sbin/wpa/wpa_passphrase/Makefile               |     3 +-
 usr.sbin/wpa/wpa_priv/Makefile                     |     1 +
 usr.sbin/wpa/wpa_supplicant/Makefile               |    13 +-
 533 files changed, 24 insertions(+), 200748 deletions(-)

diff --git a/contrib/wpa/.gitignore b/contrib/wpa/.gitignore
index b064303ced30..e69de29bb2d1 100644
--- a/contrib/wpa/.gitignore
+++ b/contrib/wpa/.gitignore
@@ -1,8 +0,0 @@
-*.pyc
-*~
-tests/hwsim/logs
-tests/remote/logs
-wpaspy/build
-**/parallel-vm.log
-tags
-build/
diff --git a/contrib/wpa/Android.mk b/contrib/wpa/Android.mk
index bd7a4097444b..e69de29bb2d1 100644
--- a/contrib/wpa/Android.mk
+++ b/contrib/wpa/Android.mk
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-ifneq ($(filter VER_0_8_X VER_2_1_DEVEL,$(WPA_SUPPLICANT_VERSION)),)
-# The order of the 2 Android.mks does matter!
-# TODO: Clean up the Android.mks, reset all the temporary variables at the
-# end of each Android.mk, so that one Android.mk doesn't depend on variables
-# set up in the other Android.mk.
-include $(LOCAL_PATH)/hostapd/Android.mk \
-        $(LOCAL_PATH)/wpa_supplicant/Android.mk
-endif
diff --git a/contrib/wpa/build_release b/contrib/wpa/build_release
index 3aa9bf31963a..e69de29bb2d1 100755
--- a/contrib/wpa/build_release
+++ b/contrib/wpa/build_release
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -z "$1" ]; then
-    echo "build_release <version>"
-    exit 1
-fi
-
-TMP=tmp.build_release
-RELDIR=`pwd`/Release
-VER=$1
-NOW=`date +%Y-%m-%d`
-
-echo "Version: $VER - $NOW"
-
-DATEw=`head -n 3 wpa_supplicant/ChangeLog | tail -n 1 | sed "s/ .*//"`
-DATEh=`head -n 3 hostapd/ChangeLog | tail -n 1 | sed "s/ .*//"`
-
-if [ "$DATEw" != "$NOW" -o "$DATEh" != "$NOW" ]; then
-    echo "NOTE! Date mismatch in ChangeLog: wpa_supplicant $DATEw hostapd $DATEh != $NOW"
-fi
-
-if [ -r $TMP ]; then
-    echo "Temporary directory '$TMP' exists. Remove it before running this."
-    exit 1
-fi
-
-mkdir $TMP
-mkdir -p $RELDIR
-
-git archive --format=tar --prefix=wpa-$VER/ HEAD \
-	README COPYING CONTRIBUTIONS src wpa_supplicant hostapd hs20 |
-	gzip > $RELDIR/wpa-$VER.tar.gz
-git archive --format=tar --prefix=hostapd-$VER/ HEAD \
-	README COPYING CONTRIBUTIONS src hostapd |
-	gzip > $RELDIR/hostapd-$VER.tar.gz
-git archive --format=tar --prefix=wpa_supplicant-$VER/ HEAD \
-	README COPYING CONTRIBUTIONS src wpa_supplicant hs20/client |
-	tar --directory=$TMP -xf -
-
-cd $TMP
-make -C wpa_supplicant-$VER/wpa_supplicant/doc/docbook man
-rm -f wpa_supplicant-$VER/wpa_supplicant/doc/docbook/manpage.{links,refs}
-tar czf $RELDIR/wpa_supplicant-$VER.tar.gz wpa_supplicant-$VER
-cd ..
-rm -r $TMP
diff --git a/contrib/wpa/doc/.gitignore b/contrib/wpa/doc/.gitignore
index 28c3fe4e99c3..e69de29bb2d1 100644
--- a/contrib/wpa/doc/.gitignore
+++ b/contrib/wpa/doc/.gitignore
@@ -1,14 +0,0 @@
-doxygen.warnings
-hostapd.eps
-hostapd.png
-html
-latex
-p2p_arch.eps
-p2p_arch.png
-p2p_arch2.eps
-p2p_arch2.png
-p2p_sm.eps
-p2p_sm.png
-wpa_supplicant.eps
-wpa_supplicant.png
-wpa_supplicant-devel.pdf
diff --git a/contrib/wpa/doc/Makefile b/contrib/wpa/doc/Makefile
index 62af04a74f1f..e69de29bb2d1 100644
--- a/contrib/wpa/doc/Makefile
+++ b/contrib/wpa/doc/Makefile
@@ -1,42 +0,0 @@
-all: docs
-
-%.eps: %.fig
-	fig2dev -L eps $*.fig $*.eps
-
-%.png: %.fig
-	fig2dev -L png -m 3 $*.fig | pngtopnm | pnmscale 0.4 | pnmtopng \
-		> $*.png
-
-%.png: %.dot
-	dot $*.dot -Tpng -o $*.png
-
-%.eps: %.dot
-	dot $*.dot -Tps -o $*.eps
-
-_wpa_supplicant.png: wpa_supplicant.png
-	cp $< $@
-
-_wpa_supplicant.eps: wpa_supplicant.eps
-	cp $< $@
-
-docs-pics: wpa_supplicant.png wpa_supplicant.eps hostapd.png hostapd.eps p2p_sm.png p2p_sm.eps p2p_arch.png p2p_arch.eps p2p_arch2.png p2p_arch2.eps _wpa_supplicant.png _wpa_supplicant.eps
-
-docs: docs-pics
-	(cd ..; doxygen doc/doxygen.conf; cd doc)
-	$(MAKE) -C latex
-	cp latex/refman.pdf wpa_supplicant-devel.pdf
-
-html: docs-pics
-	(cd ..; doxygen doc/doxygen.conf; cd doc)
-
-clean:
-	rm -f *~
-	rm -f wpa_supplicant.eps wpa_supplicant.png
-	rm -f _wpa_supplicant.png _wpa_supplicant.eps
-	rm -f hostapd.eps hostapd.png
-	rm -f p2p_sm.eps p2p_sm.png
-	rm -f p2p_arch.eps p2p_arch.png
-	rm -f p2p_arch2.eps p2p_arch2.png
-	rm -f doxygen.warnings
-	rm -rf html latex
-	rm -f wpa_supplicant-devel.pdf
diff --git a/contrib/wpa/doc/code_structure.doxygen b/contrib/wpa/doc/code_structure.doxygen
index 454f179753d3..e69de29bb2d1 100644
--- a/contrib/wpa/doc/code_structure.doxygen
+++ b/contrib/wpa/doc/code_structure.doxygen
@@ -1,315 +0,0 @@
-/**
-\page code_structure Structure of the source code
-
-[ \ref _wpa_supplicant_core "wpa_supplicant core functionality" |
-\ref generic_helper_func "Generic helper functions" |
-\ref crypto_func "Cryptographic functions" |
-\ref tls_func "TLS library" |
-\ref configuration "Configuration" |
-\ref ctrl_iface "Control interface" |
-\ref wpa_code "WPA supplicant" |
-\ref eap_peer "EAP peer" |
-\ref eapol_supp "EAPOL supplicant" |
-\ref win_port "Windows port" |
-\ref test_programs "Test programs" ]
-
-wpa_supplicant implementation is divided into number of independent
-modules. Core code includes functionality for controlling the network
-selection, association, and configuration. Independent modules include
-WPA code (key handshake, PMKSA caching, pre-authentication), EAPOL
-state machine, and EAP state machine and methods. In addition, there
-are number of separate files for generic helper functions.
-
-Both WPA and EAPOL/EAP state machines can be used separately in other
-programs than wpa_supplicant. As an example, the included test
-programs eapol_test and preauth_test are using these modules.
-
-\ref driver_wrapper "Driver interface API" is defined in \ref driver.h and
-all hardware/driver dependent functionality is implemented in
-driver_*.c.
-
-
-\section _wpa_supplicant_core wpa_supplicant core functionality
-
-\ref wpa_supplicant.c
-	Program initialization, main control loop
-
-\ref wpa_supplicant/main.c
-	main() for UNIX-like operating systems and MinGW (Windows); this
-	uses command line arguments to configure wpa_supplicant
-
-\ref events.c
-	Driver event processing; \ref wpa_supplicant_event() and related functions
-
-\ref wpa_supplicant_i.h
-	Internal definitions for wpa_supplicant core; should not be
-	included into independent modules
-
-
-\section generic_helper_func Generic helper functions
-
-wpa_supplicant uses generic helper functions some of which are shared
-with with hostapd. The following C files are currently used:
-
-\ref eloop.c and \ref eloop.h
-	Event loop (select() loop with registerable timeouts, socket read
-	callbacks, and signal callbacks)
-
-\ref common.c and \ref common.h
-	Common helper functions
-
-\ref defs.h
-	Definitions shared by multiple files
-
-\ref l2_packet.h, \ref l2_packet_linux.c, and \ref l2_packet_pcap.c
-	Layer 2 (link) access wrapper (includes native Linux implementation
-	and wrappers for libdnet/libpcap). A new l2_packet implementation
-	may need to be added when porting to new operating systems that are
-	not supported by libdnet/libpcap. Makefile can be used to select which
-	l2_packet implementation is included. \ref l2_packet_linux.c uses Linux
-	packet sockets and \ref l2_packet_pcap.c has a more portable version using
-	libpcap and libdnet.
-
-\ref pcsc_funcs.c and \ref pcsc_funcs.h
-	Wrapper for PC/SC lite SIM and smart card readers
-
-\ref priv_netlink.h
-	Private version of netlink definitions from Linux kernel header files;
-	this could be replaced with C library header file once suitable
-	version becomes commonly available
-
-\ref version.h
-	Version number definitions
-
-
-\section crypto_func Cryptographic functions
-
-\ref md5.c and \ref md5.h
-	MD5 (replaced with a crypto library if TLS support is included)
-	HMAC-MD5 (keyed checksum for message authenticity validation)
-
-\ref rc4.c and \ref rc4.h
-	RC4 (broadcast/default key encryption)
-
-\ref sha1.c and \ref sha1.h
-	SHA-1 (replaced with a crypto library if TLS support is included)
-	HMAC-SHA-1 (keyed checksum for message authenticity validation)
-	PRF-SHA-1 (pseudorandom (key/nonce generation) function)
-	PBKDF2-SHA-1 (ASCII passphrase to shared secret)
-	T-PRF (for EAP-FAST)
-	TLS-PRF (RFC 2246)
-
-\ref sha256.c and \ref sha256.h
-	SHA-256 (replaced with a crypto library if TLS support is included)
-
-\ref aes-wrap.c, \ref aes_wrap.h, \ref aes.c
-	AES (replaced with a crypto library if TLS support is included),
-	AES Key Wrap Algorithm with 128-bit KEK, RFC3394 (broadcast/default
-	key encryption),
-	One-Key CBC MAC (OMAC1) hash with AES-128,
-	AES-128 CTR mode encryption,
-	AES-128 EAX mode encryption/decryption,
-	AES-128 CBC
-
-\ref crypto.h
-	Definition of crypto library wrapper
-
-\ref crypto_openssl.c
-	Wrapper functions for libcrypto (OpenSSL)
-
-\ref crypto_internal.c
-	Wrapper functions for internal crypto implementation
-
-\ref crypto_gnutls.c
-	Wrapper functions for libgcrypt (used by GnuTLS)
-
-\ref ms_funcs.c and \ref ms_funcs.h
-	Helper functions for MSCHAPV2 and LEAP
-
-\ref tls.h
-	Definition of TLS library wrapper
-
-\ref tls_none.c
-	Dummy implementation of TLS library wrapper for cases where TLS
-	functionality is not included.
-
-\ref tls_openssl.c
-	TLS library wrapper for openssl
-
-\ref tls_internal.c
-	TLS library for internal TLS implementation
-
-\ref tls_gnutls.c
-	TLS library wrapper for GnuTLS
-
-
-\section tls_func TLS library
-
-\ref asn1.c and \ref asn1.h
-	ASN.1 DER parsing
-
-\ref bignum.c and \ref bignum.h
-	Big number math
-
-\ref rsa.c and \ref rsa.h
-	RSA
-
-\ref x509v3.c and \ref x509v3.h
-	X.509v3 certificate parsing and processing
-
-\ref tlsv1_client.c, \ref tlsv1_client.h
-	TLSv1 client (RFC 2246)
-
-\ref tlsv1_client_i.h
-	Internal structures for TLSv1 client
-
-\ref tlsv1_client_read.c
-	TLSv1 client: read handshake messages
-
-\ref tlsv1_client_write.c
-	TLSv1 client: write handshake messages
-
-\ref tlsv1_common.c and \ref tlsv1_common.h
-	Common TLSv1 routines and definitions
-
-\ref tlsv1_cred.c and \ref tlsv1_cred.h
-	TLSv1 credentials
-
-\ref tlsv1_record.c and \ref tlsv1_record.h
-	TLSv1 record protocol
-
-
-\section configuration Configuration
-
-\ref config_ssid.h
-	Definition of per network configuration items
-
-\ref config.h
-	Definition of the wpa_supplicant configuration
-
-\ref config.c
-	Configuration parser and common functions
-
-\ref wpa_supplicant/config_file.c
-	Configuration backend for text files (e.g., wpa_supplicant.conf)
-
-\ref config_winreg.c
-	Configuration backend for Windows registry
-
-
-\section ctrl_iface Control interface
-
-wpa_supplicant has a \ref ctrl_iface_page "control interface"
-that can be used to get status
-information and manage operations from external programs. An example
-command line interface (wpa_cli) and GUI (wpa_gui) for this interface
-are included in the wpa_supplicant distribution.
-
-\ref wpa_supplicant/ctrl_iface.c and \ref wpa_supplicant/ctrl_iface.h
-	wpa_supplicant-side of the control interface
-
-\ref ctrl_iface_unix.c
-	UNIX domain sockets -based control interface backend
-
-\ref ctrl_iface_udp.c
-	UDP sockets -based control interface backend
-
-\ref ctrl_iface_named_pipe.c
-	Windows named pipes -based control interface backend
-
-\ref wpa_ctrl.c and \ref wpa_ctrl.h
-	Library functions for external programs to provide access to the
-	wpa_supplicant control interface
-
-\ref wpa_cli.c
-	Example program for using wpa_supplicant control interface
-
-
-\section wpa_code WPA supplicant
-
-\ref wpa.c and \ref wpa.h
-	WPA state machine and 4-Way/Group Key Handshake processing
-
-\ref preauth.c and \ref preauth.h
-	PMKSA caching and pre-authentication (RSN/WPA2)
-
-\ref wpa_i.h
-	Internal definitions for WPA code; not to be included to other modules.
-
-\section eap_peer EAP peer
-
-\ref eap_peer_module "EAP peer implementation" is a separate module that
-can be used by other programs than just wpa_supplicant.
-
-\ref eap.c and \ref eap.h
-	EAP state machine and method interface
-
-\ref eap_defs.h
-	Common EAP definitions
-
-\ref eap_i.h
-	Internal definitions for EAP state machine and EAP methods; not to be
-	included in other modules
-
-\ref eap_sim_common.c and \ref eap_sim_common.h
-	Common code for EAP-SIM and EAP-AKA
-
-\ref eap_tls_common.c and \ref eap_tls_common.h
-	Common code for EAP-PEAP, EAP-TTLS, and EAP-FAST
-
-\ref eap_ttls.c and \ref eap_ttls.h
-	EAP-TTLS
-
-\ref eap_pax.c, \ref eap_pax_common.h, \ref eap_pax_common.c
-	EAP-PAX
-
-\ref eap_psk.c, \ref eap_psk_common.h, \ref eap_psk_common.c
-	EAP-PSK (note: this is not needed for WPA-PSK)
-
-\ref eap_sake.c, \ref eap_sake_common.h, \ref eap_sake_common.c
-	EAP-SAKE
-
-\ref eap_gpsk.c, \ref eap_gpsk_common.h, \ref eap_gpsk_common.c
-	EAP-GPSK
-
-\ref eap_aka.c, \ref eap_fast.c, \ref eap_gtc.c, \ref eap_leap.c,
-\ref eap_md5.c, \ref eap_mschapv2.c, \ref eap_otp.c, \ref eap_peap.c,
-\ref eap_sim.c, \ref eap_tls.c
-	Other EAP method implementations
-
-
-\section eapol_supp EAPOL supplicant
-
-\ref eapol_supp_sm.c and \ref eapol_supp_sm.h
-	EAPOL supplicant state machine and IEEE 802.1X processing
*** 203093 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104171548.13HFmD1E076936>