diff --git a/contrib/wpa/.gitignore b/contrib/wpa/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/Android.mk b/contrib/wpa/Android.mk
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/build_release b/contrib/wpa/build_release
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/.gitignore b/contrib/wpa/doc/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/Makefile b/contrib/wpa/doc/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/code_structure.doxygen b/contrib/wpa/doc/code_structure.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/ctrl_iface.doxygen b/contrib/wpa/doc/ctrl_iface.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/dbus.doxygen b/contrib/wpa/doc/dbus.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/directories.doxygen b/contrib/wpa/doc/directories.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/doxygen.conf b/contrib/wpa/doc/doxygen.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/driver_wrapper.doxygen b/contrib/wpa/doc/driver_wrapper.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/eap.doxygen b/contrib/wpa/doc/eap.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/eap_server.doxygen b/contrib/wpa/doc/eap_server.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/hostapd.fig b/contrib/wpa/doc/hostapd.fig
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/hostapd_ctrl_iface.doxygen b/contrib/wpa/doc/hostapd_ctrl_iface.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/mainpage.doxygen b/contrib/wpa/doc/mainpage.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/p2p.doxygen b/contrib/wpa/doc/p2p.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/p2p_arch.dot b/contrib/wpa/doc/p2p_arch.dot
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/p2p_arch2.dot b/contrib/wpa/doc/p2p_arch2.dot
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/p2p_sm.dot b/contrib/wpa/doc/p2p_sm.dot
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/porting.doxygen b/contrib/wpa/doc/porting.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/testing_tools.doxygen b/contrib/wpa/doc/testing_tools.doxygen
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/doc/wpa_supplicant.fig b/contrib/wpa/doc/wpa_supplicant.fig
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/.gitignore b/contrib/wpa/eap_example/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/Makefile b/contrib/wpa/eap_example/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/README b/contrib/wpa/eap_example/README
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/ca.pem b/contrib/wpa/eap_example/ca.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/dh.conf b/contrib/wpa/eap_example/dh.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/eap_example.c b/contrib/wpa/eap_example/eap_example.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/eap_example_peer.c b/contrib/wpa/eap_example/eap_example_peer.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/eap_example_server.c b/contrib/wpa/eap_example/eap_example_server.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/server-key.pem b/contrib/wpa/eap_example/server-key.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/server.key b/contrib/wpa/eap_example/server.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/eap_example/server.pem b/contrib/wpa/eap_example/server.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hostapd/.gitignore b/contrib/wpa/hostapd/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hostapd/sae_pk_gen.c b/contrib/wpa/hostapd/sae_pk_gen.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/.gitignore b/contrib/wpa/hs20/server/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/Makefile b/contrib/wpa/hs20/server/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/clean.sh b/contrib/wpa/hs20/server/ca/clean.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/est-csrattrs.cnf b/contrib/wpa/hs20/server/ca/est-csrattrs.cnf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/est-csrattrs.sh b/contrib/wpa/hs20/server/ca/est-csrattrs.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/hs20.oid b/contrib/wpa/hs20/server/ca/hs20.oid
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/ocsp-req.sh b/contrib/wpa/hs20/server/ca/ocsp-req.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh b/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/ocsp-responder.sh b/contrib/wpa/hs20/server/ca/ocsp-responder.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh b/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/openssl-root.cnf b/contrib/wpa/hs20/server/ca/openssl-root.cnf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/openssl.cnf b/contrib/wpa/hs20/server/ca/openssl.cnf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/setup.sh b/contrib/wpa/hs20/server/ca/setup.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/ca/w1fi_logo.png b/contrib/wpa/hs20/server/ca/w1fi_logo.png
deleted file mode 100644
index ac7c259fff2e..000000000000
Binary files a/contrib/wpa/hs20/server/ca/w1fi_logo.png and /dev/null differ
diff --git a/contrib/wpa/hs20/server/hs20-osu-server.txt b/contrib/wpa/hs20/server/hs20-osu-server.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/hs20_spp_server.c b/contrib/wpa/hs20/server/hs20_spp_server.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/spp_server.c b/contrib/wpa/hs20/server/spp_server.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/spp_server.h b/contrib/wpa/hs20/server/spp_server.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/sql-example.txt b/contrib/wpa/hs20/server/sql-example.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/sql.txt b/contrib/wpa/hs20/server/sql.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/add-free.php b/contrib/wpa/hs20/server/www/add-free.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/add-mo.php b/contrib/wpa/hs20/server/www/add-mo.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/cert-enroll.php b/contrib/wpa/hs20/server/www/cert-enroll.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/config.php b/contrib/wpa/hs20/server/www/config.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/est.php b/contrib/wpa/hs20/server/www/est.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/free-remediation.php b/contrib/wpa/hs20/server/www/free-remediation.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/free.php b/contrib/wpa/hs20/server/www/free.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/redirect.php b/contrib/wpa/hs20/server/www/redirect.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/remediation-pw.php b/contrib/wpa/hs20/server/www/remediation-pw.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/remediation.php b/contrib/wpa/hs20/server/www/remediation.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/signup.php b/contrib/wpa/hs20/server/www/signup.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/spp.php b/contrib/wpa/hs20/server/www/spp.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/terms.php b/contrib/wpa/hs20/server/www/terms.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/hs20/server/www/users.php b/contrib/wpa/hs20/server/www/users.php
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/radius_example/.gitignore b/contrib/wpa/radius_example/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/radius_example/Makefile b/contrib/wpa/radius_example/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/radius_example/README b/contrib/wpa/radius_example/README
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/radius_example/radius_example.c b/contrib/wpa/radius_example/radius_example.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/build.rules b/contrib/wpa/src/build.rules
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/brcm_vendor.h b/contrib/wpa/src/common/brcm_vendor.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/dpp_auth.c b/contrib/wpa/src/common/dpp_auth.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/dpp_backup.c b/contrib/wpa/src/common/dpp_backup.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/dpp_crypto.c b/contrib/wpa/src/common/dpp_crypto.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/dpp_i.h b/contrib/wpa/src/common/dpp_i.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/dpp_pkex.c b/contrib/wpa/src/common/dpp_pkex.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/dpp_reconfig.c b/contrib/wpa/src/common/dpp_reconfig.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/dpp_tcp.c b/contrib/wpa/src/common/dpp_tcp.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/ptksa_cache.c b/contrib/wpa/src/common/ptksa_cache.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/ptksa_cache.h b/contrib/wpa/src/common/ptksa_cache.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/common/sae_pk.c b/contrib/wpa/src/common/sae_pk.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/crypto/sha384-tlsprf.c b/contrib/wpa/src/crypto/sha384-tlsprf.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/eap_peer/.gitignore b/contrib/wpa/src/eap_peer/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/objs.mk b/contrib/wpa/src/objs.mk
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/utils/config.c b/contrib/wpa/src/utils/config.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/utils/config.h b/contrib/wpa/src/utils/config.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/src/utils/ext_password_file.c b/contrib/wpa/src/utils/ext_password_file.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/.gitignore b/contrib/wpa/tests/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/Makefile b/contrib/wpa/tests/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/README b/contrib/wpa/tests/README
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/cipher-and-key-mgmt-testing.txt b/contrib/wpa/tests/cipher-and-key-mgmt-testing.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/README b/contrib/wpa/tests/fuzzing/README
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/ap-mgmt/.gitignore b/contrib/wpa/tests/fuzzing/ap-mgmt/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/ap-mgmt/Makefile b/contrib/wpa/tests/fuzzing/ap-mgmt/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/ap-mgmt/ap-mgmt.c b/contrib/wpa/tests/fuzzing/ap-mgmt/ap-mgmt.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi-sae-ffc.dat b/contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi-sae-ffc.dat
deleted file mode 100644
index 8c0059d5f322..000000000000
Binary files a/contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi-sae-ffc.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi-sae.dat b/contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi-sae.dat
deleted file mode 100644
index 31a0d091dba9..000000000000
Binary files a/contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi-sae.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi.dat b/contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi.dat
deleted file mode 100644
index 29d074e0c414..000000000000
Binary files a/contrib/wpa/tests/fuzzing/ap-mgmt/corpus/multi.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/asn1/.gitignore b/contrib/wpa/tests/fuzzing/asn1/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/asn1/Makefile b/contrib/wpa/tests/fuzzing/asn1/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/asn1/asn1.c b/contrib/wpa/tests/fuzzing/asn1/asn1.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/asn1/corpus/ca.der b/contrib/wpa/tests/fuzzing/asn1/corpus/ca.der
deleted file mode 100644
index 09d5fa051bf3..000000000000
Binary files a/contrib/wpa/tests/fuzzing/asn1/corpus/ca.der and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/asn1/corpus/ocsp-multi-server-cache.der b/contrib/wpa/tests/fuzzing/asn1/corpus/ocsp-multi-server-cache.der
deleted file mode 100644
index 36be8118aa1d..000000000000
Binary files a/contrib/wpa/tests/fuzzing/asn1/corpus/ocsp-multi-server-cache.der and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/asn1/corpus/ocsp-req.der b/contrib/wpa/tests/fuzzing/asn1/corpus/ocsp-req.der
deleted file mode 100644
index 3a70e3872d4c..000000000000
Binary files a/contrib/wpa/tests/fuzzing/asn1/corpus/ocsp-req.der and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/build-test.sh b/contrib/wpa/tests/fuzzing/build-test.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/dpp-uri/.gitignore b/contrib/wpa/tests/fuzzing/dpp-uri/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/dpp-uri/Makefile b/contrib/wpa/tests/fuzzing/dpp-uri/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/dpp-uri/corpus/1.dat b/contrib/wpa/tests/fuzzing/dpp-uri/corpus/1.dat
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/dpp-uri/corpus/2.dat b/contrib/wpa/tests/fuzzing/dpp-uri/corpus/2.dat
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/dpp-uri/corpus/3.dat b/contrib/wpa/tests/fuzzing/dpp-uri/corpus/3.dat
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/dpp-uri/dpp-uri.c b/contrib/wpa/tests/fuzzing/dpp-uri/dpp-uri.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eap-aka-peer/.gitignore b/contrib/wpa/tests/fuzzing/eap-aka-peer/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eap-aka-peer/Makefile b/contrib/wpa/tests/fuzzing/eap-aka-peer/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eap-aka-peer/corpus/server.msg b/contrib/wpa/tests/fuzzing/eap-aka-peer/corpus/server.msg
deleted file mode 100644
index 64843912d838..000000000000
Binary files a/contrib/wpa/tests/fuzzing/eap-aka-peer/corpus/server.msg and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/eap-aka-peer/eap-aka-peer.c b/contrib/wpa/tests/fuzzing/eap-aka-peer/eap-aka-peer.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eap-mschapv2-peer/.gitignore b/contrib/wpa/tests/fuzzing/eap-mschapv2-peer/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eap-mschapv2-peer/Makefile b/contrib/wpa/tests/fuzzing/eap-mschapv2-peer/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eap-mschapv2-peer/corpus/server.msg b/contrib/wpa/tests/fuzzing/eap-mschapv2-peer/corpus/server.msg
deleted file mode 100644
index 50ff9d19e3a5..000000000000
Binary files a/contrib/wpa/tests/fuzzing/eap-mschapv2-peer/corpus/server.msg and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/eap-mschapv2-peer/eap-mschapv2-peer.c b/contrib/wpa/tests/fuzzing/eap-mschapv2-peer/eap-mschapv2-peer.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eap-sim-peer/.gitignore b/contrib/wpa/tests/fuzzing/eap-sim-peer/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eap-sim-peer/Makefile b/contrib/wpa/tests/fuzzing/eap-sim-peer/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eap-sim-peer/corpus/server.msg b/contrib/wpa/tests/fuzzing/eap-sim-peer/corpus/server.msg
deleted file mode 100644
index adb9f6c6fea9..000000000000
Binary files a/contrib/wpa/tests/fuzzing/eap-sim-peer/corpus/server.msg and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/eap-sim-peer/eap-sim-peer.c b/contrib/wpa/tests/fuzzing/eap-sim-peer/eap-sim-peer.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eapol-key-auth/.gitignore b/contrib/wpa/tests/fuzzing/eapol-key-auth/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eapol-key-auth/Makefile b/contrib/wpa/tests/fuzzing/eapol-key-auth/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eapol-key-auth/corpus/supp.msg b/contrib/wpa/tests/fuzzing/eapol-key-auth/corpus/supp.msg
deleted file mode 100644
index 437d45175448..000000000000
Binary files a/contrib/wpa/tests/fuzzing/eapol-key-auth/corpus/supp.msg and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/eapol-key-auth/eapol-key-auth.c b/contrib/wpa/tests/fuzzing/eapol-key-auth/eapol-key-auth.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eapol-key-supp/.gitignore b/contrib/wpa/tests/fuzzing/eapol-key-supp/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eapol-key-supp/Makefile b/contrib/wpa/tests/fuzzing/eapol-key-supp/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eapol-key-supp/corpus/auth.msg b/contrib/wpa/tests/fuzzing/eapol-key-supp/corpus/auth.msg
deleted file mode 100644
index 00ae53dff88e..000000000000
Binary files a/contrib/wpa/tests/fuzzing/eapol-key-supp/corpus/auth.msg and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/eapol-key-supp/eapol-key-supp.c b/contrib/wpa/tests/fuzzing/eapol-key-supp/eapol-key-supp.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eapol-supp/.gitignore b/contrib/wpa/tests/fuzzing/eapol-supp/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eapol-supp/Makefile b/contrib/wpa/tests/fuzzing/eapol-supp/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/eapol-supp/corpus/eap-req-identity.dat b/contrib/wpa/tests/fuzzing/eapol-supp/corpus/eap-req-identity.dat
deleted file mode 100644
index 768b27754167..000000000000
Binary files a/contrib/wpa/tests/fuzzing/eapol-supp/corpus/eap-req-identity.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/eapol-supp/corpus/eap-req-sim.dat b/contrib/wpa/tests/fuzzing/eapol-supp/corpus/eap-req-sim.dat
deleted file mode 100644
index eb854aae01fd..000000000000
Binary files a/contrib/wpa/tests/fuzzing/eapol-supp/corpus/eap-req-sim.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/eapol-supp/corpus/eapol-key-m1.dat b/contrib/wpa/tests/fuzzing/eapol-supp/corpus/eapol-key-m1.dat
deleted file mode 100644
index 937721c5013d..000000000000
Binary files a/contrib/wpa/tests/fuzzing/eapol-supp/corpus/eapol-key-m1.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/eapol-supp/eapol-supp.c b/contrib/wpa/tests/fuzzing/eapol-supp/eapol-supp.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/fuzzer-common.c b/contrib/wpa/tests/fuzzing/fuzzer-common.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/fuzzer-common.h b/contrib/wpa/tests/fuzzing/fuzzer-common.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/json/.gitignore b/contrib/wpa/tests/fuzzing/json/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/json/Makefile b/contrib/wpa/tests/fuzzing/json/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/json/corpus/1.json b/contrib/wpa/tests/fuzzing/json/corpus/1.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/json/corpus/2.json b/contrib/wpa/tests/fuzzing/json/corpus/2.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/json/corpus/3.json b/contrib/wpa/tests/fuzzing/json/corpus/3.json
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/json/json.c b/contrib/wpa/tests/fuzzing/json/json.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/p2p/.gitignore b/contrib/wpa/tests/fuzzing/p2p/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/p2p/Makefile b/contrib/wpa/tests/fuzzing/p2p/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/p2p/corpus/go-neg-req.dat b/contrib/wpa/tests/fuzzing/p2p/corpus/go-neg-req.dat
deleted file mode 100644
index ed06834d71a1..000000000000
Binary files a/contrib/wpa/tests/fuzzing/p2p/corpus/go-neg-req.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/p2p/corpus/invitation-req.dat b/contrib/wpa/tests/fuzzing/p2p/corpus/invitation-req.dat
deleted file mode 100644
index 5991f3e6e3f9..000000000000
Binary files a/contrib/wpa/tests/fuzzing/p2p/corpus/invitation-req.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/p2p/corpus/p2ps-pd-req.dat b/contrib/wpa/tests/fuzzing/p2p/corpus/p2ps-pd-req.dat
deleted file mode 100644
index 7e1b6d91dead..000000000000
Binary files a/contrib/wpa/tests/fuzzing/p2p/corpus/p2ps-pd-req.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/p2p/corpus/proberesp-go.dat b/contrib/wpa/tests/fuzzing/p2p/corpus/proberesp-go.dat
deleted file mode 100644
index 8541652ff955..000000000000
Binary files a/contrib/wpa/tests/fuzzing/p2p/corpus/proberesp-go.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/p2p/corpus/proberesp.dat b/contrib/wpa/tests/fuzzing/p2p/corpus/proberesp.dat
deleted file mode 100644
index 8d997d1c5e13..000000000000
Binary files a/contrib/wpa/tests/fuzzing/p2p/corpus/proberesp.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/p2p/p2p.c b/contrib/wpa/tests/fuzzing/p2p/p2p.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/rules.include b/contrib/wpa/tests/fuzzing/rules.include
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/sae/.gitignore b/contrib/wpa/tests/fuzzing/sae/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/sae/Makefile b/contrib/wpa/tests/fuzzing/sae/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-h2e-rejected-groups.dat b/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-h2e-rejected-groups.dat
deleted file mode 100644
index cd129a474a72..000000000000
Binary files a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-h2e-rejected-groups.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-h2e-token.dat b/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-h2e-token.dat
deleted file mode 100644
index b2886c70d209..000000000000
Binary files a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-h2e-token.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-pw-id.dat b/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-pw-id.dat
deleted file mode 100644
index 5ca903ed2016..000000000000
Binary files a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-pw-id.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-token.dat b/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-token.dat
deleted file mode 100644
index b25cc49f8e10..000000000000
Binary files a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-token.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-valid.dat b/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-valid.dat
deleted file mode 100644
index eadfa4993b89..000000000000
Binary files a/contrib/wpa/tests/fuzzing/sae/corpus/sae-commit-valid.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/sae/sae.c b/contrib/wpa/tests/fuzzing/sae/sae.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/tls-client/.gitignore b/contrib/wpa/tests/fuzzing/tls-client/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/tls-client/Makefile b/contrib/wpa/tests/fuzzing/tls-client/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/tls-client/corpus/server.msg b/contrib/wpa/tests/fuzzing/tls-client/corpus/server.msg
deleted file mode 100644
index 0f842fdf75e1..000000000000
Binary files a/contrib/wpa/tests/fuzzing/tls-client/corpus/server.msg and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/tls-client/tls-client.c b/contrib/wpa/tests/fuzzing/tls-client/tls-client.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/tls-server/.gitignore b/contrib/wpa/tests/fuzzing/tls-server/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/tls-server/Makefile b/contrib/wpa/tests/fuzzing/tls-server/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/tls-server/corpus/client.msg b/contrib/wpa/tests/fuzzing/tls-server/corpus/client.msg
deleted file mode 100644
index cb390143b0ea..000000000000
Binary files a/contrib/wpa/tests/fuzzing/tls-server/corpus/client.msg and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/tls-server/tls-server.c b/contrib/wpa/tests/fuzzing/tls-server/tls-server.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/wnm/.gitignore b/contrib/wpa/tests/fuzzing/wnm/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/wnm/Makefile b/contrib/wpa/tests/fuzzing/wnm/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/wnm/corpus/bss-tm-req.dat b/contrib/wpa/tests/fuzzing/wnm/corpus/bss-tm-req.dat
deleted file mode 100644
index 14510bb3ad11..000000000000
Binary files a/contrib/wpa/tests/fuzzing/wnm/corpus/bss-tm-req.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/wnm/corpus/oss-fuzz-0001.dat b/contrib/wpa/tests/fuzzing/wnm/corpus/oss-fuzz-0001.dat
deleted file mode 100644
index 53fdf659c438..000000000000
Binary files a/contrib/wpa/tests/fuzzing/wnm/corpus/oss-fuzz-0001.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/wnm/corpus/oss-fuzz-0002.dat b/contrib/wpa/tests/fuzzing/wnm/corpus/oss-fuzz-0002.dat
deleted file mode 100644
index cb700936fad5..000000000000
Binary files a/contrib/wpa/tests/fuzzing/wnm/corpus/oss-fuzz-0002.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/wnm/corpus/wnm-notif.dat b/contrib/wpa/tests/fuzzing/wnm/corpus/wnm-notif.dat
deleted file mode 100644
index c234d3ad5b69..000000000000
Binary files a/contrib/wpa/tests/fuzzing/wnm/corpus/wnm-notif.dat and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/wnm/wnm.c b/contrib/wpa/tests/fuzzing/wnm/wnm.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/x509/.gitignore b/contrib/wpa/tests/fuzzing/x509/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/x509/Makefile b/contrib/wpa/tests/fuzzing/x509/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/x509/corpus/ca.der b/contrib/wpa/tests/fuzzing/x509/corpus/ca.der
deleted file mode 100644
index 09d5fa051bf3..000000000000
Binary files a/contrib/wpa/tests/fuzzing/x509/corpus/ca.der and /dev/null differ
diff --git a/contrib/wpa/tests/fuzzing/x509/corpus/oss-fuzz-15408 b/contrib/wpa/tests/fuzzing/x509/corpus/oss-fuzz-15408
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/fuzzing/x509/x509.c b/contrib/wpa/tests/fuzzing/x509/x509.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/.gitignore b/contrib/wpa/tests/hwsim/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/README b/contrib/wpa/tests/hwsim/README
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/as.conf b/contrib/wpa/tests/hwsim/auth_serv/as.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/as2.conf b/contrib/wpa/tests/hwsim/auth_serv/as2.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ca-and-crl-expired.pem b/contrib/wpa/tests/hwsim/auth_serv/ca-and-crl-expired.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ca-and-crl.pem b/contrib/wpa/tests/hwsim/auth_serv/ca-and-crl.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ca-incorrect-key.pem b/contrib/wpa/tests/hwsim/auth_serv/ca-incorrect-key.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ca-incorrect.der b/contrib/wpa/tests/hwsim/auth_serv/ca-incorrect.der
deleted file mode 100644
index 75bb94d71aef..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/ca-incorrect.der and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ca-incorrect.pem b/contrib/wpa/tests/hwsim/auth_serv/ca-incorrect.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ca-key.pem b/contrib/wpa/tests/hwsim/auth_serv/ca-key.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ca.der b/contrib/wpa/tests/hwsim/auth_serv/ca.der
deleted file mode 100644
index b03de0177f76..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/ca.der and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ca.pem b/contrib/wpa/tests/hwsim/auth_serv/ca.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/dh.conf b/contrib/wpa/tests/hwsim/auth_serv/dh.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/dh2.conf b/contrib/wpa/tests/hwsim/auth_serv/dh2.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/dh_param_3072.pem b/contrib/wpa/tests/hwsim/auth_serv/dh_param_3072.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/dsaparam.pem b/contrib/wpa/tests/hwsim/auth_serv/dsaparam.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/eap_user.conf b/contrib/wpa/tests/hwsim/auth_serv/eap_user.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/eap_user_vlan.conf b/contrib/wpa/tests/hwsim/auth_serv/eap_user_vlan.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec-ca-openssl.cnf b/contrib/wpa/tests/hwsim/auth_serv/ec-ca-openssl.cnf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec-ca.key b/contrib/wpa/tests/hwsim/auth_serv/ec-ca.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec-ca.pem b/contrib/wpa/tests/hwsim/auth_serv/ec-ca.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec-generate.sh b/contrib/wpa/tests/hwsim/auth_serv/ec-generate.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec-server.key b/contrib/wpa/tests/hwsim/auth_serv/ec-server.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec-server.pem b/contrib/wpa/tests/hwsim/auth_serv/ec-server.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec-user.key b/contrib/wpa/tests/hwsim/auth_serv/ec-user.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec-user.pem b/contrib/wpa/tests/hwsim/auth_serv/ec-user.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec2-ca.key b/contrib/wpa/tests/hwsim/auth_serv/ec2-ca.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec2-ca.pem b/contrib/wpa/tests/hwsim/auth_serv/ec2-ca.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec2-generate.sh b/contrib/wpa/tests/hwsim/auth_serv/ec2-generate.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec2-server.key b/contrib/wpa/tests/hwsim/auth_serv/ec2-server.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec2-server.pem b/contrib/wpa/tests/hwsim/auth_serv/ec2-server.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec2-user-p256.key b/contrib/wpa/tests/hwsim/auth_serv/ec2-user-p256.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec2-user-p256.pem b/contrib/wpa/tests/hwsim/auth_serv/ec2-user-p256.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec2-user.key b/contrib/wpa/tests/hwsim/auth_serv/ec2-user.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ec2-user.pem b/contrib/wpa/tests/hwsim/auth_serv/ec2-user.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/hlr_auc_gw.gsm b/contrib/wpa/tests/hwsim/auth_serv/hlr_auc_gw.gsm
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/hlr_auc_gw.milenage_db b/contrib/wpa/tests/hwsim/auth_serv/hlr_auc_gw.milenage_db
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/ca-and-root.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/ca-and-root.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/cacert.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/cacert.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/careq.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/careq.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/index.txt b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/index.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/index.txt.attr b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/index.txt.attr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/private/cakey.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/private/cakey.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/serial b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/serial
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server-revoked.key b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server-revoked.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server-revoked.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server-revoked.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server-revoked.req b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server-revoked.req
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server-revoked_and_ica.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server-revoked_and_ica.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server.key b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server.req b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server.req
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server_and_ica.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-server/server_and_ica.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/ca-and-root.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/ca-and-root.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/cacert.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/cacert.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/careq.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/careq.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/index.txt b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/index.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/index.txt.attr b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/index.txt.attr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/private/cakey.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/private/cakey.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/serial b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/serial
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/user.key b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/user.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/user.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/user.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/user.req b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/user.req
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/iCA-user/user_and_ica.pem b/contrib/wpa/tests/hwsim/auth_serv/iCA-user/user_and_ica.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ica-generate.sh b/contrib/wpa/tests/hwsim/auth_serv/ica-generate.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/index-revoked.txt b/contrib/wpa/tests/hwsim/auth_serv/index-revoked.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/index-unknown.txt b/contrib/wpa/tests/hwsim/auth_serv/index-unknown.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/index.txt b/contrib/wpa/tests/hwsim/auth_serv/index.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ocsp-multi-server-cache.der b/contrib/wpa/tests/hwsim/auth_serv/ocsp-multi-server-cache.der
deleted file mode 100644
index 15ea6647d812..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/ocsp-multi-server-cache.der and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ocsp-req.der b/contrib/wpa/tests/hwsim/auth_serv/ocsp-req.der
deleted file mode 100644
index ebab4a025204..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/ocsp-req.der and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ocsp-responder.csr b/contrib/wpa/tests/hwsim/auth_serv/ocsp-responder.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ocsp-responder.key b/contrib/wpa/tests/hwsim/auth_serv/ocsp-responder.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ocsp-responder.pem b/contrib/wpa/tests/hwsim/auth_serv/ocsp-responder.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ocsp-server-cache.der b/contrib/wpa/tests/hwsim/auth_serv/ocsp-server-cache.der
deleted file mode 100644
index a1661ef668f3..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/ocsp-server-cache.der and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/ocsp-server-cache.der-invalid b/contrib/wpa/tests/hwsim/auth_serv/ocsp-server-cache.der-invalid
deleted file mode 100644
index 218bd035a34d..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/ocsp-server-cache.der-invalid and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/openssl2.cnf b/contrib/wpa/tests/hwsim/auth_serv/openssl2.cnf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/radius_clients.conf b/contrib/wpa/tests/hwsim/auth_serv/radius_clients.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/radius_clients_ipv6.conf b/contrib/wpa/tests/hwsim/auth_serv/radius_clients_ipv6.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/radius_clients_none.conf b/contrib/wpa/tests/hwsim/auth_serv/radius_clients_none.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rootCA/index.txt b/contrib/wpa/tests/hwsim/auth_serv/rootCA/index.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rootCA/index.txt.attr b/contrib/wpa/tests/hwsim/auth_serv/rootCA/index.txt.attr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rootCA/serial b/contrib/wpa/tests/hwsim/auth_serv/rootCA/serial
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-ca.key b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-ca.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-ca.pem b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-ca.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-generate.sh b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-generate.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-server.key b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-server.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-server.pem b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-server.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-server.req b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-server.req
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user-rsa2048.key b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user-rsa2048.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user-rsa2048.pem b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user-rsa2048.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user-rsa2048.req b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user-rsa2048.req
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user.key b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user.pem b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user.req b/contrib/wpa/tests/hwsim/auth_serv/rsa3072-user.req
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-certpol.csr b/contrib/wpa/tests/hwsim/auth_serv/server-certpol.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-certpol.key b/contrib/wpa/tests/hwsim/auth_serv/server-certpol.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-certpol.pem b/contrib/wpa/tests/hwsim/auth_serv/server-certpol.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-certpol2.csr b/contrib/wpa/tests/hwsim/auth_serv/server-certpol2.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-certpol2.key b/contrib/wpa/tests/hwsim/auth_serv/server-certpol2.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-certpol2.pem b/contrib/wpa/tests/hwsim/auth_serv/server-certpol2.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-eku-client-server.csr b/contrib/wpa/tests/hwsim/auth_serv/server-eku-client-server.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-eku-client-server.key b/contrib/wpa/tests/hwsim/auth_serv/server-eku-client-server.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-eku-client-server.pem b/contrib/wpa/tests/hwsim/auth_serv/server-eku-client-server.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-eku-client.csr b/contrib/wpa/tests/hwsim/auth_serv/server-eku-client.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-eku-client.key b/contrib/wpa/tests/hwsim/auth_serv/server-eku-client.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-eku-client.pem b/contrib/wpa/tests/hwsim/auth_serv/server-eku-client.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-expired.csr b/contrib/wpa/tests/hwsim/auth_serv/server-expired.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-expired.key b/contrib/wpa/tests/hwsim/auth_serv/server-expired.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-expired.pem b/contrib/wpa/tests/hwsim/auth_serv/server-expired.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-extra.pkcs12 b/contrib/wpa/tests/hwsim/auth_serv/server-extra.pkcs12
deleted file mode 100644
index 47231039647a..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/server-extra.pkcs12 and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-long-duration.csr b/contrib/wpa/tests/hwsim/auth_serv/server-long-duration.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-long-duration.key b/contrib/wpa/tests/hwsim/auth_serv/server-long-duration.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-long-duration.pem b/contrib/wpa/tests/hwsim/auth_serv/server-long-duration.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-no-dnsname.csr b/contrib/wpa/tests/hwsim/auth_serv/server-no-dnsname.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-no-dnsname.key b/contrib/wpa/tests/hwsim/auth_serv/server-no-dnsname.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server-no-dnsname.pem b/contrib/wpa/tests/hwsim/auth_serv/server-no-dnsname.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server.csr b/contrib/wpa/tests/hwsim/auth_serv/server.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server.key b/contrib/wpa/tests/hwsim/auth_serv/server.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server.pem b/contrib/wpa/tests/hwsim/auth_serv/server.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/server.pkcs12 b/contrib/wpa/tests/hwsim/auth_serv/server.pkcs12
deleted file mode 100644
index a72b1644a658..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/server.pkcs12 and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha384-server.key b/contrib/wpa/tests/hwsim/auth_serv/sha384-server.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha384-server.pem b/contrib/wpa/tests/hwsim/auth_serv/sha384-server.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha384-user.key b/contrib/wpa/tests/hwsim/auth_serv/sha384-user.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha384-user.pem b/contrib/wpa/tests/hwsim/auth_serv/sha384-user.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha512-ca.key b/contrib/wpa/tests/hwsim/auth_serv/sha512-ca.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha512-ca.pem b/contrib/wpa/tests/hwsim/auth_serv/sha512-ca.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha512-generate.sh b/contrib/wpa/tests/hwsim/auth_serv/sha512-generate.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha512-server.key b/contrib/wpa/tests/hwsim/auth_serv/sha512-server.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha512-server.pem b/contrib/wpa/tests/hwsim/auth_serv/sha512-server.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha512-user.key b/contrib/wpa/tests/hwsim/auth_serv/sha512-user.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/sha512-user.pem b/contrib/wpa/tests/hwsim/auth_serv/sha512-user.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/update.sh b/contrib/wpa/tests/hwsim/auth_serv/update.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/user.csr b/contrib/wpa/tests/hwsim/auth_serv/user.csr
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/user.key b/contrib/wpa/tests/hwsim/auth_serv/user.key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/user.key.pkcs8 b/contrib/wpa/tests/hwsim/auth_serv/user.key.pkcs8
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/user.key.pkcs8.pkcs5v15 b/contrib/wpa/tests/hwsim/auth_serv/user.key.pkcs8.pkcs5v15
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/user.pem b/contrib/wpa/tests/hwsim/auth_serv/user.pem
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/user.pkcs12 b/contrib/wpa/tests/hwsim/auth_serv/user.pkcs12
deleted file mode 100644
index 13d97acc9db0..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/user.pkcs12 and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/user.rsa-key b/contrib/wpa/tests/hwsim/auth_serv/user.rsa-key
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/auth_serv/user2.pkcs12 b/contrib/wpa/tests/hwsim/auth_serv/user2.pkcs12
deleted file mode 100644
index 8957a56556a6..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/user2.pkcs12 and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/auth_serv/user3.pkcs12 b/contrib/wpa/tests/hwsim/auth_serv/user3.pkcs12
deleted file mode 100644
index 46ae62e82451..000000000000
Binary files a/contrib/wpa/tests/hwsim/auth_serv/user3.pkcs12 and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/build.sh b/contrib/wpa/tests/hwsim/build.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/check_kernel.py b/contrib/wpa/tests/hwsim/check_kernel.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/devdetail.xml b/contrib/wpa/tests/hwsim/devdetail.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/devinfo.xml b/contrib/wpa/tests/hwsim/devinfo.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/dictionary.radius b/contrib/wpa/tests/hwsim/dictionary.radius
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/example-hostapd.config b/contrib/wpa/tests/hwsim/example-hostapd.config
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/example-setup.txt b/contrib/wpa/tests/hwsim/example-setup.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/example-wpa_supplicant.config b/contrib/wpa/tests/hwsim/example-wpa_supplicant.config
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/fst_module_aux.py b/contrib/wpa/tests/hwsim/fst_module_aux.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/fst_test_common.py b/contrib/wpa/tests/hwsim/fst_test_common.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/hostapd.py b/contrib/wpa/tests/hwsim/hostapd.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/hostapd.vlan b/contrib/wpa/tests/hwsim/hostapd.vlan
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/hostapd.vlan2 b/contrib/wpa/tests/hwsim/hostapd.vlan2
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/hostapd.wlan3.vlan b/contrib/wpa/tests/hwsim/hostapd.wlan3.vlan
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/hostapd.wlan4.vlan b/contrib/wpa/tests/hwsim/hostapd.wlan4.vlan
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/hostapd.wpa_psk b/contrib/wpa/tests/hwsim/hostapd.wpa_psk
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/hwsim.py b/contrib/wpa/tests/hwsim/hwsim.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/hwsim_utils.py b/contrib/wpa/tests/hwsim/hwsim_utils.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/multi-bss-acs.conf b/contrib/wpa/tests/hwsim/multi-bss-acs.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/multi-bss-iface-per_sta_vif.conf b/contrib/wpa/tests/hwsim/multi-bss-iface-per_sta_vif.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/multi-bss-iface.conf b/contrib/wpa/tests/hwsim/multi-bss-iface.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/multi-bss.conf b/contrib/wpa/tests/hwsim/multi-bss.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/netlink.py b/contrib/wpa/tests/hwsim/netlink.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/nl80211.py b/contrib/wpa/tests/hwsim/nl80211.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/owe-bss-1.conf b/contrib/wpa/tests/hwsim/owe-bss-1.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/owe-bss-2.conf b/contrib/wpa/tests/hwsim/owe-bss-2.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/p2p0.conf b/contrib/wpa/tests/hwsim/p2p0.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/p2p1.conf b/contrib/wpa/tests/hwsim/p2p1.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/p2p2.conf b/contrib/wpa/tests/hwsim/p2p2.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/p2p_utils.py b/contrib/wpa/tests/hwsim/p2p_utils.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/pps-mo-1.xml b/contrib/wpa/tests/hwsim/pps-mo-1.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/radius_das.py b/contrib/wpa/tests/hwsim/radius_das.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/remotehost.py b/contrib/wpa/tests/hwsim/remotehost.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/rfkill.py b/contrib/wpa/tests/hwsim/rfkill.py
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/run-all.sh b/contrib/wpa/tests/hwsim/run-all.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/run-tests.py b/contrib/wpa/tests/hwsim/run-tests.py
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/start.sh b/contrib/wpa/tests/hwsim/start.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/stop.sh b/contrib/wpa/tests/hwsim/stop.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_acs.py b/contrib/wpa/tests/hwsim/test_ap_acs.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_ciphers.py b/contrib/wpa/tests/hwsim/test_ap_ciphers.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_config.py b/contrib/wpa/tests/hwsim/test_ap_config.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_csa.py b/contrib/wpa/tests/hwsim/test_ap_csa.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_dynamic.py b/contrib/wpa/tests/hwsim/test_ap_dynamic.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_eap.py b/contrib/wpa/tests/hwsim/test_ap_eap.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_ft.py b/contrib/wpa/tests/hwsim/test_ap_ft.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_hs20.py b/contrib/wpa/tests/hwsim/test_ap_hs20.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_ht.py b/contrib/wpa/tests/hwsim/test_ap_ht.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_mixed.py b/contrib/wpa/tests/hwsim/test_ap_mixed.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_open.py b/contrib/wpa/tests/hwsim/test_ap_open.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_params.py b/contrib/wpa/tests/hwsim/test_ap_params.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_pmf.py b/contrib/wpa/tests/hwsim/test_ap_pmf.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_psk.py b/contrib/wpa/tests/hwsim/test_ap_psk.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_qosmap.py b/contrib/wpa/tests/hwsim/test_ap_qosmap.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_roam.py b/contrib/wpa/tests/hwsim/test_ap_roam.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_tdls.py b/contrib/wpa/tests/hwsim/test_ap_tdls.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_track.py b/contrib/wpa/tests/hwsim/test_ap_track.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_vht.py b/contrib/wpa/tests/hwsim/test_ap_vht.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_vlan.py b/contrib/wpa/tests/hwsim/test_ap_vlan.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ap_wps.py b/contrib/wpa/tests/hwsim/test_ap_wps.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_authsrv.py b/contrib/wpa/tests/hwsim/test_authsrv.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_autoscan.py b/contrib/wpa/tests/hwsim/test_autoscan.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_bgscan.py b/contrib/wpa/tests/hwsim/test_bgscan.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_cert_check.py b/contrib/wpa/tests/hwsim/test_cert_check.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_cfg80211.py b/contrib/wpa/tests/hwsim/test_cfg80211.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_connect_cmd.py b/contrib/wpa/tests/hwsim/test_connect_cmd.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_dbus.py b/contrib/wpa/tests/hwsim/test_dbus.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_dfs.py b/contrib/wpa/tests/hwsim/test_dfs.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_dpp.py b/contrib/wpa/tests/hwsim/test_dpp.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_eap.py b/contrib/wpa/tests/hwsim/test_eap.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_eap_proto.py b/contrib/wpa/tests/hwsim/test_eap_proto.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_erp.py b/contrib/wpa/tests/hwsim/test_erp.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ext_password.py b/contrib/wpa/tests/hwsim/test_ext_password.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_fils.py b/contrib/wpa/tests/hwsim/test_fils.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_fst_config.py b/contrib/wpa/tests/hwsim/test_fst_config.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_fst_module.py b/contrib/wpa/tests/hwsim/test_fst_module.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_gas.py b/contrib/wpa/tests/hwsim/test_gas.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_hapd_ctrl.py b/contrib/wpa/tests/hwsim/test_hapd_ctrl.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_he.py b/contrib/wpa/tests/hwsim/test_he.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_hostapd_oom.py b/contrib/wpa/tests/hwsim/test_hostapd_oom.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_hs20_filter.py b/contrib/wpa/tests/hwsim/test_hs20_filter.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_hs20_pps_mo.py b/contrib/wpa/tests/hwsim/test_hs20_pps_mo.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ibss.py b/contrib/wpa/tests/hwsim/test_ibss.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ieee8021x.py b/contrib/wpa/tests/hwsim/test_ieee8021x.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_kernel.py b/contrib/wpa/tests/hwsim/test_kernel.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_macsec.py b/contrib/wpa/tests/hwsim/test_macsec.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_mbo.py b/contrib/wpa/tests/hwsim/test_mbo.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_module_tests.py b/contrib/wpa/tests/hwsim/test_module_tests.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_monitor_interface.py b/contrib/wpa/tests/hwsim/test_monitor_interface.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_mscs.py b/contrib/wpa/tests/hwsim/test_mscs.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_multi_ap.py b/contrib/wpa/tests/hwsim/test_multi_ap.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_nfc_p2p.py b/contrib/wpa/tests/hwsim/test_nfc_p2p.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_nfc_wps.py b/contrib/wpa/tests/hwsim/test_nfc_wps.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_oce.py b/contrib/wpa/tests/hwsim/test_oce.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ocv.py b/contrib/wpa/tests/hwsim/test_ocv.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_offchannel_tx.py b/contrib/wpa/tests/hwsim/test_offchannel_tx.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_owe.py b/contrib/wpa/tests/hwsim/test_owe.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_autogo.py b/contrib/wpa/tests/hwsim/test_p2p_autogo.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_channel.py b/contrib/wpa/tests/hwsim/test_p2p_channel.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_concurrency.py b/contrib/wpa/tests/hwsim/test_p2p_concurrency.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_device.py b/contrib/wpa/tests/hwsim/test_p2p_device.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_discovery.py b/contrib/wpa/tests/hwsim/test_p2p_discovery.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_ext.py b/contrib/wpa/tests/hwsim/test_p2p_ext.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_grpform.py b/contrib/wpa/tests/hwsim/test_p2p_grpform.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_invitation.py b/contrib/wpa/tests/hwsim/test_p2p_invitation.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_messages.py b/contrib/wpa/tests/hwsim/test_p2p_messages.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_persistent.py b/contrib/wpa/tests/hwsim/test_p2p_persistent.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_service.py b/contrib/wpa/tests/hwsim/test_p2p_service.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_set.py b/contrib/wpa/tests/hwsim/test_p2p_set.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2p_wifi_display.py b/contrib/wpa/tests/hwsim/test_p2p_wifi_display.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_p2ps.py b/contrib/wpa/tests/hwsim/test_p2ps.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_pasn.py b/contrib/wpa/tests/hwsim/test_pasn.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_pmksa_cache.py b/contrib/wpa/tests/hwsim/test_pmksa_cache.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_radio_work.py b/contrib/wpa/tests/hwsim/test_radio_work.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_radius.py b/contrib/wpa/tests/hwsim/test_radius.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_rfkill.py b/contrib/wpa/tests/hwsim/test_rfkill.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_rrm.py b/contrib/wpa/tests/hwsim/test_rrm.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_sae.py b/contrib/wpa/tests/hwsim/test_sae.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_sae_pk.py b/contrib/wpa/tests/hwsim/test_sae_pk.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_scan.py b/contrib/wpa/tests/hwsim/test_scan.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_sigma_dut.py b/contrib/wpa/tests/hwsim/test_sigma_dut.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_ssid.py b/contrib/wpa/tests/hwsim/test_ssid.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_sta_dynamic.py b/contrib/wpa/tests/hwsim/test_sta_dynamic.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_suite_b.py b/contrib/wpa/tests/hwsim/test_suite_b.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_tnc.py b/contrib/wpa/tests/hwsim/test_tnc.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_wep.py b/contrib/wpa/tests/hwsim/test_wep.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_wext.py b/contrib/wpa/tests/hwsim/test_wext.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_wmediumd.py b/contrib/wpa/tests/hwsim/test_wmediumd.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_wnm.py b/contrib/wpa/tests/hwsim/test_wnm.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_wpas_ap.py b/contrib/wpa/tests/hwsim/test_wpas_ap.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_wpas_config.py b/contrib/wpa/tests/hwsim/test_wpas_config.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_wpas_ctrl.py b/contrib/wpa/tests/hwsim/test_wpas_ctrl.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_wpas_mesh.py b/contrib/wpa/tests/hwsim/test_wpas_mesh.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/test_wpas_wmm_ac.py b/contrib/wpa/tests/hwsim/test_wpas_wmm_ac.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/tnc/.gitignore b/contrib/wpa/tests/hwsim/tnc/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/tnc/Makefile b/contrib/wpa/tests/hwsim/tnc/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/tnc/hostap2_imc.c b/contrib/wpa/tests/hwsim/tnc/hostap2_imc.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/tnc/hostap2_imv.c b/contrib/wpa/tests/hwsim/tnc/hostap2_imv.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/tnc/hostap_imc.c b/contrib/wpa/tests/hwsim/tnc/hostap_imc.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/tnc/hostap_imv.c b/contrib/wpa/tests/hwsim/tnc/hostap_imv.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/tnc/tnc_config b/contrib/wpa/tests/hwsim/tnc/tnc_config
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/tshark.py b/contrib/wpa/tests/hwsim/tshark.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/utils.py b/contrib/wpa/tests/hwsim/utils.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/.gitignore b/contrib/wpa/tests/hwsim/vm/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/README b/contrib/wpa/tests/hwsim/vm/README
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/bisect-run.sh b/contrib/wpa/tests/hwsim/vm/bisect-run.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/build-codecov.sh b/contrib/wpa/tests/hwsim/vm/build-codecov.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/combine-codecov.sh b/contrib/wpa/tests/hwsim/vm/combine-codecov.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/dbus.conf b/contrib/wpa/tests/hwsim/vm/dbus.conf
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/example-vm-setup.txt b/contrib/wpa/tests/hwsim/vm/example-vm-setup.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/inside.sh b/contrib/wpa/tests/hwsim/vm/inside.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/kernel-config b/contrib/wpa/tests/hwsim/vm/kernel-config
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/kernel-config.uml b/contrib/wpa/tests/hwsim/vm/kernel-config.uml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/parallel-vm.py b/contrib/wpa/tests/hwsim/vm/parallel-vm.py
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/process-codecov.sh b/contrib/wpa/tests/hwsim/vm/process-codecov.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/uevent.sh b/contrib/wpa/tests/hwsim/vm/uevent.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/vm/vm-run.sh b/contrib/wpa/tests/hwsim/vm/vm-run.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/w1fi_logo.png b/contrib/wpa/tests/hwsim/w1fi_logo.png
deleted file mode 100644
index ac7c259fff2e..000000000000
Binary files a/contrib/wpa/tests/hwsim/w1fi_logo.png and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/wlantest.py b/contrib/wpa/tests/hwsim/wlantest.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/wpasupplicant.py b/contrib/wpa/tests/hwsim/wpasupplicant.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/hwsim/wps-ctrl-cred b/contrib/wpa/tests/hwsim/wps-ctrl-cred
deleted file mode 100644
index b02b783b8b58..000000000000
Binary files a/contrib/wpa/tests/hwsim/wps-ctrl-cred and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/wps-ctrl-cred2 b/contrib/wpa/tests/hwsim/wps-ctrl-cred2
deleted file mode 100644
index 696a576f0012..000000000000
Binary files a/contrib/wpa/tests/hwsim/wps-ctrl-cred2 and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/wps-mixed-cred b/contrib/wpa/tests/hwsim/wps-mixed-cred
deleted file mode 100644
index fca2871fd210..000000000000
Binary files a/contrib/wpa/tests/hwsim/wps-mixed-cred and /dev/null differ
diff --git a/contrib/wpa/tests/hwsim/wps-wep-cred b/contrib/wpa/tests/hwsim/wps-wep-cred
deleted file mode 100644
index 407cf4143ba1..000000000000
Binary files a/contrib/wpa/tests/hwsim/wps-wep-cred and /dev/null differ
diff --git a/contrib/wpa/tests/remote/config.py b/contrib/wpa/tests/remote/config.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/remote/hwsim_wrapper.py b/contrib/wpa/tests/remote/hwsim_wrapper.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/remote/monitor.py b/contrib/wpa/tests/remote/monitor.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/remote/run-tests.py b/contrib/wpa/tests/remote/run-tests.py
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/remote/rutils.py b/contrib/wpa/tests/remote/rutils.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/remote/test_devices.py b/contrib/wpa/tests/remote/test_devices.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/remote/test_example.py b/contrib/wpa/tests/remote/test_example.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/remote/test_monitor.py b/contrib/wpa/tests/remote/test_monitor.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-aes.c b/contrib/wpa/tests/test-aes.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-base64.c b/contrib/wpa/tests/test-base64.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-https.c b/contrib/wpa/tests/test-https.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-https_server.c b/contrib/wpa/tests/test-https_server.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-list.c b/contrib/wpa/tests/test-list.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-md4.c b/contrib/wpa/tests/test-md4.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-milenage.c b/contrib/wpa/tests/test-milenage.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-rc4.c b/contrib/wpa/tests/test-rc4.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-rsa-sig-ver.c b/contrib/wpa/tests/test-rsa-sig-ver.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-sha1.c b/contrib/wpa/tests/test-sha1.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-sha256.c b/contrib/wpa/tests/test-sha256.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test-x509v3.c b/contrib/wpa/tests/test-x509v3.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test_x509v3_nist.sh b/contrib/wpa/tests/test_x509v3_nist.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/tests/test_x509v3_nist2.sh b/contrib/wpa/tests/test_x509v3_nist2.sh
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/.gitignore b/contrib/wpa/wlantest/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/Makefile b/contrib/wpa/wlantest/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/bip.c b/contrib/wpa/wlantest/bip.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/bss.c b/contrib/wpa/wlantest/bss.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/ccmp.c b/contrib/wpa/wlantest/ccmp.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/ctrl.c b/contrib/wpa/wlantest/ctrl.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/gcmp.c b/contrib/wpa/wlantest/gcmp.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/inject.c b/contrib/wpa/wlantest/inject.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/monitor.c b/contrib/wpa/wlantest/monitor.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/process.c b/contrib/wpa/wlantest/process.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/readpcap.c b/contrib/wpa/wlantest/readpcap.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/rx_data.c b/contrib/wpa/wlantest/rx_data.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/rx_eapol.c b/contrib/wpa/wlantest/rx_eapol.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/rx_ip.c b/contrib/wpa/wlantest/rx_ip.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/rx_mgmt.c b/contrib/wpa/wlantest/rx_mgmt.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/rx_tdls.c b/contrib/wpa/wlantest/rx_tdls.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/sta.c b/contrib/wpa/wlantest/sta.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/test_vectors.c b/contrib/wpa/wlantest/test_vectors.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/tkip.c b/contrib/wpa/wlantest/tkip.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/wep.c b/contrib/wpa/wlantest/wep.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/wired.c b/contrib/wpa/wlantest/wired.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/wlantest.c b/contrib/wpa/wlantest/wlantest.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/wlantest.h b/contrib/wpa/wlantest/wlantest.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/wlantest_cli.c b/contrib/wpa/wlantest/wlantest_cli.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/wlantest_ctrl.h b/contrib/wpa/wlantest/wlantest_ctrl.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wlantest/writepcap.c b/contrib/wpa/wlantest/writepcap.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpa_supplicant/bssid_ignore.c b/contrib/wpa/wpa_supplicant/bssid_ignore.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpa_supplicant/bssid_ignore.h b/contrib/wpa/wpa_supplicant/bssid_ignore.h
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpa_supplicant/examples/dpp-nfc.py b/contrib/wpa/wpa_supplicant/examples/dpp-nfc.py
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpa_supplicant/pasn_supplicant.c b/contrib/wpa/wpa_supplicant/pasn_supplicant.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpa_supplicant/robust_av.c b/contrib/wpa/wpa_supplicant/robust_av.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpa_supplicant/twt.c b/contrib/wpa/wpa_supplicant/twt.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpa_supplicant/wpa_gui-qt4/icons/.gitignore b/contrib/wpa/wpa_supplicant/wpa_gui-qt4/icons/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/.gitignore b/contrib/wpa/wpadebug/.gitignore
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/AndroidManifest.xml b/contrib/wpa/wpadebug/AndroidManifest.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/README b/contrib/wpa/wpadebug/README
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/build.xml b/contrib/wpa/wpadebug/build.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/project.properties b/contrib/wpa/wpadebug/project.properties
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/res/layout/cred_edit.xml b/contrib/wpa/wpadebug/res/layout/cred_edit.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/res/layout/input_uri.xml b/contrib/wpa/wpadebug/res/layout/input_uri.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/res/layout/main.xml b/contrib/wpa/wpadebug/res/layout/main.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/res/layout/qrcode.xml b/contrib/wpa/wpadebug/res/layout/qrcode.xml
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/res/raw/shell_commands.txt b/contrib/wpa/wpadebug/res/raw/shell_commands.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/res/raw/wpa_commands.txt b/contrib/wpa/wpadebug/res/raw/wpa_commands.txt
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/CommandListActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/CommandListActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/DisplayMessageActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/DisplayMessageActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/InputUri.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/InputUri.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/MainActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/MainActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/QrCodeDisplayActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/QrCodeDisplayActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/QrCodeReadActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/QrCodeReadActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/QrCodeScannerActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/QrCodeScannerActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WifiReceiver.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WifiReceiver.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaCommandListActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaCommandListActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaCredActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaCredActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaCredEditActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaCredEditActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaNfcActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaNfcActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaWebViewActivity.java b/contrib/wpa/wpadebug/src/w1/fi/wpadebug/WpaWebViewActivity.java
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpaspy/Makefile b/contrib/wpa/wpaspy/Makefile
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpaspy/setup.py b/contrib/wpa/wpaspy/setup.py
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpaspy/test.py b/contrib/wpa/wpaspy/test.py
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpaspy/wpaspy.c b/contrib/wpa/wpaspy/wpaspy.c
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/contrib/wpa/wpaspy/wpaspy.py b/contrib/wpa/wpaspy/wpaspy.py
deleted file mode 100644
index e69de29bb2d1..000000000000