From 0aad5de37cf518ab1d6cc7bc5d813c41e64ce9b8 Mon Sep 17 00:00:00 2001
From: Cy Schubert
Date: Sat, 17 Apr 2021 08:44:52 -0700
Subject: [PATCH] Revert wpa import.
b51f459a2098622c31ed54f5c1bf0e03efce403b resulted in a mismerge
due to having to do a remerge because my tree was over a week out of
date. Changes that were made to fix the build were lost in the remerge
resulting in build errors that were fixed a week ago.
---
contrib/wpa/.gitignore | 8 -
contrib/wpa/Android.mk | 10 -
contrib/wpa/build_release | 47 -
contrib/wpa/doc/.gitignore | 14 -
contrib/wpa/doc/Makefile | 42 -
contrib/wpa/doc/code_structure.doxygen | 315 -
contrib/wpa/doc/ctrl_iface.doxygen | 1054 --
contrib/wpa/doc/dbus.doxygen | 2394 ----
contrib/wpa/doc/directories.doxygen | 90 -
contrib/wpa/doc/doxygen.conf | 1547 ---
contrib/wpa/doc/driver_wrapper.doxygen | 180 -
contrib/wpa/doc/eap.doxygen | 87 -
contrib/wpa/doc/eap_server.doxygen | 56 -
contrib/wpa/doc/hostapd.fig | 264 -
contrib/wpa/doc/hostapd_ctrl_iface.doxygen | 66 -
contrib/wpa/doc/mainpage.doxygen | 95 -
contrib/wpa/doc/p2p.doxygen | 471 -
contrib/wpa/doc/p2p_arch.dot | 85 -
contrib/wpa/doc/p2p_arch2.dot | 85 -
contrib/wpa/doc/p2p_sm.dot | 62 -
contrib/wpa/doc/porting.doxygen | 209 -
contrib/wpa/doc/testing_tools.doxygen | 201 -
contrib/wpa/doc/wpa_supplicant.fig | 247 -
contrib/wpa/eap_example/.gitignore | 4 -
contrib/wpa/eap_example/Makefile | 119 -
contrib/wpa/eap_example/README | 42 -
contrib/wpa/eap_example/ca.pem | 55 -
contrib/wpa/eap_example/dh.conf | 5 -
contrib/wpa/eap_example/eap_example.c | 47 -
contrib/wpa/eap_example/eap_example_peer.c | 377 -
contrib/wpa/eap_example/eap_example_server.c | 300 -
contrib/wpa/eap_example/server-key.pem | 15 -
contrib/wpa/eap_example/server.key | 16 -
contrib/wpa/eap_example/server.pem | 64 -
contrib/wpa/hostapd/.gitignore | 5 -
contrib/wpa/hostapd/sae_pk_gen.c | 196 -
contrib/wpa/hs20/server/.gitignore | 1 -
contrib/wpa/hs20/server/Makefile | 42 -
contrib/wpa/hs20/server/ca/clean.sh | 13 -
contrib/wpa/hs20/server/ca/est-csrattrs.cnf | 17 -
contrib/wpa/hs20/server/ca/est-csrattrs.sh | 4 -
contrib/wpa/hs20/server/ca/hs20.oid | 7 -
contrib/wpa/hs20/server/ca/ocsp-req.sh | 11 -
.../wpa/hs20/server/ca/ocsp-responder-ica.sh | 3 -
contrib/wpa/hs20/server/ca/ocsp-responder.sh | 3 -
.../wpa/hs20/server/ca/ocsp-update-cache.sh | 11 -
contrib/wpa/hs20/server/ca/openssl-root.cnf | 125 -
contrib/wpa/hs20/server/ca/openssl.cnf | 200 -
contrib/wpa/hs20/server/ca/setup.sh | 209 -
contrib/wpa/hs20/server/hs20-osu-server.txt | 262 -
contrib/wpa/hs20/server/hs20_spp_server.c | 207 -
contrib/wpa/hs20/server/spp_server.c | 2933 -----
contrib/wpa/hs20/server/spp_server.h | 36 -
contrib/wpa/hs20/server/sql-example.txt | 17 -
contrib/wpa/hs20/server/sql.txt | 108 -
contrib/wpa/hs20/server/www/add-free.php | 50 -
contrib/wpa/hs20/server/www/add-mo.php | 56 -
contrib/wpa/hs20/server/www/cert-enroll.php | 39 -
contrib/wpa/hs20/server/www/config.php | 7 -
contrib/wpa/hs20/server/www/est.php | 232 -
.../wpa/hs20/server/www/free-remediation.php | 19 -
contrib/wpa/hs20/server/www/free.php | 23 -
contrib/wpa/hs20/server/www/redirect.php | 32 -
.../wpa/hs20/server/www/remediation-pw.php | 41 -
contrib/wpa/hs20/server/www/remediation.php | 55 -
contrib/wpa/hs20/server/www/signup.php | 59 -
contrib/wpa/hs20/server/www/spp.php | 168 -
contrib/wpa/hs20/server/www/terms.php | 87 -
contrib/wpa/hs20/server/www/users.php | 377 -
contrib/wpa/radius_example/.gitignore | 2 -
contrib/wpa/radius_example/Makefile | 28 -
contrib/wpa/radius_example/README | 35 -
contrib/wpa/radius_example/radius_example.c | 153 -
contrib/wpa/src/build.rules | 109 -
contrib/wpa/src/common/brcm_vendor.h | 156 -
contrib/wpa/src/common/dpp_auth.c | 1977 ---
contrib/wpa/src/common/dpp_backup.c | 1265 --
contrib/wpa/src/common/dpp_crypto.c | 3329 -----
contrib/wpa/src/common/dpp_i.h | 160 -
contrib/wpa/src/common/dpp_pkex.c | 1324 --
contrib/wpa/src/common/dpp_reconfig.c | 958 --
contrib/wpa/src/common/dpp_tcp.c | 1794 ---
contrib/wpa/src/common/ptksa_cache.c | 321 -
contrib/wpa/src/common/ptksa_cache.h | 79 -
contrib/wpa/src/common/sae_pk.c | 884 --
contrib/wpa/src/crypto/sha384-tlsprf.c | 71 -
contrib/wpa/src/eap_peer/.gitignore | 1 -
contrib/wpa/src/objs.mk | 3 -
contrib/wpa/src/utils/config.c | 97 -
contrib/wpa/src/utils/config.h | 29 -
contrib/wpa/src/utils/ext_password_file.c | 136 -
contrib/wpa/tests/.gitignore | 3 -
contrib/wpa/tests/Makefile | 99 -
contrib/wpa/tests/README | 123 -
.../wpa/tests/cipher-and-key-mgmt-testing.txt | 377 -
contrib/wpa/tests/fuzzing/README | 23 -
contrib/wpa/tests/fuzzing/ap-mgmt/.gitignore | 1 -
contrib/wpa/tests/fuzzing/ap-mgmt/Makefile | 44 -
contrib/wpa/tests/fuzzing/ap-mgmt/ap-mgmt.c | 167 -
contrib/wpa/tests/fuzzing/asn1/.gitignore | 1 -
contrib/wpa/tests/fuzzing/asn1/Makefile | 23 -
contrib/wpa/tests/fuzzing/asn1/asn1.c | 184 -
contrib/wpa/tests/fuzzing/build-test.sh | 19 -
contrib/wpa/tests/fuzzing/dpp-uri/.gitignore | 1 -
contrib/wpa/tests/fuzzing/dpp-uri/Makefile | 43 -
.../wpa/tests/fuzzing/dpp-uri/corpus/1.dat | 1 -
.../wpa/tests/fuzzing/dpp-uri/corpus/2.dat | 1 -
.../wpa/tests/fuzzing/dpp-uri/corpus/3.dat | 1 -
contrib/wpa/tests/fuzzing/dpp-uri/dpp-uri.c | 51 -
.../wpa/tests/fuzzing/eap-aka-peer/.gitignore | 1 -
.../wpa/tests/fuzzing/eap-aka-peer/Makefile | 26 -
.../tests/fuzzing/eap-aka-peer/eap-aka-peer.c | 131 -
.../fuzzing/eap-mschapv2-peer/.gitignore | 1 -
.../tests/fuzzing/eap-mschapv2-peer/Makefile | 25 -
.../eap-mschapv2-peer/eap-mschapv2-peer.c | 152 -
.../wpa/tests/fuzzing/eap-sim-peer/.gitignore | 1 -
.../wpa/tests/fuzzing/eap-sim-peer/Makefile | 26 -
.../tests/fuzzing/eap-sim-peer/eap-sim-peer.c | 125 -
.../tests/fuzzing/eapol-key-auth/.gitignore | 1 -
.../wpa/tests/fuzzing/eapol-key-auth/Makefile | 34 -
.../fuzzing/eapol-key-auth/eapol-key-auth.c | 328 -
.../tests/fuzzing/eapol-key-supp/.gitignore | 1 -
.../wpa/tests/fuzzing/eapol-key-supp/Makefile | 30 -
.../fuzzing/eapol-key-supp/eapol-key-supp.c | 331 -
.../wpa/tests/fuzzing/eapol-supp/.gitignore | 1 -
contrib/wpa/tests/fuzzing/eapol-supp/Makefile | 28 -
.../wpa/tests/fuzzing/eapol-supp/eapol-supp.c | 198 -
contrib/wpa/tests/fuzzing/fuzzer-common.c | 56 -
contrib/wpa/tests/fuzzing/fuzzer-common.h | 14 -
contrib/wpa/tests/fuzzing/json/.gitignore | 1 -
contrib/wpa/tests/fuzzing/json/Makefile | 23 -
contrib/wpa/tests/fuzzing/json/corpus/1.json | 1 -
contrib/wpa/tests/fuzzing/json/corpus/2.json | 1 -
contrib/wpa/tests/fuzzing/json/corpus/3.json | 1 -
contrib/wpa/tests/fuzzing/json/json.c | 38 -
contrib/wpa/tests/fuzzing/p2p/.gitignore | 1 -
contrib/wpa/tests/fuzzing/p2p/Makefile | 23 -
contrib/wpa/tests/fuzzing/p2p/p2p.c | 178 -
contrib/wpa/tests/fuzzing/rules.include | 31 -
contrib/wpa/tests/fuzzing/sae/.gitignore | 1 -
contrib/wpa/tests/fuzzing/sae/Makefile | 28 -
contrib/wpa/tests/fuzzing/sae/sae.c | 39 -
.../wpa/tests/fuzzing/tls-client/.gitignore | 1 -
contrib/wpa/tests/fuzzing/tls-client/Makefile | 32 -
.../wpa/tests/fuzzing/tls-client/tls-client.c | 154 -
.../wpa/tests/fuzzing/tls-server/.gitignore | 1 -
contrib/wpa/tests/fuzzing/tls-server/Makefile | 32 -
.../wpa/tests/fuzzing/tls-server/tls-server.c | 157 -
contrib/wpa/tests/fuzzing/wnm/.gitignore | 1 -
contrib/wpa/tests/fuzzing/wnm/Makefile | 60 -
contrib/wpa/tests/fuzzing/wnm/wnm.c | 99 -
contrib/wpa/tests/fuzzing/x509/.gitignore | 1 -
contrib/wpa/tests/fuzzing/x509/Makefile | 27 -
.../tests/fuzzing/x509/corpus/oss-fuzz-15408 | 1 -
contrib/wpa/tests/fuzzing/x509/x509.c | 25 -
contrib/wpa/tests/hwsim/.gitignore | 1 -
contrib/wpa/tests/hwsim/README | 220 -
contrib/wpa/tests/hwsim/auth_serv/as.conf | 27 -
contrib/wpa/tests/hwsim/auth_serv/as2.conf | 24 -
.../hwsim/auth_serv/ca-and-crl-expired.pem | 90 -
.../wpa/tests/hwsim/auth_serv/ca-and-crl.pem | 90 -
.../hwsim/auth_serv/ca-incorrect-key.pem | 28 -
.../tests/hwsim/auth_serv/ca-incorrect.pem | 79 -
contrib/wpa/tests/hwsim/auth_serv/ca-key.pem | 28 -
contrib/wpa/tests/hwsim/auth_serv/ca.pem | 79 -
contrib/wpa/tests/hwsim/auth_serv/dh.conf | 8 -
contrib/wpa/tests/hwsim/auth_serv/dh2.conf | 8 -
.../tests/hwsim/auth_serv/dh_param_3072.pem | 11 -
.../wpa/tests/hwsim/auth_serv/dsaparam.pem | 14 -
.../wpa/tests/hwsim/auth_serv/eap_user.conf | 167 -
.../tests/hwsim/auth_serv/eap_user_vlan.conf | 7 -
.../tests/hwsim/auth_serv/ec-ca-openssl.cnf | 111 -
contrib/wpa/tests/hwsim/auth_serv/ec-ca.key | 8 -
contrib/wpa/tests/hwsim/auth_serv/ec-ca.pem | 13 -
.../wpa/tests/hwsim/auth_serv/ec-generate.sh | 53 -
.../wpa/tests/hwsim/auth_serv/ec-server.key | 8 -
.../wpa/tests/hwsim/auth_serv/ec-server.pem | 53 -
contrib/wpa/tests/hwsim/auth_serv/ec-user.key | 8 -
contrib/wpa/tests/hwsim/auth_serv/ec-user.pem | 52 -
contrib/wpa/tests/hwsim/auth_serv/ec2-ca.key | 9 -
contrib/wpa/tests/hwsim/auth_serv/ec2-ca.pem | 15 -
.../wpa/tests/hwsim/auth_serv/ec2-generate.sh | 67 -
.../wpa/tests/hwsim/auth_serv/ec2-server.key | 9 -
.../wpa/tests/hwsim/auth_serv/ec2-server.pem | 58 -
.../tests/hwsim/auth_serv/ec2-user-p256.key | 8 -
.../tests/hwsim/auth_serv/ec2-user-p256.pem | 56 -
.../wpa/tests/hwsim/auth_serv/ec2-user.key | 9 -
.../wpa/tests/hwsim/auth_serv/ec2-user.pem | 57 -
.../wpa/tests/hwsim/auth_serv/hlr_auc_gw.gsm | 17 -
.../hwsim/auth_serv/hlr_auc_gw.milenage_db | 16 -
.../auth_serv/iCA-server/ca-and-root.pem | 160 -
.../hwsim/auth_serv/iCA-server/cacert.pem | 81 -
.../hwsim/auth_serv/iCA-server/careq.pem | 16 -
.../hwsim/auth_serv/iCA-server/index.txt | 2 -
.../hwsim/auth_serv/iCA-server/index.txt.attr | 1 -
.../auth_serv/iCA-server/private/cakey.pem | 28 -
.../tests/hwsim/auth_serv/iCA-server/serial | 1 -
.../auth_serv/iCA-server/server-revoked.key | 28 -
.../auth_serv/iCA-server/server-revoked.pem | 86 -
.../auth_serv/iCA-server/server-revoked.req | 16 -
.../iCA-server/server-revoked_and_ica.pem | 167 -
.../hwsim/auth_serv/iCA-server/server.key | 28 -
.../hwsim/auth_serv/iCA-server/server.pem | 86 -
.../hwsim/auth_serv/iCA-server/server.req | 16 -
.../auth_serv/iCA-server/server_and_ica.pem | 167 -
.../hwsim/auth_serv/iCA-user/ca-and-root.pem | 160 -
.../tests/hwsim/auth_serv/iCA-user/cacert.pem | 81 -
.../tests/hwsim/auth_serv/iCA-user/careq.pem | 16 -
.../tests/hwsim/auth_serv/iCA-user/index.txt | 1 -
.../hwsim/auth_serv/iCA-user/index.txt.attr | 1 -
.../auth_serv/iCA-user/private/cakey.pem | 28 -
.../wpa/tests/hwsim/auth_serv/iCA-user/serial | 1 -
.../tests/hwsim/auth_serv/iCA-user/user.key | 28 -
.../tests/hwsim/auth_serv/iCA-user/user.pem | 85 -
.../tests/hwsim/auth_serv/iCA-user/user.req | 16 -
.../hwsim/auth_serv/iCA-user/user_and_ica.pem | 166 -
.../wpa/tests/hwsim/auth_serv/ica-generate.sh | 87 -
.../tests/hwsim/auth_serv/index-revoked.txt | 8 -
.../tests/hwsim/auth_serv/index-unknown.txt | 1 -
contrib/wpa/tests/hwsim/auth_serv/index.txt | 8 -
.../tests/hwsim/auth_serv/ocsp-responder.csr | 16 -
.../tests/hwsim/auth_serv/ocsp-responder.key | 28 -
.../tests/hwsim/auth_serv/ocsp-responder.pem | 76 -
.../wpa/tests/hwsim/auth_serv/openssl2.cnf | 147 -
.../tests/hwsim/auth_serv/radius_clients.conf | 1 -
.../hwsim/auth_serv/radius_clients_ipv6.conf | 1 -
.../hwsim/auth_serv/radius_clients_none.conf | 4 -
.../tests/hwsim/auth_serv/rootCA/index.txt | 6 -
.../hwsim/auth_serv/rootCA/index.txt.attr | 1 -
.../wpa/tests/hwsim/auth_serv/rootCA/serial | 1 -
.../wpa/tests/hwsim/auth_serv/rsa3072-ca.key | 40 -
.../wpa/tests/hwsim/auth_serv/rsa3072-ca.pem | 27 -
.../tests/hwsim/auth_serv/rsa3072-generate.sh | 83 -
.../tests/hwsim/auth_serv/rsa3072-server.key | 40 -
.../tests/hwsim/auth_serv/rsa3072-server.pem | 106 -
.../tests/hwsim/auth_serv/rsa3072-server.req | 22 -
.../hwsim/auth_serv/rsa3072-user-rsa2048.key | 28 -
.../hwsim/auth_serv/rsa3072-user-rsa2048.pem | 96 -
.../hwsim/auth_serv/rsa3072-user-rsa2048.req | 16 -
.../tests/hwsim/auth_serv/rsa3072-user.key | 40 -
.../tests/hwsim/auth_serv/rsa3072-user.pem | 106 -
.../tests/hwsim/auth_serv/rsa3072-user.req | 21 -
.../tests/hwsim/auth_serv/server-certpol.csr | 22 -
.../tests/hwsim/auth_serv/server-certpol.key | 40 -
.../tests/hwsim/auth_serv/server-certpol.pem | 102 -
.../tests/hwsim/auth_serv/server-certpol2.csr | 22 -
.../tests/hwsim/auth_serv/server-certpol2.key | 40 -
.../tests/hwsim/auth_serv/server-certpol2.pem | 102 -
.../auth_serv/server-eku-client-server.csr | 16 -
.../auth_serv/server-eku-client-server.key | 28 -
.../auth_serv/server-eku-client-server.pem | 85 -
.../hwsim/auth_serv/server-eku-client.csr | 16 -
.../hwsim/auth_serv/server-eku-client.key | 28 -
.../hwsim/auth_serv/server-eku-client.pem | 85 -
.../tests/hwsim/auth_serv/server-expired.csr | 16 -
.../tests/hwsim/auth_serv/server-expired.key | 28 -
.../tests/hwsim/auth_serv/server-expired.pem | 85 -
.../hwsim/auth_serv/server-long-duration.csr | 27 -
.../hwsim/auth_serv/server-long-duration.key | 52 -
.../hwsim/auth_serv/server-long-duration.pem | 107 -
.../hwsim/auth_serv/server-no-dnsname.csr | 16 -
.../hwsim/auth_serv/server-no-dnsname.key | 28 -
.../hwsim/auth_serv/server-no-dnsname.pem | 85 -
contrib/wpa/tests/hwsim/auth_serv/server.csr | 16 -
contrib/wpa/tests/hwsim/auth_serv/server.key | 28 -
contrib/wpa/tests/hwsim/auth_serv/server.pem | 87 -
.../tests/hwsim/auth_serv/sha384-server.key | 40 -
.../tests/hwsim/auth_serv/sha384-server.pem | 115 -
.../wpa/tests/hwsim/auth_serv/sha384-user.key | 38 -
.../wpa/tests/hwsim/auth_serv/sha384-user.pem | 113 -
.../wpa/tests/hwsim/auth_serv/sha512-ca.key | 52 -
.../wpa/tests/hwsim/auth_serv/sha512-ca.pem | 32 -
.../tests/hwsim/auth_serv/sha512-generate.sh | 75 -
.../tests/hwsim/auth_serv/sha512-server.key | 45 -
.../tests/hwsim/auth_serv/sha512-server.pem | 120 -
.../wpa/tests/hwsim/auth_serv/sha512-user.key | 44 -
.../wpa/tests/hwsim/auth_serv/sha512-user.pem | 119 -
contrib/wpa/tests/hwsim/auth_serv/update.sh | 181 -
contrib/wpa/tests/hwsim/auth_serv/user.csr | 16 -
contrib/wpa/tests/hwsim/auth_serv/user.key | 28 -
.../wpa/tests/hwsim/auth_serv/user.key.pkcs8 | 30 -
.../hwsim/auth_serv/user.key.pkcs8.pkcs5v15 | 29 -
contrib/wpa/tests/hwsim/auth_serv/user.pem | 85 -
.../wpa/tests/hwsim/auth_serv/user.rsa-key | 27 -
contrib/wpa/tests/hwsim/build.sh | 83 -
contrib/wpa/tests/hwsim/check_kernel.py | 31 -
contrib/wpa/tests/hwsim/devdetail.xml | 47 -
contrib/wpa/tests/hwsim/devinfo.xml | 7 -
contrib/wpa/tests/hwsim/dictionary.radius | 20 -
.../wpa/tests/hwsim/example-hostapd.config | 116 -
contrib/wpa/tests/hwsim/example-setup.txt | 191 -
.../tests/hwsim/example-wpa_supplicant.config | 160 -
contrib/wpa/tests/hwsim/fst_module_aux.py | 832 --
contrib/wpa/tests/hwsim/fst_test_common.py | 97 -
contrib/wpa/tests/hwsim/hostapd.py | 882 --
contrib/wpa/tests/hwsim/hostapd.vlan | 2 -
contrib/wpa/tests/hwsim/hostapd.vlan2 | 3 -
contrib/wpa/tests/hwsim/hostapd.wlan3.vlan | 2 -
contrib/wpa/tests/hwsim/hostapd.wlan4.vlan | 2 -
contrib/wpa/tests/hwsim/hostapd.wpa_psk | 5 -
contrib/wpa/tests/hwsim/hwsim.py | 114 -
contrib/wpa/tests/hwsim/hwsim_utils.py | 246 -
contrib/wpa/tests/hwsim/multi-bss-acs.conf | 28 -
.../hwsim/multi-bss-iface-per_sta_vif.conf | 42 -
contrib/wpa/tests/hwsim/multi-bss-iface.conf | 40 -
contrib/wpa/tests/hwsim/multi-bss.conf | 21 -
contrib/wpa/tests/hwsim/netlink.py | 237 -
contrib/wpa/tests/hwsim/nl80211.py | 357 -
contrib/wpa/tests/hwsim/owe-bss-1.conf | 12 -
contrib/wpa/tests/hwsim/owe-bss-2.conf | 16 -
contrib/wpa/tests/hwsim/p2p0.conf | 3 -
contrib/wpa/tests/hwsim/p2p1.conf | 3 -
contrib/wpa/tests/hwsim/p2p2.conf | 3 -
contrib/wpa/tests/hwsim/p2p_utils.py | 394 -
contrib/wpa/tests/hwsim/pps-mo-1.xml | 62 -
contrib/wpa/tests/hwsim/radius_das.py | 47 -
contrib/wpa/tests/hwsim/remotehost.py | 258 -
contrib/wpa/tests/hwsim/rfkill.py | 152 -
contrib/wpa/tests/hwsim/run-all.sh | 162 -
contrib/wpa/tests/hwsim/run-tests.py | 692 -
contrib/wpa/tests/hwsim/start.sh | 213 -
contrib/wpa/tests/hwsim/stop.sh | 80 -
contrib/wpa/tests/hwsim/test_ap_acs.py | 688 -
contrib/wpa/tests/hwsim/test_ap_ciphers.py | 1200 --
contrib/wpa/tests/hwsim/test_ap_config.py | 581 -
contrib/wpa/tests/hwsim/test_ap_csa.py | 189 -
contrib/wpa/tests/hwsim/test_ap_dynamic.py | 586 -
contrib/wpa/tests/hwsim/test_ap_eap.py | 7492 -----------
contrib/wpa/tests/hwsim/test_ap_ft.py | 3461 -----
contrib/wpa/tests/hwsim/test_ap_hs20.py | 6496 ----------
contrib/wpa/tests/hwsim/test_ap_ht.py | 1644 ---
contrib/wpa/tests/hwsim/test_ap_mixed.py | 101 -
contrib/wpa/tests/hwsim/test_ap_open.py | 1017 --
contrib/wpa/tests/hwsim/test_ap_params.py | 972 --
contrib/wpa/tests/hwsim/test_ap_pmf.py | 1204 --
contrib/wpa/tests/hwsim/test_ap_psk.py | 3553 ------
contrib/wpa/tests/hwsim/test_ap_qosmap.py | 169 -
contrib/wpa/tests/hwsim/test_ap_roam.py | 395 -
contrib/wpa/tests/hwsim/test_ap_tdls.py | 652 -
contrib/wpa/tests/hwsim/test_ap_track.py | 437 -
contrib/wpa/tests/hwsim/test_ap_vht.py | 1333 --
contrib/wpa/tests/hwsim/test_ap_vlan.py | 807 --
contrib/wpa/tests/hwsim/test_ap_wps.py | 10568 ----------------
contrib/wpa/tests/hwsim/test_authsrv.py | 262 -
contrib/wpa/tests/hwsim/test_autoscan.py | 81 -
contrib/wpa/tests/hwsim/test_bgscan.py | 315 -
contrib/wpa/tests/hwsim/test_cert_check.py | 312 -
contrib/wpa/tests/hwsim/test_cfg80211.py | 150 -
contrib/wpa/tests/hwsim/test_connect_cmd.py | 235 -
contrib/wpa/tests/hwsim/test_dbus.py | 6093 ---------
contrib/wpa/tests/hwsim/test_dfs.py | 767 --
contrib/wpa/tests/hwsim/test_dpp.py | 6874 ----------
contrib/wpa/tests/hwsim/test_eap.py | 602 -
contrib/wpa/tests/hwsim/test_eap_proto.py | 10377 ---------------
contrib/wpa/tests/hwsim/test_erp.py | 741 --
contrib/wpa/tests/hwsim/test_ext_password.py | 112 -
contrib/wpa/tests/hwsim/test_fils.py | 2411 ----
contrib/wpa/tests/hwsim/test_fst_config.py | 553 -
contrib/wpa/tests/hwsim/test_fst_module.py | 2825 -----
contrib/wpa/tests/hwsim/test_gas.py | 2053 ---
contrib/wpa/tests/hwsim/test_hapd_ctrl.py | 1071 --
contrib/wpa/tests/hwsim/test_he.py | 1188 --
contrib/wpa/tests/hwsim/test_hostapd_oom.py | 173 -
contrib/wpa/tests/hwsim/test_hs20_filter.py | 205 -
contrib/wpa/tests/hwsim/test_hs20_pps_mo.py | 43 -
contrib/wpa/tests/hwsim/test_ibss.py | 601 -
contrib/wpa/tests/hwsim/test_ieee8021x.py | 531 -
contrib/wpa/tests/hwsim/test_kernel.py | 128 -
contrib/wpa/tests/hwsim/test_macsec.py | 890 --
contrib/wpa/tests/hwsim/test_mbo.py | 613 -
contrib/wpa/tests/hwsim/test_module_tests.py | 28 -
.../wpa/tests/hwsim/test_monitor_interface.py | 94 -
contrib/wpa/tests/hwsim/test_mscs.py | 231 -
contrib/wpa/tests/hwsim/test_multi_ap.py | 363 -
contrib/wpa/tests/hwsim/test_nfc_p2p.py | 848 --
contrib/wpa/tests/hwsim/test_nfc_wps.py | 709 --
contrib/wpa/tests/hwsim/test_oce.py | 185 -
contrib/wpa/tests/hwsim/test_ocv.py | 1247 --
contrib/wpa/tests/hwsim/test_offchannel_tx.py | 50 -
contrib/wpa/tests/hwsim/test_owe.py | 928 --
contrib/wpa/tests/hwsim/test_p2p_autogo.py | 936 --
contrib/wpa/tests/hwsim/test_p2p_channel.py | 1384 --
.../wpa/tests/hwsim/test_p2p_concurrency.py | 286 -
contrib/wpa/tests/hwsim/test_p2p_device.py | 552 -
contrib/wpa/tests/hwsim/test_p2p_discovery.py | 871 --
contrib/wpa/tests/hwsim/test_p2p_ext.py | 384 -
contrib/wpa/tests/hwsim/test_p2p_grpform.py | 1185 --
.../wpa/tests/hwsim/test_p2p_invitation.py | 195 -
contrib/wpa/tests/hwsim/test_p2p_messages.py | 2143 ----
.../wpa/tests/hwsim/test_p2p_persistent.py | 676 -
contrib/wpa/tests/hwsim/test_p2p_service.py | 586 -
contrib/wpa/tests/hwsim/test_p2p_set.py | 128 -
.../wpa/tests/hwsim/test_p2p_wifi_display.py | 475 -
contrib/wpa/tests/hwsim/test_p2ps.py | 1689 ---
contrib/wpa/tests/hwsim/test_pasn.py | 850 --
contrib/wpa/tests/hwsim/test_pmksa_cache.py | 1267 --
contrib/wpa/tests/hwsim/test_radio_work.py | 133 -
contrib/wpa/tests/hwsim/test_radius.py | 1710 ---
contrib/wpa/tests/hwsim/test_rfkill.py | 242 -
contrib/wpa/tests/hwsim/test_rrm.py | 2142 ----
contrib/wpa/tests/hwsim/test_sae.py | 2722 ----
contrib/wpa/tests/hwsim/test_sae_pk.py | 462 -
contrib/wpa/tests/hwsim/test_scan.py | 2025 ---
contrib/wpa/tests/hwsim/test_sigma_dut.py | 5264 --------
contrib/wpa/tests/hwsim/test_ssid.py | 127 -
contrib/wpa/tests/hwsim/test_sta_dynamic.py | 329 -
contrib/wpa/tests/hwsim/test_suite_b.py | 739 --
contrib/wpa/tests/hwsim/test_tnc.py | 194 -
contrib/wpa/tests/hwsim/test_wep.py | 172 -
contrib/wpa/tests/hwsim/test_wext.py | 254 -
contrib/wpa/tests/hwsim/test_wmediumd.py | 480 -
contrib/wpa/tests/hwsim/test_wnm.py | 1984 ---
contrib/wpa/tests/hwsim/test_wpas_ap.py | 905 --
contrib/wpa/tests/hwsim/test_wpas_config.py | 656 -
contrib/wpa/tests/hwsim/test_wpas_ctrl.py | 2159 ----
contrib/wpa/tests/hwsim/test_wpas_mesh.py | 2534 ----
contrib/wpa/tests/hwsim/test_wpas_wmm_ac.py | 400 -
contrib/wpa/tests/hwsim/tnc/.gitignore | 4 -
contrib/wpa/tests/hwsim/tnc/Makefile | 23 -
contrib/wpa/tests/hwsim/tnc/hostap2_imc.c | 183 -
contrib/wpa/tests/hwsim/tnc/hostap2_imv.c | 203 -
contrib/wpa/tests/hwsim/tnc/hostap_imc.c | 72 -
contrib/wpa/tests/hwsim/tnc/hostap_imv.c | 66 -
contrib/wpa/tests/hwsim/tnc/tnc_config | 4 -
contrib/wpa/tests/hwsim/tshark.py | 124 -
contrib/wpa/tests/hwsim/utils.py | 314 -
contrib/wpa/tests/hwsim/vm/.gitignore | 1 -
contrib/wpa/tests/hwsim/vm/README | 80 -
contrib/wpa/tests/hwsim/vm/bisect-run.sh | 43 -
contrib/wpa/tests/hwsim/vm/build-codecov.sh | 57 -
contrib/wpa/tests/hwsim/vm/combine-codecov.sh | 39 -
contrib/wpa/tests/hwsim/vm/dbus.conf | 34 -
.../wpa/tests/hwsim/vm/example-vm-setup.txt | 95 -
contrib/wpa/tests/hwsim/vm/inside.sh | 169 -
contrib/wpa/tests/hwsim/vm/kernel-config | 175 -
contrib/wpa/tests/hwsim/vm/kernel-config.uml | 131 -
contrib/wpa/tests/hwsim/vm/parallel-vm.py | 669 -
contrib/wpa/tests/hwsim/vm/process-codecov.sh | 36 -
contrib/wpa/tests/hwsim/vm/uevent.sh | 9 -
contrib/wpa/tests/hwsim/vm/vm-run.sh | 202 -
contrib/wpa/tests/hwsim/wlantest.py | 277 -
contrib/wpa/tests/hwsim/wpasupplicant.py | 1649 ---
contrib/wpa/tests/remote/config.py | 87 -
contrib/wpa/tests/remote/hwsim_wrapper.py | 126 -
contrib/wpa/tests/remote/monitor.py | 193 -
contrib/wpa/tests/remote/run-tests.py | 408 -
contrib/wpa/tests/remote/rutils.py | 567 -
contrib/wpa/tests/remote/test_devices.py | 124 -
contrib/wpa/tests/remote/test_example.py | 141 -
contrib/wpa/tests/remote/test_monitor.py | 52 -
contrib/wpa/tests/test-aes.c | 624 -
contrib/wpa/tests/test-base64.c | 42 -
contrib/wpa/tests/test-https.c | 225 -
contrib/wpa/tests/test-https_server.c | 275 -
contrib/wpa/tests/test-list.c | 72 -
contrib/wpa/tests/test-md4.c | 93 -
contrib/wpa/tests/test-milenage.c | 814 --
contrib/wpa/tests/test-rc4.c | 250 -
contrib/wpa/tests/test-rsa-sig-ver.c | 206 -
contrib/wpa/tests/test-sha1.c | 119 -
contrib/wpa/tests/test-sha256.c | 119 -
contrib/wpa/tests/test-x509v3.c | 62 -
contrib/wpa/tests/test_x509v3_nist.sh | 144 -
contrib/wpa/tests/test_x509v3_nist2.sh | 177 -
contrib/wpa/wlantest/.gitignore | 4 -
contrib/wpa/wlantest/Makefile | 87 -
contrib/wpa/wlantest/bip.c | 133 -
contrib/wpa/wlantest/bss.c | 373 -
contrib/wpa/wlantest/ccmp.c | 367 -
contrib/wpa/wlantest/ctrl.c | 1471 ---
contrib/wpa/wlantest/gcmp.c | 160 -
contrib/wpa/wlantest/inject.c | 341 -
contrib/wpa/wlantest/monitor.c | 172 -
contrib/wpa/wlantest/process.c | 409 -
contrib/wpa/wlantest/readpcap.c | 190 -
contrib/wpa/wlantest/rx_data.c | 904 --
contrib/wpa/wlantest/rx_eapol.c | 1317 --
contrib/wpa/wlantest/rx_ip.c | 184 -
contrib/wpa/wlantest/rx_mgmt.c | 2642 ----
contrib/wpa/wlantest/rx_tdls.c | 618 -
contrib/wpa/wlantest/sta.c | 232 -
contrib/wpa/wlantest/test_vectors.c | 937 --
contrib/wpa/wlantest/tkip.c | 428 -
contrib/wpa/wlantest/wep.c | 104 -
contrib/wpa/wlantest/wired.c | 295 -
contrib/wpa/wlantest/wlantest.c | 505 -
contrib/wpa/wlantest/wlantest.h | 336 -
contrib/wpa/wlantest/wlantest_cli.c | 1865 ---
contrib/wpa/wlantest/wlantest_ctrl.h | 171 -
contrib/wpa/wlantest/writepcap.c | 373 -
contrib/wpa/wpa_supplicant/bssid_ignore.c | 221 -
contrib/wpa/wpa_supplicant/bssid_ignore.h | 33 -
.../wpa/wpa_supplicant/examples/dpp-nfc.py | 1186 --
contrib/wpa/wpa_supplicant/pasn_supplicant.c | 1710 ---
contrib/wpa/wpa_supplicant/robust_av.c | 155 -
contrib/wpa/wpa_supplicant/twt.c | 142 -
.../wpa_gui-qt4/icons/.gitignore | 2 -
contrib/wpa/wpadebug/.gitignore | 4 -
contrib/wpa/wpadebug/AndroidManifest.xml | 86 -
contrib/wpa/wpadebug/README | 78 -
contrib/wpa/wpadebug/build.xml | 17 -
contrib/wpa/wpadebug/project.properties | 2 -
contrib/wpa/wpadebug/res/layout/cred_edit.xml | 117 -
contrib/wpa/wpadebug/res/layout/input_uri.xml | 26 -
contrib/wpa/wpadebug/res/layout/main.xml | 160 -
contrib/wpa/wpadebug/res/layout/qrcode.xml | 13 -
.../wpa/wpadebug/res/raw/shell_commands.txt | 2 -
contrib/wpa/wpadebug/res/raw/wpa_commands.txt | 9 -
.../w1/fi/wpadebug/CommandListActivity.java | 130 -
.../fi/wpadebug/DisplayMessageActivity.java | 49 -
.../wpadebug/src/w1/fi/wpadebug/InputUri.java | 108 -
.../src/w1/fi/wpadebug/MainActivity.java | 209 -
.../w1/fi/wpadebug/QrCodeDisplayActivity.java | 109 -
.../w1/fi/wpadebug/QrCodeReadActivity.java | 40 -
.../w1/fi/wpadebug/QrCodeScannerActivity.java | 82 -
.../src/w1/fi/wpadebug/WifiReceiver.java | 95 -
.../fi/wpadebug/WpaCommandListActivity.java | 112 -
.../src/w1/fi/wpadebug/WpaCredActivity.java | 263 -
.../w1/fi/wpadebug/WpaCredEditActivity.java | 55 -
.../src/w1/fi/wpadebug/WpaNfcActivity.java | 131 -
.../w1/fi/wpadebug/WpaWebViewActivity.java | 146 -
contrib/wpa/wpaspy/Makefile | 15 -
contrib/wpa/wpaspy/setup.py | 22 -
contrib/wpa/wpaspy/test.py | 82 -
contrib/wpa/wpaspy/wpaspy.c | 245 -
contrib/wpa/wpaspy/wpaspy.py | 149 -
usr.sbin/wpa/Makefile.inc | 1 -
usr.sbin/wpa/hostapd/Makefile | 2 +
usr.sbin/wpa/hostapd_cli/Makefile | 3 +-
usr.sbin/wpa/wpa_cli/Makefile | 9 +-
usr.sbin/wpa/wpa_passphrase/Makefile | 3 +-
usr.sbin/wpa/wpa_priv/Makefile | 1 +
usr.sbin/wpa/wpa_supplicant/Makefile | 13 +-
533 files changed, 24 insertions(+), 200748 deletions(-)
diff --git a/contrib/wpa/.gitignore b/contrib/wpa/.gitignore
index b064303ced30..e69de29bb2d1 100644
--- a/contrib/wpa/.gitignore
+++ b/contrib/wpa/.gitignore
@@ -1,8 +0,0 @@
-*.pyc
-*~
-tests/hwsim/logs
-tests/remote/logs
-wpaspy/build
-**/parallel-vm.log
-tags
-build/
diff --git a/contrib/wpa/Android.mk b/contrib/wpa/Android.mk
index bd7a4097444b..e69de29bb2d1 100644
--- a/contrib/wpa/Android.mk
+++ b/contrib/wpa/Android.mk
@@ -1,10 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-ifneq ($(filter VER_0_8_X VER_2_1_DEVEL,$(WPA_SUPPLICANT_VERSION)),)
-# The order of the 2 Android.mks does matter!
-# TODO: Clean up the Android.mks, reset all the temporary variables at the
-# end of each Android.mk, so that one Android.mk doesn't depend on variables
-# set up in the other Android.mk.
-include $(LOCAL_PATH)/hostapd/Android.mk \
- $(LOCAL_PATH)/wpa_supplicant/Android.mk
-endif
diff --git a/contrib/wpa/build_release b/contrib/wpa/build_release
index 3aa9bf31963a..e69de29bb2d1 100755
--- a/contrib/wpa/build_release
+++ b/contrib/wpa/build_release
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ -z "$1" ]; then
- echo "build_release "
- exit 1
-fi
-
-TMP=tmp.build_release
-RELDIR=`pwd`/Release
-VER=$1
-NOW=`date +%Y-%m-%d`
-
-echo "Version: $VER - $NOW"
-
-DATEw=`head -n 3 wpa_supplicant/ChangeLog | tail -n 1 | sed "s/ .*//"`
-DATEh=`head -n 3 hostapd/ChangeLog | tail -n 1 | sed "s/ .*//"`
-
-if [ "$DATEw" != "$NOW" -o "$DATEh" != "$NOW" ]; then
- echo "NOTE! Date mismatch in ChangeLog: wpa_supplicant $DATEw hostapd $DATEh != $NOW"
-fi
-
-if [ -r $TMP ]; then
- echo "Temporary directory '$TMP' exists. Remove it before running this."
- exit 1
-fi
-
-mkdir $TMP
-mkdir -p $RELDIR
-
-git archive --format=tar --prefix=wpa-$VER/ HEAD \
- README COPYING CONTRIBUTIONS src wpa_supplicant hostapd hs20 |
- gzip > $RELDIR/wpa-$VER.tar.gz
-git archive --format=tar --prefix=hostapd-$VER/ HEAD \
- README COPYING CONTRIBUTIONS src hostapd |
- gzip > $RELDIR/hostapd-$VER.tar.gz
-git archive --format=tar --prefix=wpa_supplicant-$VER/ HEAD \
- README COPYING CONTRIBUTIONS src wpa_supplicant hs20/client |
- tar --directory=$TMP -xf -
-
-cd $TMP
-make -C wpa_supplicant-$VER/wpa_supplicant/doc/docbook man
-rm -f wpa_supplicant-$VER/wpa_supplicant/doc/docbook/manpage.{links,refs}
-tar czf $RELDIR/wpa_supplicant-$VER.tar.gz wpa_supplicant-$VER
-cd ..
-rm -r $TMP
diff --git a/contrib/wpa/doc/.gitignore b/contrib/wpa/doc/.gitignore
index 28c3fe4e99c3..e69de29bb2d1 100644
--- a/contrib/wpa/doc/.gitignore
+++ b/contrib/wpa/doc/.gitignore
@@ -1,14 +0,0 @@
-doxygen.warnings
-hostapd.eps
-hostapd.png
-html
-latex
-p2p_arch.eps
-p2p_arch.png
-p2p_arch2.eps
-p2p_arch2.png
-p2p_sm.eps
-p2p_sm.png
-wpa_supplicant.eps
-wpa_supplicant.png
-wpa_supplicant-devel.pdf
diff --git a/contrib/wpa/doc/Makefile b/contrib/wpa/doc/Makefile
index 62af04a74f1f..e69de29bb2d1 100644
--- a/contrib/wpa/doc/Makefile
+++ b/contrib/wpa/doc/Makefile
@@ -1,42 +0,0 @@
-all: docs
-
-%.eps: %.fig
- fig2dev -L eps $*.fig $*.eps
-
-%.png: %.fig
- fig2dev -L png -m 3 $*.fig | pngtopnm | pnmscale 0.4 | pnmtopng \
- > $*.png
-
-%.png: %.dot
- dot $*.dot -Tpng -o $*.png
-
-%.eps: %.dot
- dot $*.dot -Tps -o $*.eps
-
-_wpa_supplicant.png: wpa_supplicant.png
- cp $< $@
-
-_wpa_supplicant.eps: wpa_supplicant.eps
- cp $< $@
-
-docs-pics: wpa_supplicant.png wpa_supplicant.eps hostapd.png hostapd.eps p2p_sm.png p2p_sm.eps p2p_arch.png p2p_arch.eps p2p_arch2.png p2p_arch2.eps _wpa_supplicant.png _wpa_supplicant.eps
-
-docs: docs-pics
- (cd ..; doxygen doc/doxygen.conf; cd doc)
- $(MAKE) -C latex
- cp latex/refman.pdf wpa_supplicant-devel.pdf
-
-html: docs-pics
- (cd ..; doxygen doc/doxygen.conf; cd doc)
-
-clean:
- rm -f *~
- rm -f wpa_supplicant.eps wpa_supplicant.png
- rm -f _wpa_supplicant.png _wpa_supplicant.eps
- rm -f hostapd.eps hostapd.png
- rm -f p2p_sm.eps p2p_sm.png
- rm -f p2p_arch.eps p2p_arch.png
- rm -f p2p_arch2.eps p2p_arch2.png
- rm -f doxygen.warnings
- rm -rf html latex
- rm -f wpa_supplicant-devel.pdf
diff --git a/contrib/wpa/doc/code_structure.doxygen b/contrib/wpa/doc/code_structure.doxygen
index 454f179753d3..e69de29bb2d1 100644
--- a/contrib/wpa/doc/code_structure.doxygen
+++ b/contrib/wpa/doc/code_structure.doxygen
@@ -1,315 +0,0 @@
-/**
-\page code_structure Structure of the source code
-
-[ \ref _wpa_supplicant_core "wpa_supplicant core functionality" |
-\ref generic_helper_func "Generic helper functions" |
-\ref crypto_func "Cryptographic functions" |
-\ref tls_func "TLS library" |
-\ref configuration "Configuration" |
-\ref ctrl_iface "Control interface" |
-\ref wpa_code "WPA supplicant" |
-\ref eap_peer "EAP peer" |
-\ref eapol_supp "EAPOL supplicant" |
-\ref win_port "Windows port" |
-\ref test_programs "Test programs" ]
-
-wpa_supplicant implementation is divided into number of independent
-modules. Core code includes functionality for controlling the network
-selection, association, and configuration. Independent modules include
-WPA code (key handshake, PMKSA caching, pre-authentication), EAPOL
-state machine, and EAP state machine and methods. In addition, there
-are number of separate files for generic helper functions.
-
-Both WPA and EAPOL/EAP state machines can be used separately in other
-programs than wpa_supplicant. As an example, the included test
-programs eapol_test and preauth_test are using these modules.
-
-\ref driver_wrapper "Driver interface API" is defined in \ref driver.h and
-all hardware/driver dependent functionality is implemented in
-driver_*.c.
-
-
-\section _wpa_supplicant_core wpa_supplicant core functionality
-
-\ref wpa_supplicant.c
- Program initialization, main control loop
-
-\ref wpa_supplicant/main.c
- main() for UNIX-like operating systems and MinGW (Windows); this
- uses command line arguments to configure wpa_supplicant
-
-\ref events.c
- Driver event processing; \ref wpa_supplicant_event() and related functions
-
-\ref wpa_supplicant_i.h
- Internal definitions for wpa_supplicant core; should not be
- included into independent modules
-
-
-\section generic_helper_func Generic helper functions
-
-wpa_supplicant uses generic helper functions some of which are shared
-with with hostapd. The following C files are currently used:
-
-\ref eloop.c and \ref eloop.h
- Event loop (select() loop with registerable timeouts, socket read
- callbacks, and signal callbacks)
-
-\ref common.c and \ref common.h
- Common helper functions
-
-\ref defs.h
- Definitions shared by multiple files
-
-\ref l2_packet.h, \ref l2_packet_linux.c, and \ref l2_packet_pcap.c
- Layer 2 (link) access wrapper (includes native Linux implementation
- and wrappers for libdnet/libpcap). A new l2_packet implementation
- may need to be added when porting to new operating systems that are
- not supported by libdnet/libpcap. Makefile can be used to select which
- l2_packet implementation is included. \ref l2_packet_linux.c uses Linux
- packet sockets and \ref l2_packet_pcap.c has a more portable version using
- libpcap and libdnet.
-
-\ref pcsc_funcs.c and \ref pcsc_funcs.h
- Wrapper for PC/SC lite SIM and smart card readers
-
-\ref priv_netlink.h
- Private version of netlink definitions from Linux kernel header files;
- this could be replaced with C library header file once suitable
- version becomes commonly available
-
-\ref version.h
- Version number definitions
-
-
-\section crypto_func Cryptographic functions
-
-\ref md5.c and \ref md5.h
- MD5 (replaced with a crypto library if TLS support is included)
- HMAC-MD5 (keyed checksum for message authenticity validation)
-
-\ref rc4.c and \ref rc4.h
- RC4 (broadcast/default key encryption)
-
-\ref sha1.c and \ref sha1.h
- SHA-1 (replaced with a crypto library if TLS support is included)
- HMAC-SHA-1 (keyed checksum for message authenticity validation)
- PRF-SHA-1 (pseudorandom (key/nonce generation) function)
- PBKDF2-SHA-1 (ASCII passphrase to shared secret)
- T-PRF (for EAP-FAST)
- TLS-PRF (RFC 2246)
-
-\ref sha256.c and \ref sha256.h
- SHA-256 (replaced with a crypto library if TLS support is included)
-
-\ref aes-wrap.c, \ref aes_wrap.h, \ref aes.c
- AES (replaced with a crypto library if TLS support is included),
- AES Key Wrap Algorithm with 128-bit KEK, RFC3394 (broadcast/default
- key encryption),
- One-Key CBC MAC (OMAC1) hash with AES-128,
- AES-128 CTR mode encryption,
- AES-128 EAX mode encryption/decryption,
- AES-128 CBC
-
-\ref crypto.h
- Definition of crypto library wrapper
-
-\ref crypto_openssl.c
- Wrapper functions for libcrypto (OpenSSL)
-
-\ref crypto_internal.c
- Wrapper functions for internal crypto implementation
-
-\ref crypto_gnutls.c
- Wrapper functions for libgcrypt (used by GnuTLS)
-
-\ref ms_funcs.c and \ref ms_funcs.h
- Helper functions for MSCHAPV2 and LEAP
-
-\ref tls.h
- Definition of TLS library wrapper
-
-\ref tls_none.c
- Dummy implementation of TLS library wrapper for cases where TLS
- functionality is not included.
-
-\ref tls_openssl.c
- TLS library wrapper for openssl
-
-\ref tls_internal.c
- TLS library for internal TLS implementation
-
-\ref tls_gnutls.c
- TLS library wrapper for GnuTLS
-
-
-\section tls_func TLS library
-
-\ref asn1.c and \ref asn1.h
- ASN.1 DER parsing
-
-\ref bignum.c and \ref bignum.h
- Big number math
-
-\ref rsa.c and \ref rsa.h
- RSA
-
-\ref x509v3.c and \ref x509v3.h
- X.509v3 certificate parsing and processing
-
-\ref tlsv1_client.c, \ref tlsv1_client.h
- TLSv1 client (RFC 2246)
-
-\ref tlsv1_client_i.h
- Internal structures for TLSv1 client
-
-\ref tlsv1_client_read.c
- TLSv1 client: read handshake messages
-
-\ref tlsv1_client_write.c
- TLSv1 client: write handshake messages
-
-\ref tlsv1_common.c and \ref tlsv1_common.h
- Common TLSv1 routines and definitions
-
-\ref tlsv1_cred.c and \ref tlsv1_cred.h
- TLSv1 credentials
-
-\ref tlsv1_record.c and \ref tlsv1_record.h
- TLSv1 record protocol
-
-
-\section configuration Configuration
-
-\ref config_ssid.h
- Definition of per network configuration items
-
-\ref config.h
- Definition of the wpa_supplicant configuration
-
-\ref config.c
- Configuration parser and common functions
-
-\ref wpa_supplicant/config_file.c
- Configuration backend for text files (e.g., wpa_supplicant.conf)
-
-\ref config_winreg.c
- Configuration backend for Windows registry
-
-
-\section ctrl_iface Control interface
-
-wpa_supplicant has a \ref ctrl_iface_page "control interface"
-that can be used to get status
-information and manage operations from external programs. An example
-command line interface (wpa_cli) and GUI (wpa_gui) for this interface
-are included in the wpa_supplicant distribution.
-
-\ref wpa_supplicant/ctrl_iface.c and \ref wpa_supplicant/ctrl_iface.h
- wpa_supplicant-side of the control interface
-
-\ref ctrl_iface_unix.c
- UNIX domain sockets -based control interface backend
-
-\ref ctrl_iface_udp.c
- UDP sockets -based control interface backend
-
-\ref ctrl_iface_named_pipe.c
- Windows named pipes -based control interface backend
-
-\ref wpa_ctrl.c and \ref wpa_ctrl.h
- Library functions for external programs to provide access to the
- wpa_supplicant control interface
-
-\ref wpa_cli.c
- Example program for using wpa_supplicant control interface
-
-
-\section wpa_code WPA supplicant
-
-\ref wpa.c and \ref wpa.h
- WPA state machine and 4-Way/Group Key Handshake processing
-
-\ref preauth.c and \ref preauth.h
- PMKSA caching and pre-authentication (RSN/WPA2)
-
-\ref wpa_i.h
- Internal definitions for WPA code; not to be included to other modules.
-
-\section eap_peer EAP peer
-
-\ref eap_peer_module "EAP peer implementation" is a separate module that
-can be used by other programs than just wpa_supplicant.
-
-\ref eap.c and \ref eap.h
- EAP state machine and method interface
-
-\ref eap_defs.h
- Common EAP definitions
-
-\ref eap_i.h
- Internal definitions for EAP state machine and EAP methods; not to be
- included in other modules
-
-\ref eap_sim_common.c and \ref eap_sim_common.h
- Common code for EAP-SIM and EAP-AKA
-
-\ref eap_tls_common.c and \ref eap_tls_common.h
- Common code for EAP-PEAP, EAP-TTLS, and EAP-FAST
-
-\ref eap_ttls.c and \ref eap_ttls.h
- EAP-TTLS
-
-\ref eap_pax.c, \ref eap_pax_common.h, \ref eap_pax_common.c
- EAP-PAX
-
-\ref eap_psk.c, \ref eap_psk_common.h, \ref eap_psk_common.c
- EAP-PSK (note: this is not needed for WPA-PSK)
-
-\ref eap_sake.c, \ref eap_sake_common.h, \ref eap_sake_common.c
- EAP-SAKE
-
-\ref eap_gpsk.c, \ref eap_gpsk_common.h, \ref eap_gpsk_common.c
- EAP-GPSK
-
-\ref eap_aka.c, \ref eap_fast.c, \ref eap_gtc.c, \ref eap_leap.c,
-\ref eap_md5.c, \ref eap_mschapv2.c, \ref eap_otp.c, \ref eap_peap.c,
-\ref eap_sim.c, \ref eap_tls.c
- Other EAP method implementations
-
-
-\section eapol_supp EAPOL supplicant
-
-\ref eapol_supp_sm.c and \ref eapol_supp_sm.h
- EAPOL supplicant state machine and IEEE 802.1X processing
-
-
-\section win_port Windows port
-
-\ref ndis_events.c
- Code for receiving NdisMIndicateStatus() events and delivering them to
- wpa_supplicant \ref driver_ndis.c in more easier to use form
-
-\ref win_if_list.c
- External program for listing current network interface
-
-
-\section test_programs Test programs
-
-\ref radius_client.c and \ref radius_client.h
- RADIUS authentication client implementation for eapol_test
-
-\ref radius.c and \ref radius.h
- RADIUS message processing for eapol_test
-
-\ref eapol_test.c
- Standalone EAP testing tool with integrated RADIUS authentication
- client
-
-\ref preauth_test.c
- Standalone RSN pre-authentication tool
-
-\ref wpa_passphrase.c
- WPA ASCII passphrase to PSK conversion
-
-*/
diff --git a/contrib/wpa/doc/ctrl_iface.doxygen b/contrib/wpa/doc/ctrl_iface.doxygen
index 7dccdc797ef3..e69de29bb2d1 100644
--- a/contrib/wpa/doc/ctrl_iface.doxygen
+++ b/contrib/wpa/doc/ctrl_iface.doxygen
@@ -1,1054 +0,0 @@
-/**
-\page ctrl_iface_page wpa_supplicant control interface
-
-wpa_supplicant implements a control interface that can be used by
-external programs to control the operations of the wpa_supplicant
-daemon and to get status information and event notifications. There is
-a small C library, in a form of a single C file, \ref wpa_ctrl.c, that
-provides helper functions to facilitate the use of the control
-interface. External programs can link this file into them and then use
-the library functions documented in \ref wpa_ctrl.h to interact with
-wpa_supplicant. This library can also be used with C++. \ref wpa_cli.c and
-wpa_gui are example programs using this library.
-
-There are multiple mechanisms for inter-process communication. For
-example, Linux version of wpa_supplicant is using UNIX domain sockets
-for the control interface and Windows version UDP sockets. The use of
-the functions defined in \ref wpa_ctrl.h can be used to hide the details of
-the used IPC from external programs.
-
-
-\section using_ctrl_iface Using the control interface
-
-External programs, e.g., a GUI or a configuration utility, that need to
-communicate with wpa_supplicant should link in \ref wpa_ctrl.c. This
-allows them to use helper functions to open connection to the control
-interface with \ref wpa_ctrl_open() and to send commands with
-\ref wpa_ctrl_request().
-
-wpa_supplicant uses the control interface for two types of communication:
-commands and unsolicited event messages. Commands are a pair of
-messages, a request from the external program and a response from
-wpa_supplicant. These can be executed using \ref wpa_ctrl_request().
-Unsolicited event messages are sent by wpa_supplicant to the control
-interface connection without specific request from the external program
-for receiving each message. However, the external program needs to
-attach to the control interface with \ref wpa_ctrl_attach() to receive these
-unsolicited messages.
-
-If the control interface connection is used both for commands and
-unsolicited event messages, there is potential for receiving an
-unsolicited message between the command request and response.
-\ref wpa_ctrl_request() caller will need to supply a callback, msg_cb,
-for processing these messages. Often it is easier to open two
-control interface connections by calling \ref wpa_ctrl_open() twice and
-then use one of the connections for commands and the other one for
-unsolicited messages. This way command request/response pairs will
-not be broken by unsolicited messages. wpa_cli is an example of how
-to use only one connection for both purposes and wpa_gui demonstrates
-how to use two separate connections.
-
-Once the control interface connection is not needed anymore, it should
-be closed by calling \ref wpa_ctrl_close(). If the connection was used for
-unsolicited event messages, it should be first detached by calling
-\ref wpa_ctrl_detach().
-
-
-\section ctrl_iface_cmds Control interface commands
-
-Following commands can be used with \ref wpa_ctrl_request():
-
-\subsection ctrl_iface_PING PING
-
-This command can be used to test whether wpa_supplicant is replying
-to the control interface commands. The expected reply is \c PONG if the
-connection is open and wpa_supplicant is processing commands.
-
-
-\subsection ctrl_iface_MIB MIB
-
-Request a list of MIB variables (dot1x, dot11). The output is a text
-block with each line in \c variable=value format. For example:
-
-\verbatim
-dot11RSNAOptionImplemented=TRUE
-dot11RSNAPreauthenticationImplemented=TRUE
-dot11RSNAEnabled=FALSE
-dot11RSNAPreauthenticationEnabled=FALSE
-dot11RSNAConfigVersion=1
-dot11RSNAConfigPairwiseKeysSupported=5
-dot11RSNAConfigGroupCipherSize=128
-dot11RSNAConfigPMKLifetime=43200
-dot11RSNAConfigPMKReauthThreshold=70
-dot11RSNAConfigNumberOfPTKSAReplayCounters=1
-dot11RSNAConfigSATimeout=60
-dot11RSNAAuthenticationSuiteSelected=00-50-f2-2
-dot11RSNAPairwiseCipherSelected=00-50-f2-4
-dot11RSNAGroupCipherSelected=00-50-f2-4
-dot11RSNAPMKIDUsed=
-dot11RSNAAuthenticationSuiteRequested=00-50-f2-2
-dot11RSNAPairwiseCipherRequested=00-50-f2-4
-dot11RSNAGroupCipherRequested=00-50-f2-4
-dot11RSNAConfigNumberOfGTKSAReplayCounters=0
-dot11RSNA4WayHandshakeFailures=0
-dot1xSuppPaeState=5
-dot1xSuppHeldPeriod=60
-dot1xSuppAuthPeriod=30
-dot1xSuppStartPeriod=30
-dot1xSuppMaxStart=3
-dot1xSuppSuppControlledPortStatus=Authorized
-dot1xSuppBackendPaeState=2
-dot1xSuppEapolFramesRx=0
-dot1xSuppEapolFramesTx=440
-dot1xSuppEapolStartFramesTx=2
-dot1xSuppEapolLogoffFramesTx=0
-dot1xSuppEapolRespFramesTx=0
-dot1xSuppEapolReqIdFramesRx=0
-dot1xSuppEapolReqFramesRx=0
-dot1xSuppInvalidEapolFramesRx=0
-dot1xSuppEapLengthErrorFramesRx=0
-dot1xSuppLastEapolFrameVersion=0
-dot1xSuppLastEapolFrameSource=00:00:00:00:00:00
-\endverbatim
-
-
-\subsection ctrl_iface_STATUS STATUS
-
-Request current WPA/EAPOL/EAP status information. The output is a text
-block with each line in \c variable=value format. For example:
-
-\verbatim
-bssid=02:00:01:02:03:04
-ssid=test network
-pairwise_cipher=CCMP
-group_cipher=CCMP
-key_mgmt=WPA-PSK
-wpa_state=COMPLETED
-ip_address=192.168.1.21
-Supplicant PAE state=AUTHENTICATED
-suppPortStatus=Authorized
-EAP state=SUCCESS
-\endverbatim
-
-
-\subsection ctrl_iface_STATUS-VERBOSE STATUS-VERBOSE
-
-Same as STATUS, but with more verbosity (i.e., more \c variable=value pairs).
-
-\verbatim
-bssid=02:00:01:02:03:04
-ssid=test network
-id=0
-pairwise_cipher=CCMP
-group_cipher=CCMP
-key_mgmt=WPA-PSK
-wpa_state=COMPLETED
-ip_address=192.168.1.21
-Supplicant PAE state=AUTHENTICATED
-suppPortStatus=Authorized
-heldPeriod=60
-authPeriod=30
-startPeriod=30
-maxStart=3
-portControl=Auto
-Supplicant Backend state=IDLE
-EAP state=SUCCESS
-reqMethod=0
-methodState=NONE
-decision=COND_SUCC
-ClientTimeout=60
-\endverbatim
-
-
-\subsection ctrl_iface_PMKSA PMKSA
-
-Show PMKSA cache
-
-\verbatim
-Index / AA / PMKID / expiration (in seconds) / opportunistic
-1 / 02:00:01:02:03:04 / 000102030405060708090a0b0c0d0e0f / 41362 / 0
-2 / 02:00:01:33:55:77 / 928389281928383b34afb34ba4212345 / 362 / 1
-\endverbatim
-
-
-\subsection ctrl_iface_SET SET
-
-Set variables:
-- EAPOL::heldPeriod
-- EAPOL::authPeriod
-- EAPOL::startPeriod
-- EAPOL::maxStart
-- dot11RSNAConfigPMKLifetime
-- dot11RSNAConfigPMKReauthThreshold
-- dot11RSNAConfigSATimeout
-
-Example command:
-\verbatim
-SET EAPOL::heldPeriod 45
-\endverbatim
-
-
-\subsection ctrl_iface_LOGON LOGON
-
-IEEE 802.1X EAPOL state machine logon.
-
-
-\subsection ctrl_iface_LOGOFF LOGOFF
-
-IEEE 802.1X EAPOL state machine logoff.
-
-
-\subsection ctrl_iface_REASSOCIATE REASSOCIATE
-
-Force reassociation.
-
-
-\subsection ctrl_iface_RECONNECT RECONNECT
-
-Connect if disconnected (i.e., like \c REASSOCIATE, but only connect
-if in disconnected state).
-
-
-\subsection ctrl_iface_PREAUTH PREAUTH
-
-Start pre-authentication with the given BSSID.
-
-
-\subsection ctrl_iface_ATTACH ATTACH
-
-Attach the connection as a monitor for unsolicited events. This can
-be done with \ref wpa_ctrl_attach().
-
-
-\subsection ctrl_iface_DETACH DETACH
-
-Detach the connection as a monitor for unsolicited events. This can
-be done with \ref wpa_ctrl_detach().
-
-
-\subsection ctrl_iface_LEVEL LEVEL
-
-Change debug level.
-
-
-\subsection ctrl_iface_RECONFIGURE RECONFIGURE
-
-Force wpa_supplicant to re-read its configuration data.
-
-
-\subsection ctrl_iface_TERMINATE TERMINATE
-
-Terminate wpa_supplicant process.
-
-
-\subsection ctrl_iface_BSSID BSSID
-
-Set preferred BSSID for a network. Network id can be received from the
-\c LIST_NETWORKS command output.
-
-
-\subsection ctrl_iface_LIST_NETWORKS LIST_NETWORKS
-
-List configured networks.
-
-\verbatim
-network id / ssid / bssid / flags
-0 example network any [CURRENT]
-\endverbatim
-
-(note: fields are separated with tabs)
-
-
-\subsection ctrl_iface_DISCONNECT DISCONNECT
-
-Disconnect and wait for \c REASSOCIATE or \c RECONNECT command before
-connecting.
-
-
-\subsection ctrl_iface_SCAN SCAN
-
-Request a new BSS scan.
-
-
-\subsection ctrl_iface_SCAN_RESULTS SCAN_RESULTS
-
-Get the latest scan results.
-
-\verbatim
-bssid / frequency / signal level / flags / ssid
-00:09:5b:95:e0:4e 2412 208 [WPA-PSK-CCMP] jkm private
-02:55:24:33:77:a3 2462 187 [WPA-PSK-TKIP] testing
-00:09:5b:95:e0:4f 2412 209 jkm guest
-\endverbatim
-
-(note: fields are separated with tabs)
-
-
-\subsection ctrl_iface_BSS BSS
-
-Get detailed per-BSS scan results. \c BSS command can be used to
-iterate through scan results one BSS at a time and to fetch all
-information from the found BSSes. This provides access to the same
-data that is available through \c SCAN_RESULTS but in a way that
-avoids problems with large number of scan results not fitting in the
-ctrl_iface messages.
-
-There are two options for selecting the BSS with the \c BSS command:
-"BSS " requests information for the BSS identified by the index
-(0 .. size-1) in the scan results table and "BSS " requests
-information for the given BSS (based on BSSID in 00:01:02:03:04:05
-format).
-
-BSS information is presented in following format. Please note that new
-fields may be added to this field=value data, so the ctrl_iface user
-should be prepared to ignore values it does not understand.
-
-\verbatim
-bssid=00:09:5b:95:e0:4e
-freq=2412
-beacon_int=0
-capabilities=0x0011
-qual=51
-noise=161
-level=212
-tsf=0000000000000000
-ie=000b6a6b6d2070726976617465010180dd180050f20101000050f20401000050f20401000050f2020000
-ssid=jkm private
-\endverbatim
-
-
-
-\subsection ctrl_iface_SELECT_NETWORK SELECT_NETWORK
-
-Select a network (disable others). Network id can be received from the
-\c LIST_NETWORKS command output.
-
-
-\subsection ctrl_iface_ENABLE_NETWORK ENABLE_NETWORK
-
-Enable a network. Network id can be received from the
-\c LIST_NETWORKS command output. Special network id \c all can be
-used to enable all network.
-
-
-\subsection ctrl_iface_DISABLE_NETWORK DISABLE_NETWORK
-
-Disable a network. Network id can be received from the
-\c LIST_NETWORKS command output. Special network id \c all can be
-used to disable all network.
-
-
-\subsection ctrl_iface_ADD_NETWORK ADD_NETWORK
-
-Add a new network. This command creates a new network with empty
-configuration. The new network is disabled and once it has been
-configured it can be enabled with \c ENABLE_NETWORK command. \c ADD_NETWORK
-returns the network id of the new network or FAIL on failure.
-
-
-\subsection ctrl_iface_REMOVE_NETWORK REMOVE_NETWORK
-
-Remove a network. Network id can be received from the
-\c LIST_NETWORKS command output. Special network id \c all can be
-used to remove all network.
-
-
-\subsection ctrl_iface_SET_NETWORK SET_NETWORK
-
-Set network variables. Network id can be received from the
-\c LIST_NETWORKS command output.
-
-This command uses the same variables and data formats as the
-configuration file. See example wpa_supplicant.conf for more details.
-
-- ssid (network name, SSID)
-- psk (WPA passphrase or pre-shared key)
-- key_mgmt (key management protocol)
-- identity (EAP identity)
-- password (EAP password)
-- ...
-
-
-\subsection ctrl_iface_GET_NETWORK GET_NETWORK
-
-Get network variables. Network id can be received from the
-\c LIST_NETWORKS command output.
-
-
-\subsection ctrl_iface_SAVE_CONFIG SAVE_CONFIG
-
-Save the current configuration.
-
-
-\subsection ctrl_iface_P2P_FIND P2P_FIND
-
-Start P2P device discovery. Optional parameter can be used to specify
-the duration for the discovery in seconds (e.g., "P2P_FIND 5"). If the
-duration is not specified, discovery will be started for indefinite
-time, i.e., until it is terminated by P2P_STOP_FIND or P2P_CONNECT (to
-start group formation with a discovered peer).
-
-The default search type is to first run a full scan of all channels
-and then continue scanning only social channels (1, 6, 11). This
-behavior can be changed by specifying a different search type: social
-(e.g., "P2P_FIND 5 type=social") will skip the initial full scan and
-only search social channels; progressive (e.g., "P2P_FIND
-type=progressive") starts with a full scan and then searches
-progressively through all channels one channel at the time with the
-social channel scans. Progressive device discovery can be used to find
-new groups (and groups that were not found during the initial scan,
-e.g., due to the GO being asleep) over time without adding
-considerable extra delay for every Search state round.
-
-
-\subsection ctrl_iface_P2P_STOP_FIND P2P_STOP_FIND
-
-Stop ongoing P2P device discovery or other operation (connect, listen
-mode).
-
-
-\subsection ctrl_iface_P2P_CONNECT P2P_CONNECT
-
-Start P2P group formation with a discovered P2P peer. This includes
-group owner negotiation, group interface setup, provisioning, and
-establishing data connection.
-
-P2P_CONNECT
-[label|display|keypad] [persistent] [join|auth] [go_intent=<0..15>]
-
-Start P2P group formation with a discovered P2P peer. This includes
-optional group owner negotiation, group interface setup, provisioning,
-and establishing data connection.
-
-The parameter specifies the WPS provisioning
-method. "pbc" string starts pushbutton method, "pin" string start PIN
-method using an automatically generated PIN (which will be returned as
-the command return code), PIN# means that a pre-selected PIN can be
-used (e.g., 12345670). [label|display|keypad] is used with PIN method
-to specify which PIN is used (label=PIN from local label,
-display=dynamically generated random PIN from local display,
-keypad=PIN entered from peer device label or display). "persistent"
-parameter can be used to request a persistent group to be formed.
-
-"join" indicates that this is a command to join an existing group as a
-client. It skips the GO Negotiation part.
-
-"auth" indicates that the WPS parameters are authorized for the peer
-device without actually starting GO Negotiation (i.e., the peer is
-expected to initiate GO Negotiation). This is mainly for testing
-purposes.
-
-The optional "go_intent" parameter can be used to override the default
-GO Intent value.
-
-
-\subsection ctrl_iface_P2P_LISTEN P2P_LISTEN
-
-Start Listen-only state. Optional parameter can be used to specify the
-duration for the Listen operation in seconds. This command may not
-be of that much use during normal operations and is mainly designed
-for testing. It can also be used to keep the device discoverable
-without having to maintain a group.
-
-
-\subsection ctrl_iface_P2P_GROUP_REMOVE P2P_GROUP_REMOVE
-
-Terminate a P2P group. If a new virtual network interface was used for
-the group, it will also be removed. The network interface name of the
-group interface is used as a parameter for this command.
-
-
-\subsection ctrl_iface_P2P_GROUP_ADD P2P_GROUP_ADD
-
-Set up a P2P group owner manually (i.e., without group owner
-negotiation with a specific peer). This is also known as autonomous
-GO. Optional persistent= can be used to specify restart of
-a persistent group.
-
-
-\subsection ctrl_iface_P2P_PROV_DISC P2P_PROV_DISC
-
-Send P2P provision discovery request to the specified peer. The
-parameters for this command are the P2P device address of the peer and
-the desired configuration method. For example, "P2P_PROV_DISC
-02:01:02:03:04:05 display" would request the peer to display a PIN for
-us and "P2P_PROV_DISC 02:01:02:03:04:05 keypad" would request the peer
-to enter a PIN that we display.
-
-
-\subsection ctrl_iface_P2P_GET_PASSPHRASE P2P_GET_PASSPHRASE
-
-Get the passphrase for a group (only available when acting as a GO).
-
-
-\subsection ctrl_iface_P2P_SERV_DISC_REQ P2P_SERV_DISC_REQ
-
-Schedule a P2P service discovery request. The parameters for this
-command are the device address of the peer device (or 00:00:00:00:00:00
-for wildcard query that is sent to every discovered P2P peer that
-supports service discovery) and P2P Service Query TLV(s) as hexdump.
-For example, "P2P_SERV_DISC_REQ 00:00:00:00:00:00 02000001" schedules
-a request for listing all supported service discovery protocols and
-requests this to be sent to all discovered peers. The pending requests
-are sent during device discovery (see \ref ctrl_iface_P2P_FIND).
-
-This command returns an identifier for the pending query (e.g.,
-"1f77628") that can be used to cancel the request. Directed requests
-will be automatically removed when the specified peer has replied to
-it.
-
-
-\subsection ctrl_iface_P2P_SERV_DISC_CANCEL_REQ P2P_SERV_DISC_CANCEL_REQ
-
-Cancel a pending P2P service discovery request. This command takes a
-single parameter: identifier for the pending query (the value returned
-by \ref ctrl_iface_P2P_SERV_DISC_REQ), e.g.,
-"P2P_SERV_DISC_CANCEL_REQ 1f77628".
-
-
-\subsection ctrl_iface_P2P_SERV_DISC_RESP P2P_SERV_DISC_RESP
-
-Reply to a service discovery query. This command takes following
-parameters: frequency in MHz, destination address, dialog token,
-response TLV(s). The first three parameters are copied from the
-request event. For example,
-"P2P_SERV_DISC_RESP 2437 02:40:61:c2:f3:b7 1 0300000101".
-
-
-\subsection ctrl_iface_P2P_SERVICE_UPDATE P2P_SERVICE_UPDATE
-
-Indicate that local services have changed. This is used to increment
-the P2P service indicator value so that peers know when previously
-cached information may have changed.
-
-
-\subsection ctrl_iface_P2P_SERV_DISC_EXTERNAL P2P_SERV_DISC_EXTERNAL
-
-Configure external processing of P2P service requests: 0 (default) =
-no external processing of requests (i.e., internal code will reject
-each request), 1 = external processing of requests (external program
-is responsible for replying to service discovery requests with
-\ref ctrl_iface_P2P_SERV_DISC_RESP).
-
-
-\subsection ctrl_iface_P2P_REJECT P2P_REJECT
-
-Reject connection attempt from a peer (specified with a device
-address). This is a mechanism to reject a pending GO Negotiation with
-a peer and request to automatically block any further connection or
-discovery of the peer.
-
-
-\subsection ctrl_iface_P2P_INVITE P2P_INVITE
-
-Invite a peer to join a group or to (re)start a persistent group.
-
-
-\subsection ctrl_iface_P2P_PEER P2P_PEER
-
-Fetch information about a discovered peer. This command takes in an
-argument specifying which peer to select: P2P Device Address of the
-peer, "FIRST" to indicate the first peer in the list, or "NEXT-" to indicate the entry following the specified peer
-(to allow for iterating through the list).
-
-
-\subsection ctrl_iface_P2P_EXT_LISTEN P2P_EXT_LISTEN
-
-Enable/disable extended listen timing. Without parameters, this
-command disables extended listen timing. When enabling the feature,
-two parameters are used: availability period and availability interval
-(both in milliseconds and with range of 1-65535).
-
-
-\section ctrl_iface_interactive Interactive requests
-
-If wpa_supplicant needs additional information during authentication
-(e.g., password), it will use a specific prefix, \c CTRL-REQ-
-(\a WPA_CTRL_REQ macro) in an unsolicited event message. An external
-program, e.g., a GUI, can provide such information by using
-\c CTRL-RSP- (\a WPA_CTRL_RSP macro) prefix in a command with matching
-field name.
-
-The following fields can be requested in this way from the user:
-- IDENTITY (EAP identity/user name)
-- PASSWORD (EAP password)
-- NEW_PASSWORD (New password if the server is requesting password change)
-- PIN (PIN code for accessing a SIM or smartcard)
-- OTP (one-time password; like password, but the value is used only once)
-- PASSPHRASE (passphrase for a private key file)
-
-\verbatim
-CTRL-REQ---
-CTRL-RSP---
-\endverbatim
-
-For example, request from wpa_supplicant:
-\verbatim
-CTRL-REQ-PASSWORD-1-Password needed for SSID test-network
-\endverbatim
-
-And a matching reply from the GUI:
-\verbatim
-CTRL-RSP-PASSWORD-1-secret
-\endverbatim
-
-
-\subsection ctrl_iface_GET_CAPABILITY GET_CAPABILITY [strict]
-
-Get list of supported functionality (eap, pairwise, group,
-proto). Supported functionality is shown as space separate lists of
-values used in the same format as in wpa_supplicant configuration.
-If optional argument, 'strict', is added, only the values that the
-driver claims to explicitly support are included. Without this, all
-available capabilities are included if the driver does not provide
-a mechanism for querying capabilities.
-
-Example request/reply pairs:
-
-\verbatim
-GET_CAPABILITY eap
-AKA FAST GTC LEAP MD5 MSCHAPV2 OTP PAX PEAP PSK SIM TLS TTLS
-\endverbatim
-
-\verbatim
-GET_CAPABILITY pairwise
-CCMP TKIP NONE
-\endverbatim
-
-\verbatim
-GET_CAPABILITY pairwise strict
-\endverbatim
-
-\verbatim
-GET_CAPABILITY group
-CCMP TKIP WEP104 WEP40
-\endverbatim
-
-\verbatim
-GET_CAPABILITY key_mgmt
-WPA-PSK WPA-EAP IEEE8021X NONE
-\endverbatim
-
-\verbatim
-GET_CAPABILITY proto
-RSN WPA
-\endverbatim
-
-\verbatim
-GET_CAPABILITY auth_alg
-OPEN SHARED LEAP
-\endverbatim
-
-
-\subsection ctrl_iface_AP_SCAN AP_SCAN
-
-Change ap_scan value:
-0 = no scanning,
-1 = wpa_supplicant requests scans and uses scan results to select the AP,
-2 = wpa_supplicant does not use scanning and just requests driver to
-associate and take care of AP selection
-
-
-\subsection ctrl_iface_INTERFACES INTERFACES
-
-List configured interfaces.
-
-\verbatim
-wlan0
-eth0
-\endverbatim
-
-
-\section ctrl_iface_events Control interface events
-
-wpa_supplicant generates number messages based on events like
-connection or a completion of a task. These are available to external
-programs that attach to receive unsolicited messages over the control
-interface with \ref wpa_ctrl_attach().
-
-The event messages will be delivered over the attach control interface
-as text strings that start with the priority level of the message and
-a fixed prefix text as defined in \ref wpa_ctrl.h. After this, optional
-additional information may be included depending on the event
-message. For example, following event message is delivered when new
-scan results are available:
-
-\verbatim
-<2>CTRL-EVENT-SCAN-RESULTS
-\endverbatim
-
-Following priority levels are used:
-- 0 = MSGDUMP
-- 1 = DEBUG
-- 2 = INFO
-- 3 = WARNING
-- 4 = ERROR
-
-By default, any priority level greater than equal to 2 (INFO) are
-delivered over the attached control interface. LEVEL command can be
-used to set the level of messages which will be delivered. It should
-be noted that there are many debug messages that do not include any
-particulat prefix and are subject to change. They may be used for
-debug information, but can usually be ignored by external programs.
-
-In most cases, the external program can skip over the priority field
-in the beginning of the event message and then compare the following
-text to the event strings from \ref wpa_ctrl.h that the program is
-interested in processing.
-
-Following subsections describe the most common event notifications
-generated by wpa_supplicant.
-
-\subsection ctrl_iface_event_CTRL_REQ CTRL-REQ-
-
-WPA_CTRL_REQ: Request information from a user. See
-\ref ctrl_iface_interactive "Interactive requests" sections for more
-details.
-
-\subsection ctrl_iface_event_CONNECTED CTRL-EVENT-CONNECTED
-
-WPA_EVENT_CONNECTED: Indicate successfully completed authentication
-and that the data connection is now enabled.
-
-\subsection ctrl_iface_event_DISCONNECTED CTRL-EVENT-DISCONNECTED
-
-WPA_EVENT_DISCONNECTED: Disconnected, data connection is not available
-
-\subsection ctrl_iface_event_TERMINATING CTRL-EVENT-TERMINATING
-
-WPA_EVENT_TERMINATING: wpa_supplicant is exiting
-
-\subsection ctrl_iface_event_PASSWORD_CHANGED CTRL-EVENT-PASSWORD-CHANGED
-
-WPA_EVENT_PASSWORD_CHANGED: Password change was completed successfully
-
-\subsection ctrl_iface_event_EAP_NOTIFICATION CTRL-EVENT-EAP-NOTIFICATION
-
-WPA_EVENT_EAP_NOTIFICATION: EAP-Request/Notification received
-
-\subsection ctrl_iface_event_EAP_STARTED CTRL-EVENT-EAP-STARTED
-
-WPA_EVENT_EAP_STARTED: EAP authentication started (EAP-Request/Identity
-received)
-
-\subsection ctrl_iface_event_EAP_METHOD CTRL-EVENT-EAP-METHOD
-
-WPA_EVENT_EAP_METHOD: EAP method selected
-
-\subsection ctrl_iface_event_EAP_SUCCESS CTRL-EVENT-EAP-SUCCESS
-
-WPA_EVENT_EAP_SUCCESS: EAP authentication completed successfully
-
-\subsection ctrl_iface_event_EAP_FAILURE CTRL-EVENT-EAP-FAILURE
-
-WPA_EVENT_EAP_FAILURE: EAP authentication failed (EAP-Failure received)
-
-\subsection ctrl_iface_event_SCAN_RESULTS CTRL-EVENT-SCAN-RESULTS
-
-WPA_EVENT_SCAN_RESULTS: New scan results available
-
-\subsection ctrl_iface_event_BSS_ADDED CTRL-EVENT-BSS-ADDED
-
-WPA_EVENT_BSS_ADDED: A new BSS entry was added. The event prefix is
-followed by the BSS entry id and BSSID.
-
-\verbatim
-CTRL-EVENT-BSS-ADDED 34 00:11:22:33:44:55
-\endverbatim
-
-\subsection ctrl_iface_event_BSS_REMOVED CTRL-EVENT-BSS-REMOVED
-
-WPA_EVENT_BSS_REMOVED: A BSS entry was removed. The event prefix is
-followed by BSS entry id and BSSID.
-
-\verbatim
-CTRL-EVENT-BSS-REMOVED 34 00:11:22:33:44:55
-\endverbatim
-
-\subsection ctrl_iface_event_WPS_OVERLAP_DETECTED WPS-OVERLAP-DETECTED
-
-WPS_EVENT_OVERLAP: WPS overlap detected in PBC mode
-
-\subsection ctrl_iface_event_WPS_AP_AVAILABLE_PBC WPS-AP-AVAILABLE-PBC
-
-WPS_EVENT_AP_AVAILABLE_PBC: Available WPS AP with active PBC found in
-scan results.
-
-\subsection ctrl_iface_event_WPS_AP_AVAILABLE_PIN WPS-AP-AVAILABLE-PIN
-
-WPS_EVENT_AP_AVAILABLE_PIN: Available WPS AP with recently selected PIN
-registrar found in scan results.
-
-\subsection ctrl_iface_event_WPS_AP_AVAILABLE WPS-AP-AVAILABLE
-
-WPS_EVENT_AP_AVAILABLE: Available WPS AP found in scan results
-
-\subsection ctrl_iface_event_WPS_CRED_RECEIVED WPS-CRED-RECEIVED
-
-WPS_EVENT_CRED_RECEIVED: A new credential received
-
-\subsection ctrl_iface_event_WPS_M2D WPS-M2D
-
-WPS_EVENT_M2D: M2D received
-
-\subsection ctrl_iface_event_WPS_FAIL
-
-WPS_EVENT_FAIL: WPS registration failed after M2/M2D
-
-\subsection ctrl_iface_event_WPS_SUCCESS WPS-SUCCESS
-
-WPS_EVENT_SUCCESS: WPS registration completed successfully
-
-\subsection ctrl_iface_event_WPS_TIMEOUT WPS-TIMEOUT
-
-WPS_EVENT_TIMEOUT: WPS enrollment attempt timed out and was terminated
-
-\subsection ctrl_iface_event_WPS_ENROLLEE_SEEN WPS-ENROLLEE-SEEN
-
-WPS_EVENT_ENROLLEE_SEEN: WPS Enrollee was detected (used in AP mode).
-The event prefix is followed by MAC addr, UUID-E, pri dev type,
-config methods, dev passwd id, request type, [dev name].
-
-\verbatim
-WPS-ENROLLEE-SEEN 02:00:00:00:01:00
-572cf82f-c957-5653-9b16-b5cfb298abf1 1-0050F204-1 0x80 4 1
-[Wireless Client]
-\endverbatim
-
-\subsection ctrl_iface_event_WPS_ER_AP_ADD WPS-ER-AP-ADD
-
-WPS_EVENT_ER_AP_ADD: WPS ER discovered an AP
-
-\verbatim
-WPS-ER-AP-ADD 87654321-9abc-def0-1234-56789abc0002 02:11:22:33:44:55
-pri_dev_type=6-0050F204-1 wps_state=1 |Very friendly name|Company|
-Long description of the model|WAP|http://w1.fi/|http://w1.fi/hostapd/
-\endverbatim
-
-\subsection ctrl_iface_event_WPS_ER_AP_REMOVE WPS-ER-AP-REMOVE
-
-WPS_EVENT_ER_AP_REMOVE: WPS ER removed an AP entry
-
-\verbatim
-WPS-ER-AP-REMOVE 87654321-9abc-def0-1234-56789abc0002
-\endverbatim
-
-\subsection ctrl_iface_event_WPS_ER_ENROLLEE_ADD WPS-ER-ENROLLEE-ADD
-
-WPS_EVENT_ER_ENROLLEE_ADD: WPS ER discovered a new Enrollee
-
-\verbatim
-WPS-ER-ENROLLEE-ADD 2b7093f1-d6fb-5108-adbb-bea66bb87333
-02:66:a0:ee:17:27 M1=1 config_methods=0x14d dev_passwd_id=0
-pri_dev_type=1-0050F204-1
-|Wireless Client|Company|cmodel|123|12345|
-\endverbatim
-
-\subsection ctrl_iface_event_WPS_ER_ENROLLEE_REMOVE WPS-ER-ENROLLEE-REMOVE
-
-WPS_EVENT_ER_ENROLLEE_REMOVE: WPS ER removed an Enrollee entry
-
-\verbatim
-WPS-ER-ENROLLEE-REMOVE 2b7093f1-d6fb-5108-adbb-bea66bb87333
-02:66:a0:ee:17:27
-\endverbatim
-
-\subsection ctrl_iface_event_WPS_PIN_NEEDED WPS-PIN-NEEDED
-
-WPS_EVENT_PIN_NEEDED: PIN is needed to complete provisioning with an
-Enrollee. This is followed by information about the Enrollee (UUID,
-MAC address, device name, manufacturer, model name, model number,
-serial number, primary device type).
-\verbatim
-WPS-PIN-NEEDED 5a02a5fa-9199-5e7c-bc46-e183d3cb32f7 02:2a:c4:18:5b:f3
-[Wireless Client|Company|cmodel|123|12345|1-0050F204-1]
-\endverbatim
-
-\subsection ctrl_iface_event_WPS_NEW_AP_SETTINGS WPS-NEW-AP-SETTINGS
-
-WPS_EVENT_NEW_AP_SETTINGS: New AP settings were received
-
-\subsection ctrl_iface_event_WPS_REG_SUCCESS WPS-REG-SUCCESS
-
-WPS_EVENT_REG_SUCCESS: WPS provisioning was completed successfully
-(AP/Registrar)
-
-\subsection ctrl_iface_event_WPS_AP_SETUP_LOCKED WPS-AP-SETUP-LOCKED
-
-WPS_EVENT_AP_SETUP_LOCKED: AP changed into setup locked state due to
-multiple failed configuration attempts using the AP PIN.
-
-\subsection ctrl_iface_event_AP_STA_CONNECTED AP-STA-CONNECTED
-
-AP_STA_CONNECTED: A station associated with us (AP mode event). The
-event prefix is followed by the MAC address of the station.
-
-\verbatim
-AP-STA-CONNECTED 02:2a:c4:18:5b:f3
-\endverbatim
-
-\subsection ctrl_iface_event_AP_STA_DISCONNECTED AP-STA-DISCONNECTED
-
-AP_STA_DISCONNECTED: A station disassociated (AP mode event)
-
-\verbatim
-AP-STA-DISCONNECTED 02:2a:c4:18:5b:f3
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_DEVICE_FOUND P2P-DEVICE-FOUND
-
-P2P_EVENT_DEVICE_FOUND: Indication of a discovered P2P device with
-information about that device.
-
-\verbatim
-P2P-DEVICE-FOUND 02:b5:64:63:30:63 p2p_dev_addr=02:b5:64:63:30:63
-pri_dev_type=1-0050f204-1 name='Wireless Client' config_methods=0x84
-dev_capab=0x21 group_capab=0x0
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_GO_NEG_REQUEST P2P-GO-NEG-REQUEST
-
-P2P_EVENT_GO_NEG_REQUEST: A P2P device requested GO negotiation, but we
-were not ready to start the negotiation.
-
-\verbatim
-P2P-GO-NEG-REQUEST 02:40:61:c2:f3:b7 dev_passwd_id=4
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_GO_NEG_SUCCESS P2P-GO-NEG-SUCCESS
-
-P2P_EVENT_GO_NEG_SUCCESS: Indication of successfully complete group
-owner negotiation.
-
-\subsection ctrl_iface_event_P2P_EVENT_GO_NEG_FAILURE P2P-GO-NEG-FAILURE
-
-P2P_EVENT_GO_NEG_FAILURE: Indication of failed group owner negotiation.
-
-\subsection ctrl_iface_event_P2P_EVENT_GROUP_FORMATION_SUCCESS P2P-GROUP-FORMATION-SUCCESS
-
-P2P_EVENT_GROUP_FORMATION_SUCCESS: Indication that P2P group formation
-has been completed successfully.
-
-\subsection ctrl_iface_event_P2P_EVENT_GROUP_FORMATION_FAILURE P2P-GROUP-FORMATION-FAILURE
-
-P2P_EVENT_GROUP_FORMATION_FAILURE: Indication that P2P group formation
-failed (e.g., due to provisioning failure or timeout).
-
-\subsection ctrl_iface_event_P2P_EVENT_GROUP_STARTED P2P-GROUP-STARTED
-
-P2P_EVENT_GROUP_STARTED: Indication of a new P2P group having been
-started. Additional parameters: network interface name for the group,
-role (GO/client), SSID. The passphrase used in the group is also
-indicated here if known (on GO) or PSK (on client). If the group is a
-persistent one, a flag indicating that is included.
-
-\verbatim
-P2P-GROUP-STARTED wlan0-p2p-0 GO ssid="DIRECT-3F Testing"
-passphrase="12345678" go_dev_addr=02:40:61:c2:f3:b7 [PERSISTENT]
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_GROUP_REMOVED P2P-GROUP-REMOVED
-
-P2P_EVENT_GROUP_REMOVED: Indication of a P2P group having been removed.
-Additional parameters: network interface name for the group, role
-(GO/client).
-
-\verbatim
-P2P-GROUP-REMOVED wlan0-p2p-0 GO
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_PROV_DISC_SHOW_PIN P2P-PROV-DISC-SHOW-PIN
-
-P2P_EVENT_PROV_DISC_SHOW_PIN: Request from the peer for us to display
-a PIN that will be entered on the peer. The following parameters are
-included after the event prefix: peer_address PIN. The PIN is a
-random PIN generated for this connection. P2P_CONNECT command can be
-used to accept the request with the same PIN configured for the
-connection.
-
-\verbatim
-P2P-PROV-DISC-SHOW-PIN 02:40:61:c2:f3:b7 12345670
-p2p_dev_addr=02:40:61:c2:f3:b7 pri_dev_type=1-0050F204-1 name='Test'
-config_methods=0x188 dev_capab=0x21 group_capab=0x0
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_PROV_DISC_ENTER_PIN P2P-PROV-DISC-ENTER-PIN
-
-P2P_EVENT_PROV_DISC_ENTER_PIN: Request from the peer for us to enter a
-PIN displayed on the peer. The following parameter is included after
-the event prefix: peer address.
-
-\verbatim
-P2P-PROV-DISC-ENTER-PIN 02:40:61:c2:f3:b7 p2p_dev_addr=02:40:61:c2:f3:b7
-pri_dev_type=1-0050F204-1 name='Test' config_methods=0x188
-dev_capab=0x21 group_capab=0x0
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_PROV_DISC_PBC_REQ P2P-PROV-DISC-PBC-REQ
-
-P2P_EVENT_PROV_DISC_PBC_REQ: Request from the peer for us to connect
-using PBC. The following parameters are included after the event prefix:
-peer_address. P2P_CONNECT command can be used to accept the request.
-
-\verbatim
-P2P-PROV-DISC-PBC-REQ 02:40:61:c2:f3:b7 p2p_dev_addr=02:40:61:c2:f3:b7
-pri_dev_type=1-0050F204-1 name='Test' config_methods=0x188
-dev_capab=0x21 group_capab=0x0
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_PROV_DISC_PBC_RESP P2P-PROV-DISC-PBC-RESP
-
-P2P_EVENT_PROV_DISC_PBC_RESP: The peer accepted our provision discovery
-request to connect using PBC. The following parameters are included
-after the event prefix: peer_address. P2P_CONNECT command can be used to
-start GO Negotiation after this.
-
-\verbatim
-P2P-PROV-DISC-PBC-RESP 02:40:61:c2:f3:b7
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_SERV_DISC_REQ P2P-SERV-DISC-REQ
-
-P2P-SERV-DISC-REQ: Indicate reception of a P2P service discovery
-request. The following parameters are included after the event prefix:
-frequency in MHz, source address, dialog token, Service Update
-Indicator, Service Query TLV(s) as hexdump.
-
-\verbatim
-P2P-SERV-DISC-REQ 2412 02:40:61:c2:f3:b7 0 0 02000001
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_SERV_DISC_RESP P2P-SERV-DISC-RESP
-
-P2P-SERV-DISC-RESP: Indicate reception of a P2P service discovery
-response. The following parameters are included after the event prefix:
-source address, Service Update Indicator, Service Response TLV(s) as
-hexdump.
-
-\verbatim
-P2P-SERV-DISC-RESP 02:40:61:c2:f3:b7 0 0300000101
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_INVITATION_RECEIVED P2P-INVITATION-RECEIVED
-
-P2P-INVITATION-RECEIVED: Indicate reception of a P2P Invitation
-Request. For persistent groups, the parameter after the event prefix
-indicates which network block includes the persistent group data.
-
-\verbatim
-P2P-INVITATION-RECEIVED sa=02:40:61:c2:f3:b7 persistent=0
-\endverbatim
-
-\subsection ctrl_iface_event_P2P_EVENT_INVITATION_RESULT P2P-INVITATION-RESULT
-
-P2P-INVITATION-RESULT: Indicate result of a P2P invitation that was
-requested with \ref ctrl_iface_P2P_INVITE. The parameter
-status= shows the status code returned by the peer (or -1 on
-local failure or timeout).
-
-\verbatim
-P2P-INVITATION-RESULT status=1
-\endverbatim
-
-*/
diff --git a/contrib/wpa/doc/dbus.doxygen b/contrib/wpa/doc/dbus.doxygen
index 8231aac41805..e69de29bb2d1 100644
--- a/contrib/wpa/doc/dbus.doxygen
+++ b/contrib/wpa/doc/dbus.doxygen
@@ -1,2394 +0,0 @@
-/**
-\page dbus wpa_supplicant D-Bus API
-
-This section documents the wpa_supplicant D-Bus API. Every D-Bus
-interface implemented by wpa_supplicant is described here including
-their methods, signals, and properties with arguments, returned
-values, and possible errors.
-
-Interfaces:
-- \ref dbus_main
-- \ref dbus_interface
-- \ref dbus_wps
-- \ref dbus_p2pdevice
-- \ref dbus_bss
-- \ref dbus_network
-- \ref dbus_peer
-- \ref dbus_group
-- \ref dbus_persistent_group
-- \ref dbus_mesh
-
-
-\section dbus_main fi.w1.wpa_supplicant1
-
-Interface implemented by the main wpa_supplicant D-Bus object
-registered in the bus with fi.w1.wpa_supplicant1 name.
-
-\subsection dbus_main_methods Methods
-
-
-
- CreateInterface ( a{sv} : args ) --> o : interface
- Registers a wireless interface in wpa_supplicant.
- Arguments
-
- a{sv} : args
-
- A dictionary with arguments used to add the interface to wpa_supplicant. The dictionary may contain the following entries:
-
- Key Value type Description Required
- Ifname s Name of the network interface to control, e.g., wlan0 Yes
- BridgeIfname s Name of the bridge interface to control, e.g., br0 No
- Driver s Driver name which the interface uses, e.g., nl80211 No
- ConfigFile s Configuration file path No
-
-
-
- Returns
-
- o : interface
- A D-Bus path to object representing created interface
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InterfaceExists
- wpa_supplicant already controls this interface.
- fi.w1.wpa_supplicant1.UnknownError
- Creating interface failed for an unknown reason.
- fi.w1.wpa_supplicant1.InvalidArgs
- Invalid entries were found in the passed argument.
-
-
-
-
- RemoveInterface ( o : interface ) --> nothing
- Deregisters a wireless interface from wpa_supplicant.
- Arguments
-
- o : interface
- A D-Bus path to an object representing an interface to remove returned by CreateInterface
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InterfaceUnknown
- Object pointed by the path doesn't exist or doesn't represent an interface.
- fi.w1.wpa_supplicant1.UnknownError
- Removing interface failed for an unknown reason.
-
-
-
-
- GetInterface ( s : ifname ) --> o : interface
- Returns a D-Bus path to an object related to an interface which wpa_supplicant already controls.
- Arguments
-
- s : ifname
- Name of the network interface, e.g., wlan0
-
- Returns
-
- o : interface
- A D-Bus path to an object representing an interface
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InterfaceUnknown
- An interface with the passed name in not controlled by wpa_supplicant.
- fi.w1.wpa_supplicant1.UnknownError
- Getting an interface object path failed for an unknown reason.
-
-
-
-
- ExpectDisconnect ( ) --> nothing
- Notify wpa_supplicant of an externally triggered disconnection, e.g., due to system suspend.
-
-
-
-\subsection dbus_main_properties Properties
-
-
-
- DebugLevel - s - (read/write)
- Global wpa_supplicant debugging level. Possible values are
- "msgdump" (verbose debugging), "debug" (debugging),
- "info" (informative), "warning" (warnings), and "error" (errors).
-
-
-
- DebugTimestamp - b - (read/write)
- Global wpa_supplicant debugging parameter. Determines if timestamps are shown in debug logs.
-
-
-
- DebugShowKeys - b - (read/write)
- Global wpa_supplicant debugging parameter. Determines if secrets are shown in debug logs.
-
-
-
- Interfaces - ao - (read)
- An array with paths to D-Bus objects representing controlled interfaces each.
-
-
-
- EapMethods - as - (read)
- An array with supported EAP methods names.
-
-
-
- Capabilities - as - (read)
- An array with supported capabilities (e.g., "ap", "ibss-rsn", "p2p", "interworking").
-
-
-
- WFDIEs - ay - (read/write)
- Wi-Fi Display subelements.
-
-
-
-\subsection dbus_main_signals Signals
-
-
-
- InterfaceAdded ( o : interface, a{sv} : properties )
- A new interface was added to wpa_supplicant.
- Arguments
-
- o : interface
- A D-Bus path to an object representing the added interface
-
-
- a{sv} : properties
- A dictionary containing properties of added interface.
-
-
-
-
- InterfaceRemoved ( o : interface )
- An interface was removed from wpa_supplicant.
- Arguments
-
- o : interface
- A D-Bus path to an object representing the removed interface
-
-
-
-
- PropertiesChanged ( a{sv} : properties )
- Some properties have changed.
- Arguments
-
- a{sv} : properties
- A dictionary with pairs of properties names which have changed and theirs new values. Possible dictionary keys are: "DebugParams"
-
-
-
-
-
-\section dbus_interface fi.w1.wpa_supplicant1.Interface
-
-Interface implemented by objects related to network interface added to
-wpa_supplicant, i.e., returned by
-fi.w1.wpa_supplicant1.CreateInterface.
-
-\subsection dbus_interface_methods Methods
-
-
-
- Scan ( a{sv} : args ) --> nothing
- Triggers a scan.
- Arguments
-
- a{sv} : args
-
- A dictionary with arguments describing scan type:
-
- Key Value type Description Required
- Type s Type of the scan. Possible values: "active", "passive" Yes
- SSIDs aay Array of SSIDs to scan for (applies only if scan type is active) No
- IEs aay Information elements to used in active scan (applies only if scan type is active) No
- Channels a(uu) Array of frequencies to scan in form of (center, width) in MHz. No
- AllowRoam b TRUE (or absent) to allow a roaming decision based on the results of this scan, FALSE to prevent a roaming decision. No
-
-
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- Invalid entries were found in the passed argument.
-
-
-
-
- Disconnect ( ) --> nothing
- Disassociates the interface from current network.
- Possible errors
-
- fi.w1.wpa_supplicant1.NotConnected
- Interface is not connected to any network.
-
-
-
-
- AddNetwork ( a{sv} : args ) --> o : network
- Adds a new network to the interface.
- Arguments
-
- a{sv} : args
- A dictionary with network configuration. Dictionary entries are equivalent to entries in the "network" block in wpa_supplicant configuration file. Entry values should be appropriate type to the entry, e.g., an entry with key "frequency" should have value type int.
-
- Returns
-
- o : network
- A D-Bus path to an object representing a configured network
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- Invalid entries were found in the passed argument.
- fi.w1.wpa_supplicant1.UnknownError
- Adding network failed for an unknown reason.
-
-
-
-
- RemoveNetwork ( o : network ) --> nothing
- Removes a configured network from the interface.
- Arguments
-
- o : network
- A D-Bus path to an object representing a configured network returned by fi.w1.wpa_supplicant1.Interface.AddNetwork
-
- Possible errors
-
- fi.w1.wpa_supplicant1.NetworkUnknown
- A passed path doesn't point to any network object.
- fi.w1.wpa_supplicant1.InvalidArgs
- A passed path doesn't point to any network object.
- fi.w1.wpa_supplicant1.UnknownError
- Removing network failed for an unknown reason.
-
-
-
-
- RemoveAllNetworks ( ) --> nothing
- Remove all configured networks from the interface.
-
-
-
- SelectNetwork ( o : network ) --> nothing
- Attempt association with a configured network.
- Arguments
-
- o : network
- A D-Bus path to an object representing a configured network returned by fi.w1.wpa_supplicant1.Interface.AddNetwork
-
- Possible errors
-
- fi.w1.wpa_supplicant1.NetworkUnknown
- A passed path doesn't point to any network object.
- fi.w1.wpa_supplicant1.InvalidArgs
- A passed path doesn't point to any network object.
-
-
-
-
- Reassociate ( ) --> nothing
- Attempt reassociation.
- Possible errors
-
- fi.w1.wpa_supplicant1.InterfaceDisabled
- The interface is disabled.
-
-
-
-
- Reattach ( ) --> nothing
- Attempt reassociation back to the current BSS.
- Possible errors
-
- fi.w1.wpa_supplicant1.NotConnected
- Interface is not connected to any network.
-
-
-
-
- Reconnect ( ) --> nothing
- Attempt reconnection and connect if in disconnected state.
- Possible errors
-
- fi.w1.wpa_supplicant1.InterfaceDisabled
- The interface is disabled.
-
-
-
-
- Roam ( s : addr ) --> nothing
- Initiate a roam to another BSS within the current ESS.
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- Missing address argument.
- fi.w1.wpa_supplicant1.InvalidArgs
- Invalid hardware address format.
- fi.w1.wpa_supplicant1.InvalidArgs
- Target BSS not found.
- fi.w1.wpa_supplicant1.NotConnected
- Interface is not connected to any network.
- fi.w1.wpa_supplicant1.UnknownError
- Scan processing was not included in the build.
-
-
-
-
- AddBlob ( s : name, ay : data ) --> nothing
- Adds a blob to the interface.
- Arguments
-
- s : name
- A name of a blob
- ay : data
- A blob data
-
- Possible errors
-
- fi.w1.wpa_supplicant1.BlobExists
- A blob with the specified name already exists.
-
-
-
-
- RemoveBlob ( s : name ) --> nothing
- Removes the blob from the interface.
- Arguments
-
- s : name
- A name of the blob to remove
-
- Possible errors
-
- fi.w1.wpa_supplicant1.BlobUnknown
- A blob with the specified name doesn't exist.
-
-
-
-
- GetBlob ( s : name ) --> ay : data
- Returns the blob data of a previously added blob.
- Arguments
-
- s : name
- A name of the blob
-
- Returns
-
- ay : data
- A blob data
-
- Possible errors
-
- fi.w1.wpa_supplicant1.BlobUnknown
- A blob with the specified name doesn't exist.
-
-
-
- AutoScan ( s : arg ) --> nothing
- Set autoscan parameters for the interface.
- Arguments
-
- s : arg
- Autoscan parameter line or empty to unset autoscan.
-
- Possible errors
-
- fi.w1.wpa_supplicant1.NoMemory
- Needed memory was not possible to get allocated.
- fi.w1.wpa_supplicant1.InvalidArgs
- Invalid entries were found in the passed argument.
-
-
-
- TDLSDiscover ( s : peer_address ) --> nothing
- Initiate a TDLS discovery for a peer.
- Arguments
-
- s : peer_address
- MAC address for the peer to perform TDLS discovery.
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- The "peer_address" argument is not a properly formatted MAC.
- fi.w1.wpa_supplicant1.UnknownError
- Initiating the TDLS operation failed for an unknown reason.
-
-
-
- TDLSSetup ( s : peer_address ) --> nothing
- Setup a TDLS session for a peer.
- Arguments
-
- s : peer_address
- MAC address for the peer to perform TDLS setup.
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- The "peer_address" argument is not a properly formatted MAC.
- fi.w1.wpa_supplicant1.UnknownError
- Initiating the TDLS operation failed for an unknown reason.
-
-
-
- TDLSStatus ( s : peer_address ) --> s
- Return TDLS status with respect to a peer.
- Arguments
-
- s : peer_address
- MAC address for the peer for which status is requested.
-
- Returns
-
- s : status
- Current status of the TDLS link with the selected peer.
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- The "peer_address" argument is not a properly formatted MAC.
-
-
-
- TDLSTeardown ( s : peer_address ) --> nothing
- Tear down a TDLS session with a peer.
- Arguments
-
- s : peer_address
- MAC address for the peer to tear down TDLS connectivity with.
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- The "peer_address" argument is not a properly formatted MAC.
- fi.w1.wpa_supplicant1.UnknownError
- Initiating the TDLS operation failed for an unknown reason.
-
-
-
- TDLSChannelSwitch ( a{sv} : args ) --> nothing
- Configure TDLS channel switching behavior with a peer.
- Arguments
-
- a{sv} : args
- A dictionary with arguments identifying the peer and channel switching behavior.
-
-
-
- TDLSCancelChannelSwitch ( s : peer_address ) --> nothing
- Disable channel switching for a TDLS session with a peer.
- Arguments
-
- s : peer_address
- MAC address for the peer.
-
-
-
- VendorElemAdd ( i: frame_id, ay: ielems ) --> nothing
- Add Vendor Elements to corresponding frame ID.
- Arguments
-
- i : frame_id
- Frame ID for which Vendor specific IE is to be added.
- ay : ielems
- Information Element(s).
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- The "ielems" argument is not a properly formatted or size mismatch.
- fi.w1.wpa_supplicant1.NoMemory
- Needed memory was not possible to get allocated.
-
-
-
- VendorElemGet ( i: frame_id ) --> ay: ielems
- Get Vendor Elements of corresponding frame ID.
- Arguments
-
- i : frame_id
- Frame ID for which Vendor specific IE is being queried.
- ay : ielems
- Information Element(s).
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- The "frame_id" argument is not valid.
-
-
-
- VendorElemRem ( i: frame_id, ay: ielems ) --> nothing
- Remove Vendor Elements of corresponding frame ID.
- Arguments
-
- i : frame_id
- Frame ID for which Vendor specific IE is to be removed.
- ay : ielems
- Information Element(s) OR * to remove all.
-
- Possible errors
-
- fi.w1.wpa_supplicant1.InvalidArgs
- The "ielems" argument is not a properly formatted or size mismatch.
- fi.w1.wpa_supplicant1.NoMemory
- Needed memory was not possible to get allocated.
-
-
-
- SaveConfig ( ) --> nothing
- Save configuration to the configuration file.
-
-
- AbortScan ( ) --> nothing
- Abort ongoing scan operation.
-
-
- EAPLogoff ( ) --> nothing
- IEEE 802.1X EAPOL state machine logoff.
-
-
- EAPLogon ( ) --> nothing
- IEEE 802.1X EAPOL state machine logon.
-
-
-
- NetworkReply ( o : network, s : field, s : value ) --> nothing
- Provide parameter requested by NetworkRequest().
- Arguments
-
- o : network
- A D-Bus path to an object representing the network (copied from NetworkRequest()).
- s : field
- Requested information (copied from NetworkRequest()).
- s : value
- The requested information (e.g., password for EAP authentication).
-
- Possible errors
-
- fi.w1.wpa_supplicant1.NetworkUnknown
- A passed path doesn't point to any network object.
- fi.w1.wpa_supplicant1.InvalidArgs
- A passed path doesn't point to any network object.
- fi.w1.wpa_supplicant1.UnknownError
- IEEE 802.1X support was not included in the build.
-
-
-
-
- SetPKCS11EngineAndModulePath ( s : pkcs11_engine_path, s : pkcs11_module_path ) --> nothing
- Set PKCS #11 engine and module path.
- Arguments
-
- s : pkcs11_engine_path
- PKCS #11 engine path.
- s : pkcs11_module_path
- PKCS #11 module path.
-
- Possible errors
-
- org.freedesktop.DBus.Error.Failed.InvalidArgs
- Invalid PKCS #11 engine or module path.
- org.freedesktop.DBus.Error.Failed
- Reinit of the EAPOL state machine with the new PKCS #11 engine and module path failed.
-
-
-
- SignalPoll ( ) --> a{sv} : properties
- Fetch signal properties for the current connection.
- Returns
-
- a{sv} : properties
-
-
- Key Value type Description Required
- linkspeed i Link speed (Mbps) No
- noise i Noise (dBm) No
- width s Channel width No
- frequency u Frequency (MHz) No
- rssi i RSSI (dBm) No
- avg-rssi i Average RSSI (dBm) No
- center-frq1 i VHT segment 1 frequency (MHz) No
- center-frq2 i VHT segment 2 frequency (MHz) No
-
-
-
-
-
- FlushBSS ( u : age ) --> nothing
- Flush BSS entries from the cache.
- Arguments
-
- u : age
- Maximum age in seconds for BSS entries to keep in cache (0 = remove all entries).
-
-
-
-
- SubscribeProbeReq ( ) --> nothing
- Subscribe to receive Probe Request events. This is needed in addition to registering a signal handler for the ProbeRequest signal to avoid flooding D-Bus with all Probe Request indications when no application is interested in them.
- Possible errors
-
- fi.w1.wpa_supplicant1.SubscriptionInUse
- Another application is already subscribed.
- fi.w1.wpa_supplicant1.NoMemory
- Needed memory was not possible to get allocated.
-
-
-
-
- UnsubscribeProbeReq ( ) --> nothing
- Unsubscribe from receiving Probe Request events.
- Possible errors
-
- fi.w1.wpa_supplicant1.NoSubscription
- No subscription in place.
- fi.w1.wpa_supplicant1.SubscriptionNotYou
- Subscription in place, but for another process.
-
-
-
-
-\subsection dbus_interface_properties Properties
-
-
-
- Capabilities - a{sv} - (read)
- Capabilities of the interface. Dictionary contains following entries:
-
- Key Value type Description
- Pairwise as Possible array elements: "ccmp-256", "gcmp-256", "ccmp", "gcmp", "tkip", "none"
- Group as Possible array elements: "ccmp-256", "gcmp-256", "ccmp", "gcmp", "tkip", "wep104", "wep40"
- GroupMgmt as Possible array elements: "aes-128-cmac", "bip-gmac-128", "bip-gmac-256", "bip-cmac-256"
- KeyMgmt as Possible array elements: "wpa-psk", "wpa-ft-psk", "wpa-psk-sha256", "wpa-eap", "wpa-ft-eap", "wpa-eap-sha256", "sae", "owe", "ieee8021x", "wpa-none", "wps", "none"
- Protocol as Possible array elements: "rsn", "wpa"
- AuthAlg as Possible array elements: "open", "shared", "leap"
- Scan as Possible array elements: "active", "passive", "ssid"
- Modes as Possible array elements: "infrastructure", "ad-hoc", "ap"
-
-
-
-
- State - s - (read)
- A state of the interface. Possible values are: return "disconnected", "inactive", "scanning", "authenticating", "associating", "associated", "4way_handshake", "group_handshake", "completed","unknown".
-
-
-
- Scanning - b - (read)
- Determines if the interface is already scanning or not
-
-
-
- ApScan - u - (read/write)
- Identical to ap_scan entry in wpa_supplicant configuration file. Possible values are 0, 1 or 2.
-
-
-
- BSSExpireAge - u - (read/write)
- Identical to bss_expiration_age entry in wpa_supplicant configuration file.
-
-
-
- BSSExpireCount - u - (read/write)
- Identical to bss_expiration_scan_count entry in wpa_supplicant configuration file.
-
-
-
- Country - s - (read/write)
- Identical to country entry in wpa_supplicant configuration file.
-
-
-
- Ifname - s - (read)
- Name of network interface controlled by the interface, e.g., wlan0.
-
-
-
- BridgeIfname - s - (read)
- Name of bridge network interface controlled by the interface, e.g., br0.
-
-
-
- Driver - s - (read)
- Name of driver used by the interface, e.g., nl80211.
-
-
-
- ConfigFile - s - (read)
- Configuration file path. Returns an empty string if no configuration file is in use.
-
-
-
- CurrentBSS - o - (read)
- Path to D-Bus object representing BSS which wpa_supplicant is associated with, or "/" if is not associated at all.
-
-
-
- CurrentNetwork - o - (read)
- Path to D-Bus object representing configured network which wpa_supplicant uses at the moment, or "/" if doesn't use any.
-
-
-
- CurrentAuthMode - s - (read)
- Current authentication type.
-
-
-
- Blobs - as - (read)
- List of blobs names added to the Interface.
-
-
-
- BSSs - ao - (read)
- List of D-Bus objects paths representing BSSs known to the interface, i.e., scan results.
-
-
-
- Stations - ao - (read)
- List of D-Bus objects paths representing connected stations in AP mode.
-
-
-
- Networks - ao - (read)
- List of D-Bus objects paths representing configured networks.
-
-
-
- FastReauth - b - (read/write)
- Identical to fast_reauth entry in wpa_supplicant configuration file.
-
-
-
- ScanInterval - i - (read/write)
- Time (in seconds) between scans for a suitable AP. Must be >= 0.
-
-
-
- PKCS11EnginePath - s - (read)
- PKCS #11 engine path.
-
-
-
- PKCS11ModulePath - s - (read)
- PKCS #11 module path.
-
-
-
- DisconnectReason - i - (read)
- The most recent IEEE 802.11 reason code for disconnect. Negative value indicates locally generated disconnection.
-
-
-
- AuthStatusCode - i - (read)
- The most recent IEEE 802.11 status code for authentication.
-
-
-
- AssocStatusCode - i - (read)
- The most recent IEEE 802.11 status code for association rejection.
-
-
-
- RoamTime - u - (read)
- The most recent roam time in milliseconds.
-
-
-
- RoamComplete - b - (read)
- The most recent roam success or failure.
-
-
-
- SessionLength - u - (read)
- The most recent BSS session length in milliseconds.
-
-
-
- BSSTMStatus - u - (read)
- The most recent BSS Transition Management status code.
-
-
-
- EapolVersion - s - (read/write)
- IEEE 802.1X/EAPOL version number
-
-
-
- Bgscan - s - (read/write)
- Background scan and roaming parameters or an empty string if none
-
-
-
- DisableScanOffload - s - (read/write)
- Disable automatic offloading of scan requests
-
-
-
- OpenscEnginePath - s - (read/write)
- Path to the OpenSSL engine for opensc
-
-
-
- OpensslCiphers - s - (read/write)
- OpenSSL cipher string
-
-
-
- PcscReader - s - (read/write)
- PC/SC reader name prefix
-
-
-
- PcscPin - s - (read/write)
- PIN for USIM, GSM SIM, and smartcards
-
-
-
- ExternalSim - s - (read/write)
- Use external processing for SIM/USIM operations
-
-
-
- DriverParam - s - (read/write)
- Driver interface parameters
-
-
-
- Dot11RSNAConfigPMKLifetime - s - (read/write)
- Maximum lifetime of a PMK
-
-
-
- Dot11RSNAConfigPMKReauthThreshold - s - (read/write)
- PMK re-authentication threshold
-
-
-
- Dot11RSNAConfigSATimeout - s - (read/write)
- Security association timeout
-
-
-
- BssMaxCount - s - (read/write)
- Maximum number of BSS entries to keep in memory
-
-
-
- FilterSsids - s - (read/write)
- SSID-based scan result filtering
-
-
-
- FilterRssi - s - (read/write)
- RSSI-based scan result filtering
-
-
-
- MaxNumSta - s - (read/write)
- Maximum number of STAs in an AP/P2P GO
-
-
-
- DisassocLowAck - s - (read/write)
- Disassocicate stations with massive packet loss
-
-
-
- Interworking - s - (read/write)
- Whether Interworking (IEEE 802.11u) is enabled
-
-
-
- Hessid - s - (read/write)
- Homogeneous ESS identifier
-
-
-
- AccessNetworkType - s - (read/write)
- Access Network Type
-
-
-
- PbcInM1 - s - (read/write)
- AP mode WPS probing workaround for PBC with Windows 7
-
-
-
- Autoscan - s - (read/write)
- Automatic scan parameters or an empty string if none
-
-
-
- WpsNfcDevPwId - s - (read/write)
- NFC Device Password ID for password token
-
-
-
- WpsNfcDhPubkey - s - (read/write)
- NFC DH Public Key for password token
-
-
-
- WpsNfcDhPrivkey - s - (read/write)
- NFC DH Private Key for password token
-
-
-
- WpsNfcDevPw - s - (read/write)
- NFC Device Password for password token
-
-
-
- ExtPasswordBackend - s - (read/write)
- External password backend or an empty string if none
-
-
-
- P2pGoMaxInactivity - s - (read/write)
- Timeout in seconds to detect STA inactivity
-
-
-
- AutoInterworking - s - (read/write)
- Whether to use network selection automatically
-
-
-
- Okc - s - (read/write)
- Whether to enable opportunistic key caching by default
-
-
-
- Pmf - s - (read/write)
- Whether to enable/require PMF by default
-
-
-
- SaeGroups - s - (read/write)
- Preference list of enabled groups for SAE
-
-
-
- DtimPeriod - s - (read/write)
- Default DTIM period in Beacon intervals
-
-
-
- BeaconInt - s - (read/write)
- Default Beacon interval in TU
-
-
-
- IgnoreOldScanRes - s - (read/write)
- Ignore scan results older than request
-
-
-
- FreqList - s - (read/write)
- Array of allowed scan frequencies or an empty string for all
-
-
-
- ScanCurFreq - s - (read/write)
- Whether to scan only the current channel
-
-
-
- SchedScanInterval - s - (read/write)
- schedule scan interval
-
-
-
- TdlsExternalControl - s - (read/write)
- External control for TDLS setup requests
-
-
-
- OsuDir - s - (read/write)
- OSU provider information directory
-
-
-
- WowlanTriggers - s - (read/write)
- Wake-on-WLAN triggers
-
-
-
- P2pSearchDelay - s - (read/write)
- Extra delay between concurrent search iterations
-
-
-
- MacAddr - s - (read/write)
- MAC address policy default
-
-
-
- RandAddrLifetime - s - (read/write)
- Lifetime of random MAC address in seconds
-
-
-
- PreassocMacAddr - s - (read/write)
- Pre-association MAC address policy
-
-
-
- KeyMgmtOffload - s - (read/write)
- Use key management offload
-
-
-
- PassiveScan - s - (read/write)
- Whether to force passive scan for network connection
-
-
-
- ReassocSameBssOptim - s - (read/write)
- Whether to optimize reassoc-to-same-BSS
-
-
-
- WpsPriority - s - (read/write)
- Priority for the networks added through WPS
-
-
-
- MACAddressRandomizationMask - a{say} - (read/write)
- Masks to show which bits not to randomize with MAC address randomization. Possible keys are "scan", "sched_scan", and "pno". Values must be an array of 6 bytes.
- When this property is set, the new dictionary replaces the old value, rather than merging them together. Leaving a key out of the dictionary will turn off MAC address randomization for that scan type.
-
-
-
-\subsection dbus_interface_signals Signals
-
-
-
- ScanDone ( b : success )
- Scanning finished.
- Arguments
-
- s : success
- Determines if scanning was successful. If so, results are available.
-
-
-
-
- BSSAdded ( o : BSS, a{sv} : properties )
- Interface became aware of a new BSS.
- Arguments
-
- o : BSS
- A D-Bus path to an object representing the new BSS.
-
-
- a{sv} : properties
- A dictionary containing properties of added BSS.
-
-
-
-
- BSSRemoved ( o : BSS )
- BSS disappeared.
- Arguments
-
- o : BSS
- A D-Bus path to an object representing the BSS.
-
-
-
-
- BlobAdded ( s : blobName )
- A new blob has been added to the interface.
- Arguments
-
- s : blobName
- A name of the added blob.
-
-
-
-
- BlobRemoved ( s : blobName )
- A blob has been removed from the interface.
- Arguments
-
- s : blobName
- A name of the removed blob.
-
-
-
-
- NetworkAdded ( o : network, a{sv} : properties )
- A new network has been added to the interface.
- Arguments
-
- o : network
- A D-Bus path to an object representing the added network.
-
-
- a{sv} : properties
- A dictionary containing properties of added network.
-
-
-
-
- NetworkRemoved ( o : network )
- The network has been removed from the interface.
- Arguments
-
- o : network
- A D-Bus path to an object representing the removed network.
-
-
-
-
- NetworkSelected ( o : network )
- The network has been selected.
- Arguments
-
- o : network
- A D-Bus path to an object representing the selected network.
-
-
-
-
- StaAuthorized ( s : mac )
- A new station has been authorized to the interface.
- Arguments
-
- s : mac
- A mac address which has been authorized.
-
-
-
-
- StaDeauthorized ( s : mac )
- A station has been deauthorized to the interface.
- Arguments
-
- s : mac
- A mac address which has been deauthorized.
-
-
-
-
- StationAdded ( o : Station, a{sv} : properties )
- A new station has been added to the interface.
- This signal complements StaAuthorized, passing the Station object and its properties.
- Arguments
-
- o : Station
- A D-Bus path to an object representing the new Station.
-
-
- a{sv} : properties
- A dictionary containing properties of added Station.
-
-
-
-
- StationRemoved ( o : Station )
- The station has been removed from the interface.
- This signal complements StaDeauthorized, passing the Station object.
- Arguments
-
- o : Station
- A D-Bus path to an object representing the Station.
-
-
-
-
- PropertiesChanged ( a{sv} : properties )
- Some properties have changed.
- Arguments
-
- a{sv} : properties
- A dictionary with pairs of properties names which have changed and theirs new values. Possible dictionary keys are: "ApScan", "Scanning", "State", "CurrentBSS", "CurrentNetwork"
-
-
-
-
- Certification ( a{sv} : parameters )
- Information about server TLS certificates.
- Arguments
-
- a{sv} : parameters
- A dictionary with pairs of field names and their values. Possible dictionary keys are: "depth", "subject", "altsubject", "cert_hash", "cert".
-
-
-
-
- EAP ( s : status, s : parameter )
- Information about EAP peer status.
- Arguments
-
- s : status
- Operation, e.g., "started", "accept proposed method", "remote certificate verification", "eap parameter needed", "completion".
- s : parameter
- Information about the operation, e.g., EAP method name, "success".
-
-
-
-
- NetworkRequest ( o : network, s : field, s : txt )
- Request for network parameter. NetworkResponse() is used to provide the requested parameter.
- Arguments
-
- o : network
- D-Bus path to an object representing the network.
- s : field
- Requested information, e.g., "PASSWORD".
- txt : field
- Human readable information about the requested information.
-
-
-
-
- ProbeRequest ( a{sv} : args )
- Information about a received Probe Request frame. This signal is delivered only to a single application that has subscribed to received the events with SubscribeProbeReq().
- Arguments
-
- a{sv} : args
- A dictionary with pairs of field names and their values. Possible dictionary keys are: "addr", "dst", "bssid", "ies", "signal".
-
-
-
-
-
-\section dbus_wps fi.w1.wpa_supplicant1.Interface.WPS
-
-Interface for performing WPS (Wi-Fi Simple Config) operations.
-
-\subsection dbus_wps_methods Methods
-
-
-
- Start ( a{sv} : args ) --> a{sv} : output
- Starts WPS configuration. Note: When used with P2P groups, this needs to be issued on the GO group interface.
- Arguments
-
- a{sv} : args
-
- A dictionary with arguments used to start WPS configuration. The dictionary may contain the following entries:
-
- Key Value type Description Required
- Role s The device's role. Possible values are "enrollee" and "registrar". Yes
- Type s WPS authentication type. Applies only for enrollee role. Possible values are "pin" and "pbc". Yes, for enrollee role; otherwise no
- Pin s WPS Pin. Yes, for registrar role; otherwise optional
- Bssid ay Note: This is used to specify the peer MAC address when authorizing WPS connection in AP or P2P GO role. No
- P2PDeviceAddress ay P2P Device Address of a peer to authorize for PBC connection. Used only in P2P GO role. No
-
-
-
- Returns
-
- a{sv} : output
-
-
- Key Value type Description Required
- Pin s Newly generated PIN, if not specified for enrollee role and pin authentication type. No
-
-
-
- Possible errors
-
- fi.w1.wpa_supplicant1.UnknownError
- Starting WPS configuration failed for an unknown reason.
- fi.w1.wpa_supplicant1.InvalidArgs
- Invalid entries were found in the passed argument.
-
-
-
- Cancel ( nothing ) --> nothing
- Cancel ongoing WPS operation.
-
-
-
-\subsection dbus_wps_properties Properties
-
-
-
- ProcessCredentials - b - (read/write)
- Determines if the interface will process the credentials (credentials_processed configuration file parameter).
-
-
- ConfigMethods - s - (read/write)
- The currently advertised WPS configuration methods. Available methods: usba ethernet label display ext_nfc_token int_nfc_token nfc_interface push_button keypad virtual_display physical_display virtual_push_button physical_push_button.
-
-
- DeviceName - s - (read/write)
- User-friendly description of device; up to 32 octets encoded in UTF-8.
-
-
- Manufacturer - s - (read/write)
- The manufacturer of the device (up to 64 ASCII characters).
-
-
- ModelName - s - (read/write)
- Model of the device (up to 32 ASCII characters).
-
-
- ModelNumber - s - (read/write)
- Additional device description (up to 32 ASCII characters).
-
-
- SerialNumber - s - (read/write)
- Serial number of the device (up to 32 characters).
-
-
- DeviceType - ay - (read/write)
- Device Type (8 octet value with 2 octet category, 4 octet OUI, 2 octet subcategory.
-
-
-
-\subsection dbus_wps_signals Signals
-
-
-
-
-\section dbus_p2pdevice fi.w1.wpa_supplicant1.Interface.P2PDevice
-
-Interface for performing P2P (Wi-Fi Peer-to-Peer) P2P Device operations.
-
-\subsection dbus_p2pdevice_methods Methods
-
-
-
- Find ( a{sv} : args ) --> nothing
- Start P2P find operation (i.e., alternating P2P Search and Listen states to discover peers and be discoverable).
- Arguments
-
- a{sv} : args
-
- A dictionary with parameters for the P2P find operation:
-
- Key Value type Description Required
- Timeout i Timeout for operating in seconds no
- RequestedDeviceTypes aay WPS Device Types to search for no
- DiscoveryType s "start_with_full" (default, if not specified), "social", "progressive" no
- freq i Initial scan channel (frequency in MHz) for the start_with_full case to limit the initial scan to the specified channel no
-
-
-
-
-
-
- StopFind ( nothing ) --> nothing
- Stop P2P find operation.
-
-
-
- Listen ( i : timeout ) --> nothing
- Start P2P listen operation (i.e., be discoverable).
- Arguments
-
- i : timeout
- Timeout in seconds for stopping the listen operation.
-
-
-
-
- ExtendedListen ( a{sv} : args ) --> nothing
- Configure Extended Listen Timing. If the parameters are omitted, this feature is disabled. If the parameters are included, Listen State will be entered every interval msec for at least period msec. Both values have acceptable range of 1-65535 (with interval obviously having to be larger than or equal to duration). If the P2P module is not idle at the time the Extended Listen Timing timeout occurs, the Listen State operation will be skipped.
- Arguments
-
- a{sv} : args
-
- A dictionary with parameters for extended listen. Leave out all items to disable extended listen.
-
- Key Value type Description Required
- period i Extended listen period in milliseconds; 1-65535. no
- interval i Extended listen interval in milliseconds; 1-65535. no
-
-
-
-
-
-
- PresenceRequest ( a{sv} : args ) --> nothing
- Request a specific GO presence in a P2P group where the local device is a P2P Client. Send a P2P Presence Request to the GO (this is only available when acting as a P2P client). If no duration/interval pairs are given, the request indicates that this client has no special needs for GO presence. The first parameter pair gives the preferred duration and interval values in microseconds. If the second pair is included, that indicates which value would be acceptable.
- \note This needs to be issued on a P2P group interface if separate group interfaces are used.
- \bug It would be cleaner to not require .P2PDevice methods to be issued on a group interface. In other words, args['group_object'] could be used to specify the group or this method could be moved to be a .Group PresenceRequest() method.
- Arguments
-
- a{sv} : args
-
- A dictionary with parameters for the presence request.
-
- Key Value type Description Required
- duration1 i Duration in microseconds. no
- interval1 i Interval in microseconds. no
- duration2 i Duration in microseconds. no
- interval2 i Interval in microseconds. no
-
-
-
-
-
-
- ProvisionDiscoveryRequest ( o : peer, s : config_method ) --> nothing
-
-
-
- Connect ( a{sv} : args ) --> s : generated_pin
- Request a P2P group to be started through GO Negotiation or by joining an already operating group.
- Arguments
-
- a{sv} : args
-
- A dictionary with parameters for the requested connection:
-
- Key Value type Description Required
- peer o yes
- persistent b Whether to form a persistent group. no
- join b Whether to join an already operating group instead of forming a new group. no
- authorize_only b Whether to authorize a peer to initiate GO Negotiation instead of initiating immediately. no
- frequency i Operating frequency in MHz no
- go_intent i GO intent 0-15 no
- wps_method s "pbc", "display", "keypad", "pin" (alias for "display") yes
- pin s no
-
-
-
-
-
-
- GroupAdd ( a{sv} : args ) --> nothing
- Request a P2P group to be started without GO Negotiation.
- Arguments
-
- a{sv} : args
-
- A dictionary with parameters for the requested group:
-
- Key Value type Description Required
- persistent b Whether to form a persistent group. no
- persistent_group_object o no
- frequency i Operating frequency in MHz no
-
-
-
-
-
-
- Cancel ( nothing ) --> nothing
- Stop ongoing P2P group formation operation.
-
-
-
- Invite ( a{sv} : args ) --> nothing
- Invite a peer to join an already operating group or to re-invoke a persistent group.
- Arguments
-
- a{sv} : args
-
- A dictionary with parameters for the invitation:
-
- Key Value type Description Required
- peer o yes
- persistent_group_object o no
-
-
-
-
-
-
- Disconnect ( nothing ) --> nothing
- Terminate a P2P group.
- \note This needs to be issued on a P2P group interface if separate group interfaces are used.
- \bug It would be cleaner to not require .P2PDevice methods to be issued on a group interface. In other words, this would either need to be Disconnect(group_object) or moved to be a .Group Disconnect() method.
-
-
-
- RejectPeer ( o : peer ) --> nothing
- Reject connection attempt from a peer (specified with a device address). This is a mechanism to reject a pending GO Negotiation with a peer and request to automatically block any further connection or discovery of the peer.
-
-
-
- RemoveClient ( a{sv} : args ) --> nothing
- Remove the client from all groups (operating and persistent) from the local GO.
- Arguments
-
- a{sv} : args
-
- A dictionary with parameters for removing a client:
-
- Key Value type Description Required
- peer o Object path for peer's P2P Device Address yes
- iface s Interface address[MAC Address format] of the peer to be disconnected. Required if object path is not provided. no
-
-
-
-
-
-
- Flush ( nothing ) --> nothing
- Flush P2P peer table and state.
-
-
-
- AddService ( a{sv} : args ) --> nothing
-
- Arguments
-
- a{sv} : args
-
- A dictionary with parameters for the service:
-
- Key Value type Description Required
- service_type s "upnp", "bonjour" yes
- version u Required for UPnP services. no
- service s
- query ay
- response ay
-
-
-
-
-
-
- DeleteService ( a{sv} : args ) --> nothing
-
- Arguments
-
- a{sv} : args
-
- A dictionary with parameters for the service:
-
- Key Value type Description Required
- service_type s "upnp", "bonjour" yes
- version u Required for UPnP services. no
- service s
- query ay
-
-
-
-
-
-
- FlushService ( nothing ) --> nothing
-
-
-
- ServiceDiscoveryRequest ( a{sv} : args ) --> t : ref
-
- Arguments
-
- a{sv} : args
-
- A dictionary with following parameters:
-
- Key Value type Description Required
- peer_object o no
- service_type s "upnp" no
- version u Required for UPnP services. no
- service s
- tlv ay
-
-
-
-
-
-
- ServiceDiscoveryResponse ( a{sv} : args ) --> nothing : ref
-
- Arguments
-
- a{sv} : args
-
- A dictionary with following parameters:
-
- Key Value type Description Required
- peer_object o yes
- frequency i yes
- dialog_token i yes
- tlvs ay yes
-
-
-
-
-
-
- ServiceDiscoveryCancelRequest ( t : args ) --> nothing : ref
-
-
-
- ServiceUpdate ( nothing ) --> nothing
-
-
-
- ServiceDiscoveryExternal ( i : arg ) --> nothing
-
-
-
- AddPersistentGroup ( a{sv} : args ) --> o : path
-
- Arguments
-
- a{sv} : args
-
- A dictionary with following parameters:
-
- Key Value type Description Required
- bssid s P2P Device Address of the GO in the persistent group. yes
- ssid s SSID of the group yes
- psk s Passphrase (on the GO and optionally on P2P Client) or PSK (on P2P Client if passphrase ise not known) yes
- mode s "3" on GO or "0" on P2P Client yes
-
-
-
-
-
-
- RemovePersistentGroup ( o : path ) --> nothing
-
-
-
- RemoveAllPersistentGroups ( nothing ) --> nothing
-
-
-
-\subsection dbus_p2pdevice_properties Properties
-
-
-
- P2PDeviceConfig - a{sv} - (read/write)
- Dictionary with following entries. On write, only the included values are changed.
-
- Key Value type Description
- DeviceName s
- PrimaryDeviceType ay
- SecondaryDeviceTypes aay
- VendorExtension aay
- GOIntent u
- PersistentReconnect b
- ListenRegClass u
- ListenChannel u
- OperRegClass u
- OperChannel u
- SsidPostfix s
- IntraBss b
- GroupIdle u
- disassoc_low_ack u
- NoGroupIface b
- p2p_search_delay u
-
-
-
-
- Peers - ao - (read)
-
-
-
- Role - s - (read)
- \bug What is this trying to indicate? It does not make much sense to have a P2PDevice property role since there can be multiple concurrent groups and the P2P Device role is always active anyway.
-
-
-
- Group - o - (read)
- \bug What is this trying to indicate? It does not make much sense to have a P2PDevice property Group since there can be multiple concurrent groups.
-
-
-
- PeerGO - o - (read)
- \bug What is this trying to indicate? It does not make much sense to have a P2PDevice property PeerGO since there can be multiple concurrent groups.
-
-
-
- PersistentGroups - ao - (read)
-
-
-
-\subsection dbus_p2pdevice_signals Signals
-
-
-
-\section dbus_bss fi.w1.wpa_supplicant1.BSS
-
-Interface implemented by objects representing a scanned BSSs, i.e.,
-scan results.
-
-\subsection dbus_bss_properties Properties
-
-
-
- BSSID - ay - (read)
- BSSID of the BSS.
-
-
- SSID - ay - (read)
- SSID of the BSS.
-
-
- WPA - a{sv} - (read)
- WPA information of the BSS. Empty dictionary indicates no WPA support. Dictionary entries are:
-
- KeyMgmt as Key management suite. Possible array elements: "wpa-psk", "wpa-eap", "wpa-none"
- Pairwise as Pairwise cipher suites. Possible array elements: "ccmp", "tkip"
- Group s Group cipher suite. Possible values are: "ccmp", "tkip", "wep104", "wep40"
-
-
-
- RSN - a{sv} - (read)
- RSN information of the BSS. Empty dictionary indicates no RSN support. Dictionary entries are:
-
- KeyMgmt as Key management suite. Possible array elements: "wpa-psk", "wpa-ft-psk", "wpa-psk-sha256", "wpa-eap", "wpa-ft-eap", "wpa-eap-sha256", "wpa-eap-suite-b", "wpa-eap-suite-b-192", "wpa-fils-sha256", "wpa-fils-sha384", "wpa-ft-fils-sha256", "wpa-ft-fils-sha384", "sae", "ft-sae", "wpa-none"
- Pairwise as Pairwise cipher suites. Possible array elements: "ccmp", "tkip"
- Group s Group cipher suite. Possible values are: "ccmp", "tkip", "wep104", "wep40"
- MgmtGroup s Management frames cipher suite. Possible values are: "aes128cmac"
-
-
-
- WPS - a{sv} - (read)
- WPS information of the BSS. Empty dictionary indicates no WPS support. Dictionary entries are:
-
- Type s "pbc", "pin", ""
-
-
-
- IEs - ay - (read)
- All IEs of the BSS as a chain of TLVs
-
-
- Privacy - b - (read)
- Indicates if BSS supports privacy.
-
-
- Mode - s - (read)
- Describes mode of the BSS. Possible values are: "ad-hoc" and "infrastructure".
-
-
- Frequency - q - (read)
- Frequency of the BSS in MHz.
-
-
- Rates - au - (read)
- Descending ordered array of rates supported by the BSS in bits per second.
-
-
- Signal - n - (read)
- Signal strength of the BSS.
-
-
- Age - u - (read)
- Number of seconds since the BSS was last seen.
-
-
-
-\subsection dbus_bss_signals Signals
-
-
-
-
-\section dbus_network fi.w1.wpa_supplicant1.Network
-
-Interface implemented by objects representing configured networks,
-i.e., returned by fi.w1.wpa_supplicant1.Interface.AddNetwork.
-
-\subsection dbus_network_properties Properties
-
-
-
- Enabled - b - (read/write)
- Determines if the configured network is enabled or not.
-
-
-
- Properties - a{sv} - (read/write)
- Properties of the configured network. Dictionary contains entries from "network" block of wpa_supplicant configuration file. All values are string type, e.g., frequency is "2437", not 2437. When setting the properties, use the same format as for the AddNetwork() function.
-
-
-
-\subsection dbus_network_signals Signals
-
-
-
-\section dbus_peer fi.w1.wpa_supplicant1.Peer
-
-Interface implemented by objects representing P2P peer devices.
-
-\subsection dbus_peer_properties Properties
-
-
-
- DeviceName - s - (read)
-
-
-
- Manufacturer - s - (read)
-
-
-
- ModelName - s - (read)
-
-
-
- ModelNumber - s - (read)
-
-
-
- SerialNumber - s - (read)
-
-
-
- PrimaryDeviceType - ay - (read)
-
-
-
- config_method - q - (read)
-
-
-
- level - i - (read)
-
-
-
- devicecapability - y - (read)
-
-
-
- groupcapability - y - (read)
- Group Capability field from the last frame from which this peer information was updated.
- \note This field is only for debugging purposes and must not be used to determine whether the peer happens to be operating a group as a GO at the moment.
-
-
-
-
- SecondaryDeviceTypes - aay - (read)
-
-
-
- VendorExtension - aay - (read)
-
-
-
- IEs - ay - (read)
- This is a confusingly named property that includes Wi-Fi Display subelements from the peer.
- \bug This should really be renamed since "IEs" means something completely different..
-
-
-
-
- DeviceAddress - ay - (read)
- The P2P Device Address of the peer.
-
-
-
- Groups - ao - (read)
- The current groups in which this peer is connected.
-
-
-
-\subsection dbus_peer_signals Signals
-
-
-
-\section dbus_group fi.w1.wpa_supplicant1.Group
-
-Interface implemented by objects representing active P2P groups.
-
-\subsection dbus_group_properties Properties
-
-
-
- Members - ao - (read)
- Array of D-Bus object paths for the peer devices that are currently connected to the group. This is valid only on the GO device. An empty array is returned in P2P Client role.
-
-
-
- Group - o - (read)
- \todo Why is this here? This D-Bus object path is to this specific group and one needs to know it to fetching this information in the first place..
-
-
-
-
- Role - s - (read)
- The role of this device in the group: "GO", "client".
-
-
-
- SSID - ay - (read)
- P2P Group SSID.
-
-
-
- BSSID - ay - (read)
- P2P Group BSSID (the P2P Interface Address of the GO).
-
-
-
- Frequency - q - (read)
- The frequency (in MHz) of the group operating channel.
-
-
-
- Passphrase - s - (read)
- Passphrase used in the group. This is always available on the GO. For P2P Client role, this may be available depending on whether the peer GO provided the passphrase during the WPS provisioning step. If not available, an empty string is returned.
-
-
-
- PSK - ay - (read)
- PSK used in the group.
-
-
-
- WPSVendorExtensions - aay - (read/write)
- WPS vendor extension attributes used on the GO. This is valid only the in the GO role. An empty array is returned in P2P Client role. At maximum, 10 separate vendor extension byte arrays can be configured. The GO device will include the configured attributes in WPS exchanges.
-
-
-
-\subsection dbus_group_signals Signals
-
-
-
-\section dbus_persistent_group fi.w1.wpa_supplicant1.PersistentGroup
-
-Interface implemented by objects representing persistent P2P groups.
-
-\subsection dbus_persistent_group_properties Properties
-
-
-
- Properties - a{sv} - (read/write)
- Properties of the persistent group. These are same properties as in the \ref dbus_network. When writing this, only the entries to be modified are included, i.e., any item that is not included will be left at its existing value. The following entries are used for persistent groups:
-
- Key Value type Description
- bssid s P2P Device Address of the GO in the persistent group.
- ssid s SSID of the group
- psk s Passphrase (on the GO and optionally on P2P Client) or PSK (on P2P Client if passphrase ise not known)
- disabled s Set to "2" to indicate special network block use as a P2P persistent group information
- mode s "3" on GO or "0" on P2P Client
-
-
-
-
-\section dbus_mesh fi.w1.wpa_supplicant1.Interface.Mesh
-
-Interface for performing mesh operations.
-
-\subsection dbus_mesh_properties Properties
-
-
-
- MeshPeers - aay - (read)
-
-
-
- MeshGroup - ay - (read)
-
-
-
-\subsection dbus_mesh_signals Signals
-
-
-
- MeshGroupStarted ( a{sv} : args )
-
- Arguments
-
- a{sv} : args
- A dictionary containing information of the started mesh group.
-
-
-
- MeshGroupRemoved ( a{sv} : args )
-
- Arguments
-
- a{sv} : args
- A dictionary containing information of the removed mesh group.
-
-
-
- MeshPeerConnected ( a{sv} : args )
-
- Arguments
-
- a{sv} : args
- A dictionary containing information of the connected mesh peer.
-
-
-
- MeshPeerDisconnected ( a{sv} : args )
-
- Arguments
-
- a{sv} : args
- A dictionary containing information of the disconnected mesh peer.
-
-
-
-
-*/
diff --git a/contrib/wpa/doc/directories.doxygen b/contrib/wpa/doc/directories.doxygen
index 15e5bdae463c..e69de29bb2d1 100644
--- a/contrib/wpa/doc/directories.doxygen
+++ b/contrib/wpa/doc/directories.doxygen
@@ -1,90 +0,0 @@
-/**
-
-\dir hostapd hostapd
-
-hostapd-specific code for configuration, control interface, and AP
-management.
-
-
-\dir src/common Common functionality
-
-This module includes IEEE 802.11, IEEE 802.1X, and WPA related
-functionality that is shared between AP and station modes.
-
-
-\dir src/crypto Cryptographical functionality and wrappers
-
-This module defines crypto and tls interfaces to provide portability
-layer for different crypto/TLS libraries. Wrappers for number of
-libraries are also included here. In addition, internal implementation
-of various crypto functions are provided as an alternative for an
-external library and to extend some algorithms.
-
-
-\dir src/drivers Driver wrappers
-
-This directory includes the driver interface definition and all the
-driver wrappers that can be used to interact with different drivers
-without making rest of the software dependent on which particular
-driver is used.
-
-
-\dir src/eap_common Common EAP functionality for server and peer
-
-
-\dir src/eap_peer EAP peer
-
-
-\dir src/eap_server EAP server
-
-
-\dir src/eapol_auth EAPOL authenticator
-
-
-\dir src/eapol_supp EAPOL supplicant
-
-
-\dir src/l2_packet Layer 2 packet interface
-
-This module defines an interface for layer 2 (link layer) packet
-sendinf and receiving. All the wrappers for supported mechanisms are
-also included here. This is used to port packet access for new
-operating systems without having to make rest of the source code
-depend on which OS network stack is used.
-
-
-\dir src/radius RADIUS
-
-RADIUS module includes RADIUS message building and parsing
-functionality and separate RADIUS client and server functions.
-
-
-\dir src/rsn_supp IEEE 802.11 RSN and WPA supplicant
-
-
-\dir src/tls Internal TLS server and client implementation
-
-This module can be used as an alternative to using an external TLS
-library.
-
-
-\dir src/utils Utility functions
-
-Independent set of helper functions that most other components
-use. This includes portability wrappers and helpers for common tasks.
-
-
-\dir src/wps Wi-Fi Protected Setup
-
-This directory includes Wi-Fi Protected Setup functions for Registrar
-(both internal in an AP and an External Registrar and
-Enrollee. Minimal UPnP and HTTP functionality is also provided for the
-functionality needed to implement Wi-Fi Protected Setup.
-
-
-\dir wpa_supplicant wpa_supplicant
-
-wpa_supplicant-specific code for configuration, control interface, and
-client management.
-
-*/
diff --git a/contrib/wpa/doc/doxygen.conf b/contrib/wpa/doc/doxygen.conf
index 3f01173930c4..e69de29bb2d1 100644
--- a/contrib/wpa/doc/doxygen.conf
+++ b/contrib/wpa/doc/doxygen.conf
@@ -1,1547 +0,0 @@
-# Doxyfile 1.6.1
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
-
-PROJECT_NAME = "wpa_supplicant / hostapd"
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER = 2.9
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = doc
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = NO
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = YES
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = NO
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = YES
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = NO
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it parses.
-# With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this tag.
-# The format is ext=language, where ext is a file extension, and language is one of
-# the parsers supported by doxygen: IDL, Java, Javascript, C#, C, C++, D, PHP,
-# Objective-C, Python, Fortran, VHDL, C, C++. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is Fortran),
-# use: inc=Fortran f=C. Note that for custom extensions you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
-
-EXTENSION_MAPPING =
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = NO
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = NO
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = NO
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = NO
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = NO
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = YES
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = YES
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the (brief and detailed) documentation of class members so that constructors and destructors are listed first. If set to NO (the default) the constructors will appear in the respective orders defined by SORT_MEMBER_DOCS and SORT_BRIEF_DOCS. This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = NO
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 30
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = YES
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command , where is the value of
-# the FILE_VERSION_FILTER tag, and is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed by
-# doxygen. The layout file controls the global structure of the generated output files
-# in an output format independent way. The create the layout file that represents
-# doxygen's defaults, run doxygen with the -l option. You can optionally specify a
-# file name after the option, if omitted DoxygenLayout.xml will be used as the name
-# of the layout file.
-
-LAYOUT_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE = doc/doxygen.warnings
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT = \
- doc \
- hostapd \
- wpa_supplicant \
- wpa_supplicant/dbus \
- eap_example \
- src/ap \
- src/common \
- src/crypto \
- src/drivers \
- src/eap_common \
- src/eapol_auth \
- src/eapol_supp \
- src/eap_peer \
- src/eap_server \
- src/l2_packet \
- src/p2p \
- src/pae \
- src/radius \
- src/rsn_supp \
- src/tls \
- src/utils \
- src/wps
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
-
-FILE_PATTERNS = *.c *.h *.cpp *.m *.doxygen
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = NO
-
-# The EXCLUDE tag can be used to specify files and/or directories that should
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-
-EXCLUDE =
-
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS =
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS =
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH = doc
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command , where
-# is the value of the INPUT_FILTER tag, and is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-# You can download the filter tool from
-# http://w1.fi/tools/kerneldoc2doxygen-hostap.pl
-INPUT_FILTER = kerneldoc2doxygen-hostap.pl
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
-
-FILTER_PATTERNS =
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 3
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header.
-
-HTML_HEADER =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
-
-HTML_STYLESHEET =
-
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
-
-HTML_DYNAMIC_SECTIONS = NO
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html for more information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and QHP_VIRTUAL_FOLDER
-# are set, an additional index file will be generated that can be used as input for
-# Qt's qhelpgenerator to generate a Qt Compressed Help (.qch) of the generated
-# HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE =
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to add.
-# For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the custom filter to add.For more information please see
-# Qt Help Project / Custom Filters .
-
-QHP_CUST_FILTER_ATTRS =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this project's
-# filter section matches.
-# Qt Help Project / Filter Attributes .
-
-QHP_SECT_FILTER_ATTRS =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION =
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
-
-DISABLE_INDEX = NO
-
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE = 4
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-
-GENERATE_TREEVIEW = NO
-
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
-
-USE_INLINE_TREES = NO
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE = 10
-
-# When the SEARCHENGINE tag is enable doxygen will generate a search box for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using HTML help (GENERATE_HTMLHELP) or Qt help (GENERATE_QHP)
-# there is already a search function so this one should typically
-# be disabled.
-
-SEARCHENGINE = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = YES
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = NO
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4wide
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include source code with syntax highlighting in the LaTeX output. Note that which sources are shown also depends on other settings such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED = IEEE8021X_EAPOL CONFIG_CTRL_IFACE CONFIG_P2P
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-#
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
-# powerful graphs.
-
-CLASS_DIAGRAMS = NO
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = YES
-
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
-
-DOT_FONTNAME = FreeSans
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
-
-DOT_FONTPATH =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = NO
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = NO
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = NO
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK = NO
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = NO
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = NO
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = NO
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = NO
-
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
-
-DOT_IMAGE_FORMAT = png
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH =
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 50
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = YES
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP = YES
-
-
-#---------------------------------------------------------------------------
-# Project additions
-#---------------------------------------------------------------------------
-
-# Disable autolink support due to wpa_supplicant getting unfortunately
-# auto-linked to struct wpa_supplicant due to having an underscore in the name.
-AUTOLINK_SUPPORT = FALSE
diff --git a/contrib/wpa/doc/driver_wrapper.doxygen b/contrib/wpa/doc/driver_wrapper.doxygen
index 66211b3abdfb..e69de29bb2d1 100644
--- a/contrib/wpa/doc/driver_wrapper.doxygen
+++ b/contrib/wpa/doc/driver_wrapper.doxygen
@@ -1,180 +0,0 @@
-/**
-\page driver_wrapper Driver wrapper implementation (driver.h, drivers.c)
-
-All hardware and driver dependent functionality is in separate C files
-that implement defined wrapper functions. Other parts
-of the wpa_supplicant are designed to be hardware, driver, and operating
-system independent.
-
-Driver wrappers need to implement whatever calls are used in the
-target operating system/driver for controlling wireless LAN
-devices. As an example, in case of Linux, these are mostly some glue
-code and ioctl() calls and netlink message parsing for Linux Wireless
-Extensions (WE). Since features required for WPA were added only recently to
-Linux Wireless Extensions (in version 18), some driver specific code is used
-in number of driver interface implementations. These driver dependent parts
-can be replaced with generic code in \ref driver_wext.c once the target driver
-includes full support for WE-18. After that, all Linux drivers, at
-least in theory, could use the same driver wrapper code.
-
-A driver wrapper needs to implement some or all of the functions
-defined in \ref driver.h. These functions are registered by filling struct
-\ref wpa_driver_ops with function pointers. Hardware independent parts of
-wpa_supplicant will call these functions to control the driver/wlan
-card. In addition, support for driver events is required. The event
-callback function, \ref wpa_supplicant_event(), and its parameters are
-documented in \ref driver.h. In addition, a pointer to the 'struct
-\ref wpa_driver_ops' needs to be registered in \ref drivers.c file.
-
-When porting to other operating systems, the driver wrapper should be
-modified to use the native interface of the target OS. It is possible
-that some extra requirements for the interface between the driver
-wrapper and generic wpa_supplicant code are discovered during porting
-to a new operating system. These will be addressed on case by case
-basis by modifying the interface and updating the other driver
-wrappers for this. The goal is to avoid changing this interface
-without very good reasons in order to limit the number of changes
-needed to other wrappers and hardware independent parts of
-wpa_supplicant. When changes are required, recommended way is to
-make them in backwards compatible way that allows existing driver
-interface implementations to be compiled without any modification.
-
-Generic Linux Wireless Extensions functions are implemented in
-\ref driver_wext.c. All Linux driver wrappers can use these when the kernel
-driver supports the generic ioctl()s and wireless events. Driver
-specific functions are implemented in separate C files, e.g.,
-\ref driver_hostap.c. These files need to define struct \ref wpa_driver_ops
-entry that will be used in \ref wpa_supplicant.c when calling driver
-functions. struct \ref wpa_driver_ops entries are registered in \ref drivers.c.
-
-In general, it is likely to be useful to first take a look at couple
-of driver interface examples before starting on implementing a new
-one. \ref driver_hostap.c and \ref driver_wext.c include a complete
-implementation for Linux drivers that use wpa_supplicant-based control
-of WPA IE and roaming. \ref driver_ndis.c (with help from \ref driver_ndis_.c)
-is an example of a complete interface for Windows NDIS interface for
-drivers that generate WPA IE themselves and decide when to roam. These
-example implementations include full support for all security modes.
-
-
-\section driver_req Driver requirements for WPA
-
-WPA introduces new requirements for the device driver. At least some
-of these need to be implemented in order to provide enough support for
-wpa_supplicant.
-
-\subsection driver_tkip_ccmp TKIP/CCMP
-
-WPA requires that the pairwise cipher suite (encryption algorithm for
-unicast data packets) is TKIP or CCMP. These are new encryption
-protocols and thus, the driver will need to be modified to support
-them. Depending on the used wlan hardware, some parts of these may be
-implemented by the hardware/firmware.
-
-Specification for both TKIP and CCMP is available from IEEE (IEEE
-802.11i amendment). Fully functional, hardware independent
-implementation of both encryption protocols is also available in Host
-AP driver (driver/modules/hostap_{tkip,ccmp}.c). In addition, Linux 2.6
-kernel tree has generic implementations for WEP, TKIP, and CCMP that can
-be used in Linux drivers.
-
-The driver will also need to provide configuration mechanism to allow
-user space programs to configure TKIP and CCMP. Linux Wireless Extensions
-v18 added support for configuring these algorithms and
-individual/non-default keys. If the target kernel does not include WE-18,
-private ioctls can be used to provide similar functionality.
-
-\subsection driver_roaming Roaming control and scanning support
-
-wpa_supplicant can optionally control AP selection based on the
-information received from Beacon and/or Probe Response frames
-(ap_scan=1 mode in configuration). This means that the driver should
-support external control for scan process. In case of Linux, use of
-new Wireless Extensions scan support (i.e., 'iwlist wlan0 scan') is
-recommended. The current driver wrapper (\ref driver_wext.c) uses this for
-scan results.
-
-Scan results must also include the WPA information element. Support for
-this was added in WE-18. With older versions, a custom event can be used
-to provide the full WPA IE (including element id and length) as a hex
-string that is included in the scan results.
-
-wpa_supplicant needs to also be able to request the driver to
-associate with a specific BSS. Current Host AP driver and matching
-\ref driver_hostap.c wrapper uses following sequence for this
-request. Similar/identical mechanism should be usable also with other
-drivers.
-
-- set WPA IE for AssocReq with private ioctl
-- set SSID with SIOCSIWESSID
-- set channel/frequency with SIOCSIWFREQ
-- set BSSID with SIOCSIWAP
- (this last ioctl will trigger the driver to request association)
-
-\subsection driver_wpa_ie WPA IE generation
-
-wpa_supplicant selects which cipher suites and key management suites
-are used. Based on this information, it generates a WPA IE. This is
-provided to the driver interface in the associate call. This does not
-match with Windows NDIS drivers which generate the WPA IE
-themselves.
-
-wpa_supplicant allows Windows NDIS-like behavior by providing the
-selected cipher and key management suites in the associate call. If
-the driver generates its own WPA IE and that differs from the one
-generated by wpa_supplicant, the driver has to inform wpa_supplicant
-about the used WPA IE (i.e., the one it used in (Re)Associate
-Request). This notification is done using EVENT_ASSOCINFO event (see
-\ref driver.h). wpa_supplicant is normally configured to use
-ap_scan=2 mode with drivers that control WPA IE generation and roaming.
-
-\subsection driver_events Driver events
-
-wpa_supplicant needs to receive event callbacks when certain events
-occur (association, disassociation, Michael MIC failure, scan results
-available, PMKSA caching candidate). These events and the callback
-details are defined in \ref driver.h (\ref wpa_supplicant_event() function
-and enum \ref wpa_event_type).
-
-On Linux, association and disassociation can use existing Wireless
-Extensions event that is reporting new AP with SIOCGIWAP
-event. Similarly, completion of a scan can be reported with SIOCGIWSCAN
-event.
-
-Michael MIC failure event was added in WE-18. Older versions of Wireless
-Extensions will need to use a custom event. Host AP driver used a custom
-event with following contents: MLME-MICHAELMICFAILURE.indication(keyid=#
-broadcast/unicast addr=addr2). This is the recommended format until
-the driver can be moved to use WE-18 mechanism.
-
-\subsection driver_wext_summary Summary of Linux Wireless Extensions use
-
-AP selection depends on ap_scan configuration:
-
-ap_scan=1:
-
-- wpa_supplicant requests scan with SIOCSIWSCAN
-- driver reports scan complete with wireless event SIOCGIWSCAN
-- wpa_supplicant reads scan results with SIOCGIWSCAN (multiple call if
- a larger buffer is needed)
-- wpa_supplicant decides which AP to use based on scan results
-- wpa_supplicant configures driver to associate with the selected BSS
- (SIOCSIWMODE, SIOCSIWGENIE, SIOCSIWAUTH, SIOCSIWFREQ,
- SIOCSIWESSID, SIOCSIWAP)
-
-ap_scan=2:
-
-- wpa_supplicant configures driver to associate with an SSID
- (SIOCSIWMODE, SIOCSIWGENIE, SIOCSIWAUTH, SIOCSIWESSID)
-
-
-After this, both modes use similar steps:
-
-- optionally (or required for drivers that generate WPA/RSN IE for
- (Re)AssocReq), driver reports association parameters (AssocReq IEs)
- with wireless event IWEVASSOCREQIE (and optionally IWEVASSOCRESPIE)
-- driver reports association with wireless event SIOCGIWAP
-- wpa_supplicant takes care of EAPOL frame handling (validating
- information from associnfo and if needed, from scan results if WPA/RSN
- IE from the Beacon frame is not reported through associnfo)
-*/
diff --git a/contrib/wpa/doc/eap.doxygen b/contrib/wpa/doc/eap.doxygen
index 472e882004d3..e69de29bb2d1 100644
--- a/contrib/wpa/doc/eap.doxygen
+++ b/contrib/wpa/doc/eap.doxygen
@@ -1,87 +0,0 @@
-/**
-\page eap_peer_module EAP peer implementation
-
-Extensible Authentication Protocol (EAP) is an authentication framework
-defined in RFC 3748. wpa_supplicant uses a separate code module for EAP
-peer implementation. This module was designed to use only a minimal set
-of direct function calls (mainly, to debug/event functions) in order for
-it to be usable in other programs. The design of the EAP
-implementation is based loosely on RFC 4137. The state machine is
-defined in this RFC and so is the interface between the peer state
-machine and methods. As such, this RFC provides useful information for
-understanding the EAP peer implementation in wpa_supplicant.
-
-Some of the terminology used in EAP state machine is referring to
-EAPOL (IEEE 802.1X), but there is no strict requirement on the lower
-layer being IEEE 802.1X if EAP module is built for other programs than
-wpa_supplicant. These terms should be understood to refer to the
-lower layer as defined in RFC 4137.
-
-
-\section adding_eap_methods Adding EAP methods
-
-Each EAP method is implemented as a separate module, usually as one C
-file named eap_.c, e.g., \ref eap_md5.c. All EAP
-methods use the same interface between the peer state machine and
-method specific functions. This allows new EAP methods to be added
-without modifying the core EAP state machine implementation.
-
-New EAP methods need to be registered by adding them into the build
-(Makefile) and the EAP method registration list in the
-\ref eap_peer_register_methods() function of \ref eap_methods.c. Each EAP
-method should use a build-time configuration option, e.g., EAP_TLS, in
-order to make it possible to select which of the methods are included
-in the build.
-
-EAP methods must implement the interface defined in \ref eap_i.h. struct
-\ref eap_method defines the needed function pointers that each EAP method
-must provide. In addition, the EAP type and name are registered using
-this structure. This interface is based on section 4.4 of RFC 4137.
-
-It is recommended that the EAP methods would use generic helper
-functions, \ref eap_msg_alloc() and \ref eap_hdr_validate() when processing
-messages. This allows code sharing and can avoid missing some of the
-needed validation steps for received packets. In addition, these
-functions make it easier to change between expanded and legacy EAP
-header, if needed.
-
-When adding an EAP method that uses a vendor specific EAP type
-(Expanded Type as defined in RFC 3748, Chapter 5.7), the new method
-must be registered by passing vendor id instead of EAP_VENDOR_IETF to
-\ref eap_peer_method_alloc(). These methods must not try to emulate
-expanded types by registering a legacy EAP method for type 254. See
-\ref eap_vendor_test.c for an example of an EAP method implementation that
-is implemented as an expanded type.
-
-
-\section used_eap_library Using EAP implementation as a library
-
-The Git repository has an eap_example directory that contains an
-example showing how EAP peer and server code from wpa_supplicant and
-hostapd can be used as a library. The example program initializes both
-an EAP server and an EAP peer entities and then runs through an
-EAP-PEAP/MSCHAPv2 authentication.
-
-\ref eap_example_peer.c shows the initialization and glue code needed to
-control the EAP peer implementation. \ref eap_example_server.c does the
-same for EAP server. \ref eap_example.c is an example that ties in both the
-EAP server and client parts to allow an EAP authentication to be
-shown.
-
-In this example, the EAP messages are passed between the server and
-the peer are passed by direct function calls within the same process.
-In practice, server and peer functionalities would likely reside in
-separate devices and the EAP messages would be transmitted between the
-devices based on an external protocol. For example, in IEEE 802.11
-uses IEEE 802.1X EAPOL state machines to control the transmission of
-EAP messages and WiMax supports optional PMK EAP authentication
-mechanism that transmits EAP messages as defined in IEEE 802.16e.
-
-The EAP library links in number of helper functions from \ref src/utils and
-\ref src/crypto directories. Most of these are suitable as-is, but it may
-be desirable to replace the debug output code in \ref src/utils/wpa_debug.c
-by dropping this file from the library and re-implementing the
-functions there in a way that better fits in with the main
-application.
-
-*/
diff --git a/contrib/wpa/doc/eap_server.doxygen b/contrib/wpa/doc/eap_server.doxygen
index f60ac79b1e01..e69de29bb2d1 100644
--- a/contrib/wpa/doc/eap_server.doxygen
+++ b/contrib/wpa/doc/eap_server.doxygen
@@ -1,56 +0,0 @@
-/**
-\page eap_server_module EAP server implementation
-
-Extensible Authentication Protocol (EAP) is an authentication framework
-defined in RFC 3748. hostapd uses a separate code module for EAP server
-implementation. This module was designed to use only a minimal set of
-direct function calls (mainly, to debug/event functions) in order for
-it to be usable in other programs. The design of the EAP
-implementation is based loosely on RFC 4137. The state machine is
-defined in this RFC and so is the interface between the server state
-machine and methods. As such, this RFC provides useful information for
-understanding the EAP server implementation in hostapd.
-
-Some of the terminology used in EAP state machine is referring to
-EAPOL (IEEE 802.1X), but there is no strict requirement on the lower
-layer being IEEE 802.1X if EAP module is built for other programs than
-wpa_supplicant. These terms should be understood to refer to the
-lower layer as defined in RFC 4137.
-
-
-\section adding_eap_methods Adding EAP methods
-
-Each EAP method is implemented as a separate module, usually as one C
-file named eap_server_.c, e.g., \ref eap_server_md5.c. All EAP
-methods use the same interface between the server state machine and
-method specific functions. This allows new EAP methods to be added
-without modifying the core EAP state machine implementation.
-
-New EAP methods need to be registered by adding them into the build
-(Makefile) and the EAP method registration list in the
-\ref eap_server_register_methods() function of \ref eap_server_methods.c. Each EAP
-method should use a build-time configuration option, e.g., EAP_TLS, in
-order to make it possible to select which of the methods are included
-in the build.
-
-EAP methods must implement the interface defined in \ref eap_i.h. struct
-\ref eap_method defines the needed function pointers that each EAP method
-must provide. In addition, the EAP type and name are registered using
-this structure. This interface is based on section 4.4 of RFC 4137.
-
-It is recommended that the EAP methods would use generic helper
-functions, \ref eap_msg_alloc() and \ref eap_hdr_validate() when processing
-messages. This allows code sharing and can avoid missing some of the
-needed validation steps for received packets. In addition, these
-functions make it easier to change between expanded and legacy EAP
-header, if needed.
-
-When adding an EAP method that uses a vendor specific EAP type
-(Expanded Type as defined in RFC 3748, Chapter 5.7), the new method
-must be registered by passing vendor id instead of EAP_VENDOR_IETF to
-\ref eap_server_method_alloc(). These methods must not try to emulate
-expanded types by registering a legacy EAP method for type 254. See
-\ref eap_server_vendor_test.c for an example of an EAP method implementation that
-is implemented as an expanded type.
-
-*/
diff --git a/contrib/wpa/doc/hostapd.fig b/contrib/wpa/doc/hostapd.fig
index ea4ab3a2894e..e69de29bb2d1 100644
--- a/contrib/wpa/doc/hostapd.fig
+++ b/contrib/wpa/doc/hostapd.fig
@@ -1,264 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-6 1875 4050 2925 4350
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 1875 4050 2925 4050 2925 4350 1875 4350 1875 4050
-4 0 0 50 -1 0 12 0.0000 4 180 735 2025 4275 l2_packet\001
--6
-6 4725 1200 5925 1500
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4725 1200 5925 1200 5925 1500 4725 1500 4725 1200
-4 0 0 50 -1 0 12 0.0000 4 135 1005 4800 1425 GUI frontend\001
--6
-6 6000 2700 7200 3225
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 6000 2700 7200 2700 7200 3225 6000 3225 6000 2700
-4 0 0 50 -1 0 12 0.0000 4 135 975 6075 2925 WPA/WPA2\001
-4 0 0 50 -1 0 12 0.0000 4 135 1065 6075 3150 state machine\001
--6
-6 6000 4950 7200 5475
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 6000 4950 7200 4950 7200 5475 6000 5475 6000 4950
-4 0 0 50 -1 0 12 0.0000 4 135 360 6075 5175 EAP\001
-4 0 0 50 -1 0 12 0.0000 4 135 1065 6075 5400 state machine\001
--6
-6 4350 3900 5025 4425
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4350 3900 5025 3900 5025 4425 4350 4425 4350 3900
-4 0 0 50 -1 0 12 0.0000 4 105 420 4500 4125 event\001
-4 0 0 50 -1 0 12 0.0000 4 180 315 4500 4350 loop\001
--6
-6 4275 2550 5100 2850
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4275 2550 5100 2550 5100 2850 4275 2850 4275 2550
-4 0 0 50 -1 0 12 0.0000 4 135 450 4425 2775 ctrl i/f\001
--6
-6 6000 3900 7200 4425
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 6000 3900 7200 3900 7200 4425 6000 4425 6000 3900
-4 0 0 50 -1 0 12 0.0000 4 135 600 6075 4125 EAPOL\001
-4 0 0 50 -1 0 12 0.0000 4 135 1065 6075 4350 state machine\001
--6
-6 2775 3150 4050 3450
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 2775 3150 4050 3150 4050 3450 2775 3450 2775 3150
-4 0 0 50 -1 0 12 0.0000 4 180 990 2925 3375 configuration\001
--6
-6 3450 1200 4575 1500
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 3450 1200 4575 1200 4575 1500 3450 1500 3450 1200
-4 0 0 50 -1 0 12 0.0000 4 180 870 3600 1425 hostapd_cli\001
--6
-6 3525 7800 5775 8100
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 3525 7800 5775 7800 5775 8100 3525 8100 3525 7800
-4 0 0 50 -1 0 12 0.0000 4 135 2145 3600 8025 kernel network device driver\001
--6
-6 4275 6000 5100 6300
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4275 6000 5100 6000 5100 6300 4275 6300 4275 6000
-4 0 0 50 -1 0 12 0.0000 4 135 630 4350 6225 driver i/f\001
--6
-6 8175 4725 9225 5025
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 4725 9225 4725 9225 5025 8175 5025 8175 4725
-4 0 0 50 -1 0 12 0.0000 4 135 735 8250 4950 EAP-TLS\001
--6
-6 9300 4725 10350 5025
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 4725 10350 4725 10350 5025 9300 5025 9300 4725
-4 0 0 50 -1 0 12 0.0000 4 135 810 9375 4950 EAP-MD5\001
--6
-6 8175 5100 9225 5400
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 5100 9225 5100 9225 5400 8175 5400 8175 5100
-4 0 0 50 -1 0 12 0.0000 4 135 885 8250 5325 EAP-PEAP\001
--6
-6 9300 5100 10350 5400
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 5100 10350 5100 10350 5400 9300 5400 9300 5100
-4 0 0 50 -1 0 12 0.0000 4 135 840 9375 5325 EAP-TTLS\001
--6
-6 8175 5475 9225 5775
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 5475 9225 5475 9225 5775 8175 5775 8175 5475
-4 0 0 50 -1 0 12 0.0000 4 135 780 8250 5700 EAP-GTC\001
--6
-6 8175 5850 9225 6150
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 5850 9225 5850 9225 6150 8175 6150 8175 5850
-4 0 0 50 -1 0 12 0.0000 4 135 750 8250 6075 EAP-SIM\001
--6
-6 8175 6225 9225 6525
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 6225 9225 6225 9225 6525 8175 6525 8175 6225
-4 0 0 50 -1 0 12 0.0000 4 135 765 8250 6450 EAP-PSK\001
--6
-6 9300 5850 10350 6150
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 5850 10350 5850 10350 6150 9300 6150 9300 5850
-4 0 0 50 -1 0 12 0.0000 4 135 825 9375 6075 EAP-AKA\001
--6
-6 9300 5475 10350 5775
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 5475 10350 5475 10350 5775 9300 5775 9300 5475
-4 0 0 50 -1 0 12 0.0000 4 135 795 9375 5700 EAP-PAX\001
--6
-6 8175 6600 9675 6900
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 6600 9675 6600 9675 6900 8175 6900 8175 6600
-4 0 0 50 -1 0 12 0.0000 4 135 1365 8250 6825 EAP-MSCHAPv2\001
--6
-6 8700 3450 9375 3750
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8700 3450 9375 3450 9375 3750 8700 3750 8700 3450
-4 0 0 50 -1 0 12 0.0000 4 150 480 8775 3675 crypto\001
--6
-6 9600 3450 10275 3750
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9600 3450 10275 3450 10275 3750 9600 3750 9600 3450
-4 0 0 50 -1 0 12 0.0000 4 135 315 9750 3675 TLS\001
--6
-6 6000 5775 7200 6300
-6 6000 5775 7200 6300
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 6000 5775 7200 5775 7200 6300 6000 6300 6000 5775
-4 0 0 50 -1 0 12 0.0000 4 135 690 6075 6000 RADIUS\001
--6
-4 0 0 50 -1 0 12 0.0000 4 90 480 6075 6225 server\001
--6
-6 8100 2250 8925 2775
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8100 2250 8925 2250 8925 2775 8100 2775 8100 2250
-4 0 0 50 -1 0 12 0.0000 4 135 690 8175 2475 RADIUS\001
-4 0 0 50 -1 0 12 0.0000 4 135 420 8175 2700 client\001
--6
-6 3150 5475 4425 5775
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 3150 5475 4425 5475 4425 5775 3150 5775 3150 5475
-4 0 0 50 -1 0 12 0.0000 4 135 990 3300 5700 driver events\001
--6
-6 1950 5550 2625 6075
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 1950 5550 2625 5550 2625 6075 1950 6075 1950 5550
-4 0 0 50 -1 0 12 0.0000 4 135 540 2025 5775 Station\001
-4 0 0 50 -1 0 12 0.0000 4 135 375 2025 6000 table\001
--6
-6 1875 4725 2925 5250
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 1875 4725 2925 4725 2925 5250 1875 5250 1875 4725
-4 0 0 50 -1 0 12 0.0000 4 135 960 1950 4950 IEEE 802.11\001
-4 0 0 50 -1 0 12 0.0000 4 135 555 1950 5175 MLME\001
--6
-2 1 1 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2
- 1275 4200 1875 4200
-2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
- 4500 2550 3900 1500
-2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
- 4800 2550 5400 1500
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 2925 4200 4350 4200
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5025 3900 6000 3000
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5025 4200 6000 4200
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4650 6000 4650 4425
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6600 4425 6600 4950
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6600 3225 6600 3900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 7200 5250 8100 5250
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 9075 4425 9075 3750
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 7200 3000 8700 3525
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4650 3900 4650 2850
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 7200 4125 8700 3675
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6000 4350 5025 6000
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6000 3150 4875 6000
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 1500 2100 10800 2100 10800 7500 1500 7500 1500 2100
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 9900 4425 9900 3750
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 1
- 4350 3900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4350 3900 4050 3450
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4350 4425 4050 5475
-2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
- 2250 7200 4200 7800
-2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
- 7200 7200 5100 7800
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 2775 6900 3675 6900 3675 7200 2775 7200 2775 6900
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 3750 6900 4650 6900 4650 7200 3750 7200 3750 6900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4
- 2250 6900 2250 6600 7200 6600 7200 6900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 3225 6900 3225 6600
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4200 6900 4200 6600
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5175 6900 5175 6600
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6150 6900 6150 6600
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4650 6600 4650 6300
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 1800 6900 2700 6900 2700 7200 1800 7200 1800 6900
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4725 6900 5625 6900 5625 7200 4725 7200 4725 6900
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 5700 6900 6600 6900 6600 7200 5700 7200 5700 6900
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 6675 6900 7800 6900 7800 7200 6675 7200 6675 6900
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8100 6975 10425 6975 10425 4425 8100 4425 8100 6975
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6600 5475 6600 5775
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5025 4425 6000 5775
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 4800 3900 5925 2550 8100 2550
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 7200 3900 8475 2775
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9450 2250 10425 2250 10425 2775 9450 2775 9450 2250
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 8925 2475 9450 2475
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 2325 5550 2325 5250
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 2925 4950 4350 4275
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 3
- 2850 4725 5775 2400 8100 2400
-4 0 0 50 -1 0 12 0.0000 4 135 915 375 3975 EAPOL and\001
-4 0 0 50 -1 0 12 0.0000 4 180 630 375 4200 pre-auth\001
-4 0 0 50 -1 0 12 0.0000 4 180 810 375 4425 ethertypes\001
-4 0 0 50 -1 0 12 0.0000 4 135 1050 375 4650 from/to kernel\001
-4 0 0 50 -1 0 12 0.0000 4 135 1920 3675 1875 frontend control interface\001
-4 0 0 50 -1 2 14 0.0000 4 195 720 1637 2371 hostapd\001
-4 0 0 50 -1 0 12 0.0000 4 180 600 3825 7125 prism54\001
-4 0 0 50 -1 0 12 0.0000 4 180 510 1875 7125 hostap\001
-4 0 0 50 -1 0 12 0.0000 4 135 600 2850 7125 nl80211\001
-4 0 0 50 -1 0 12 0.0000 4 135 270 4800 7125 bsd\001
-4 0 0 50 -1 0 12 0.0000 4 105 300 6750 7125 test\001
-4 0 0 50 -1 0 12 0.0000 4 135 420 5775 7125 wired\001
-4 0 0 50 -1 0 12 0.0000 4 135 1050 8700 4650 EAP methods\001
-4 0 0 50 -1 0 12 0.0000 4 135 690 9525 2475 RADIUS\001
-4 0 0 50 -1 0 12 0.0000 4 180 825 9525 2700 accounting\001
diff --git a/contrib/wpa/doc/hostapd_ctrl_iface.doxygen b/contrib/wpa/doc/hostapd_ctrl_iface.doxygen
index 4d2bac82c43f..e69de29bb2d1 100644
--- a/contrib/wpa/doc/hostapd_ctrl_iface.doxygen
+++ b/contrib/wpa/doc/hostapd_ctrl_iface.doxygen
@@ -1,66 +0,0 @@
-/**
-\page hostapd_ctrl_iface_page hostapd control interface
-
-hostapd implements a control interface that can be used by
-external programs to control the operations of the hostapd
-daemon and to get status information and event notifications. There is
-a small C library, in a form of a single C file, \ref wpa_ctrl.c, that
-provides helper functions to facilitate the use of the control
-interface. External programs can link this file into them and then use
-the library functions documented in \ref wpa_ctrl.h to interact with
-wpa_supplicant. This library can also be used with C++. \ref hostapd_cli.c
-is an example program using this library.
-
-There are multiple mechanisms for inter-process communication. For
-example, Linux version of hostapd is using UNIX domain sockets for the
-control interface. The use of the functions defined in \ref wpa_ctrl.h can
-be used to hide the details of the used IPC from external programs.
-
-
-\section using_ctrl_iface Using the control interface
-
-External programs, e.g., a GUI or a configuration utility, that need to
-communicate with hostapd should link in \ref wpa_ctrl.c. This
-allows them to use helper functions to open connection to the control
-interface with \ref wpa_ctrl_open() and to send commands with
-\ref wpa_ctrl_request().
-
-hostapd uses the control interface for two types of communication:
-commands and unsolicited event messages. Commands are a pair of
-messages, a request from the external program and a response from
-hostapd. These can be executed using \ref wpa_ctrl_request().
-Unsolicited event messages are sent by hostapd to the control
-interface connection without specific request from the external program
-for receiving each message. However, the external program needs to
-attach to the control interface with \ref wpa_ctrl_attach() to receive these
-unsolicited messages.
-
-If the control interface connection is used both for commands and
-unsolicited event messages, there is potential for receiving an
-unsolicited message between the command request and response.
-\ref wpa_ctrl_request() caller will need to supply a callback, msg_cb,
-for processing these messages. Often it is easier to open two
-control interface connections by calling \ref wpa_ctrl_open() twice and
-then use one of the connections for commands and the other one for
-unsolicited messages. This way command request/response pairs will
-not be broken by unsolicited messages. \ref wpa_cli.c is an example of how
-to use only one connection for both purposes and wpa_gui demonstrates
-how to use two separate connections.
-
-Once the control interface connection is not needed anymore, it should
-be closed by calling \ref wpa_ctrl_close(). If the connection was used for
-unsolicited event messages, it should be first detached by calling
-\ref wpa_ctrl_detach().
-
-
-\section ctrl_iface_cmds Control interface commands
-
-Following commands can be used with \ref wpa_ctrl_request():
-
-\subsection ctrl_iface_PING PING
-
-This command can be used to test whether hostapd is replying
-to the control interface commands. The expected reply is \c PONG if the
-connection is open and hostapd is processing commands.
-
-*/
diff --git a/contrib/wpa/doc/mainpage.doxygen b/contrib/wpa/doc/mainpage.doxygen
index 329afea3fa6a..e69de29bb2d1 100644
--- a/contrib/wpa/doc/mainpage.doxygen
+++ b/contrib/wpa/doc/mainpage.doxygen
@@ -1,95 +0,0 @@
-/**
-\mainpage Developers' documentation for wpa_supplicant and hostapd
-
-The goal of this documentation and comments in the source code is to
-give enough information for other developers to understand how
-wpa_supplicant and hostapd have been implemented, how they can be
-modified, how new drivers can be supported, and how the source code
-can be ported to other operating systems. If any information is
-missing, feel free to contact Jouni Malinen for more
-information. Contributions as patch files are also very welcome at the
-same address. Please note that this software is licensed under the
-BSD license (the one with advertisement clause removed). All
-contributions to wpa_supplicant and hostapd are expected to use
-compatible licensing terms.
-
-The source code and read-only access to the combined wpa_supplicant
-and hostapd Git repository is available from the project home page at
-http://w1.fi/wpa_supplicant/. This developers' documentation is also
-available as a PDF file from
-http://w1.fi/wpa_supplicant/wpa_supplicant-devel.pdf .
-
-
-\section _wpa_supplicant wpa_supplicant
-
-wpa_supplicant is a WPA Supplicant for Linux, BSD and Windows with
-support for WPA and WPA2 (IEEE 802.11i / RSN). Supplicant is the IEEE
-802.1X/WPA component that is used in the client stations. It
-implements key negotiation with a WPA Authenticator and it can optionally
-control roaming and IEEE 802.11 authentication/association of the wlan
-driver.
-
-The design goal for wpa_supplicant was to use hardware, driver, and
-OS independent, portable C code for all WPA functionality. The source
-code is divided into separate C files as shown on the \ref
-code_structure "code structure page". All hardware/driver specific
-functionality is in separate files that implement a \ref
-driver_wrapper "well-defined driver API". Information about porting
-to different target boards and operating systems is available on
-the \ref porting "porting page".
-
-EAPOL (IEEE 802.1X) state machines are implemented as a separate
-module that interacts with \ref eap_peer_module "EAP peer implementation".
-In addition to programs aimed at normal production use,
-wpa_supplicant source tree includes number of \ref testing_tools
-"testing and development tools" that make it easier to test the
-programs without having to setup a full test setup with wireless
-cards. These tools can also be used to implement automatic test
-suites.
-
-wpa_supplicant implements a
-\ref ctrl_iface_page "control interface" that can be used by
-external programs to control the operations of the wpa_supplicant
-daemon and to get status information and event notifications. There is
-a small C library that provides helper functions to facilitate the use of the
-control interface. This library can also be used with C++.
-
-\image html _wpa_supplicant.png "wpa_supplicant modules"
-\image latex _wpa_supplicant.eps "wpa_supplicant modules" width=15cm
-
-
-\section _hostapd hostapd
-
-hostapd includes IEEE 802.11 access point management (authentication /
-association), IEEE 802.1X/WPA/WPA2 Authenticator, EAP server, and
-RADIUS authentication server functionality. It can be build with
-various configuration option, e.g., a standalone AP management
-solution or a RADIUS authentication server with support for number of
-EAP methods.
-
-The design goal for hostapd was to use hardware, driver, and
-OS independent, portable C code for all WPA functionality. The source
-code is divided into separate C files as shown on the \ref
-code_structure "code structure page". All hardware/driver specific
-functionality is in separate files that implement a \ref
-driver_wrapper "well-defined driver API". Information about porting
-to different target boards and operating systems is available on
-the \ref porting "porting page".
-
-EAPOL (IEEE 802.1X) state machines are implemented as a separate
-module that interacts with \ref eap_server_module "EAP server implementation".
-Similarly, RADIUS authentication server is in its own separate module.
-Both IEEE 802.1X and RADIUS authentication server can use EAP server
-functionality.
-
-hostapd implements a \ref hostapd_ctrl_iface_page "control interface"
-that can be used by external programs to control the operations of the
-hostapdt daemon and to get status information and event notifications.
-There is a small C library that provides helper functions to facilitate
-the use of the control interface. This library can also be used with
-C++.
-
-\image html hostapd.png "hostapd modules"
-\image latex hostapd.eps "hostapd modules" width=15cm
-
-*/
diff --git a/contrib/wpa/doc/p2p.doxygen b/contrib/wpa/doc/p2p.doxygen
index d4d86e3edfa2..e69de29bb2d1 100644
--- a/contrib/wpa/doc/p2p.doxygen
+++ b/contrib/wpa/doc/p2p.doxygen
@@ -1,471 +0,0 @@
-/**
-\page p2p Wi-Fi Direct - P2P module
-
-Wi-Fi Direct functionality is implemented any many levels in the WLAN
-stack from low-level driver operations to high-level GUI design. This
-document covers the parts that can be user by wpa_supplicant. However,
-it should be noted that alternative designs are also possible, so some
-of the functionality may reside in other components in the system.
-
-The driver (or WLAN firmware/hardware) is expected to handle low-level
-operations related to P2P Power Management and channel scheduling. In
-addition, support for virtual network interface and data frame
-processing is done inside the driver. Configuration for these
-low-level operations is defined in the driver interface:
-src/drivers/driver.h. This defines both the commands and events used to
-interact with the driver.
-
-P2P module implements higher layer functionality for management P2P
-groups. It takes care of Device Discovery, Service Discovery, Group
-Owner Negotiation, P2P Invitation. In addition, it maintains
-information about neighboring P2P Devices. This module could be used
-in designs that do not use wpa_supplicant and it could also reside
-inside the driver/firmware component. P2P module API is defined in
-\ref src/p2p/p2p.h.
-
-Provisioning step of Group Formation is implemented using WPS
-(\ref src/wps/wps.h).
-
-wpa_supplicant includes code in interact with both the P2P module
-(\ref wpa_supplicant/p2p_supplicant.c) and WPS
-(\ref wpa_supplicant/wps_supplicant.c). The driver operations are passed
-through these files, i.e., core P2P or WPS code does not interact
-directly with the driver interface.
-
-
-\section p2p_arch P2P architecture
-
-P2P functionality affects many areas of the system architecture. This
-section shows couple of examples on the location of main P2P
-components. In the diagrams below, green arrows are used to show
-communication paths from the P2P module to upper layer management
-functionality and all the way to a GUI that user could use to manage
-P2P connections. Blue arrows show the path taken for lower layer
-operations. Glue code is used to bind the P2P module API to the rest
-of the system to provide access both towards upper and lower layer
-functionality.
-
-\subsection p2p_arch_mac80211 P2P architecture with Linux/mac80211/ath9k
-
-An architecture where the P2P module resides inside the
-wpa_supplicant process is used with Linux mac80211-based drivers,
-e.g., ath9k. The following diagram shows the main components related
-to P2P functionality in such an architecture.
-
-\image html p2p_arch.png "P2P module within wpa_supplicant"
-\image latex p2p_arch.eps "P2P module within wpa_supplicant" width=15cm
-
-\subsection p2p_arch_umac P2P architecture with UMAC
-
-The following diagram shows the main components related to P2P
-functionality in an architecture where the P2P module resides inside
-the kernel IEEE 802.11 stack (UMAC in the figure).
-
-\image html p2p_arch2.png "P2P module in kernel
-\image latex p2p_arch2.eps "P2P module in kernel" width=15cm
-
-
-\section p2p_module P2P module
-
-P2P module manages discovery and group formation with a single state
-machine, i.e., only a single operation per device can be in progress
-at any given time. The following diagram describes the P2P state
-machine. For clarity, it does not include state transitions on
-operation timeouts to the IDLE state. The states that are marked with
-dotted ellipse are listed for clarity to describe the protocol
-functionality for Device Discovery phase, but are not used in the
-implementation (the SEARCH state is used to manage the initial Scan
-and the alternating Listen and Search states within Find).
-
-\image html p2p_sm.png "P2P module state machine"
-\image latex p2p_sm.eps "P2P module state machine" width=15cm
-
-\subsection p2p_module_api P2P module API
-
-P2P module API is defined in \ref src/p2p/p2p.h. The API consists of
-functions for requesting operations and for providing event
-notifications. Similar set of callback functions are configured with
-struct p2p_config to provide callback functions that P2P module can
-use to request operations and to provide event notifications. In
-addition, there are number of generic helper functions that can be
-used for P2P related operations.
-
-These are the main functions for an upper layer management entity to
-request P2P operations:
-- \ref p2p_find()
-- \ref p2p_stop_find()
-- \ref p2p_listen()
-- \ref p2p_connect()
-- \ref p2p_reject()
-- \ref p2p_prov_disc_req()
-- \ref p2p_sd_request()
-- \ref p2p_sd_cancel_request()
-- \ref p2p_sd_response()
-- \ref p2p_sd_service_update()
-- \ref p2p_invite()
-
-These are the main callback functions for P2P module to provide event
-notifications to the upper layer management entity:
-
-- \ref p2p_config::dev_found()
-- \ref p2p_config::go_neg_req_rx()
-- \ref p2p_config::go_neg_completed()
-- \ref p2p_config::sd_request()
-- \ref p2p_config::sd_response()
-- \ref p2p_config::prov_disc_req()
-- \ref p2p_config::prov_disc_resp()
-- \ref p2p_config::invitation_process()
-- \ref p2p_config::invitation_received()
-- \ref p2p_config::invitation_result()
-
-The P2P module uses following functions to request lower layer driver
-operations:
-
-- \ref p2p_config::p2p_scan()
-- \ref p2p_config::send_probe_resp()
-- \ref p2p_config::send_action()
-- \ref p2p_config::send_action_done()
-- \ref p2p_config::start_listen()
-- \ref p2p_config::stop_listen()
-
-Events from lower layer driver operations are delivered to the P2P
-module with following functions:
-
-- \ref p2p_probe_req_rx()
-- \ref p2p_rx_action()
-- \ref p2p_scan_res_handler()
-- \ref p2p_scan_res_handled()
-- \ref p2p_send_action_cb()
-- \ref p2p_listen_cb()
-
-In addition to the per-device state, the P2P module maintains
-per-group state for group owners. This is initialized with a call to
-p2p_group_init() when a group is created and deinitialized with
-p2p_group_deinit(). The upper layer GO management entity uses
-following functions to interact with the P2P per-group state:
-
-- \ref p2p_group_notif_assoc()
-- \ref p2p_group_notif_disassoc()
-- \ref p2p_group_notif_formation_done()
-- \ref p2p_group_match_dev_type()
-
-The P2P module will use following callback function to update P2P IE
-for GO Beacon and Probe Response frames:
-
-- \ref p2p_group_config::ie_update()
-
-
-\section p2p_driver P2P driver operations (low-level interface)
-
-The following driver wrapper functions are needed for P2P in addition
-to the standard station/AP mode operations when the P2P module resides
-within wpa_supplicant:
-- \ref wpa_driver_ops::if_add()
-- \ref wpa_driver_ops::if_remove()
-- \ref wpa_driver_ops::remain_on_channel()
-- \ref wpa_driver_ops::cancel_remain_on_channel()
-- \ref wpa_driver_ops::send_action()
-- \ref wpa_driver_ops::probe_req_report()
-
-The following driver wrapper events are needed for P2P in addition to
-the standard station/AP mode events when the P2P module resides within
-wpa_supplicant:
-- \ref wpa_event_type::EVENT_RX_MGMT
-- \ref wpa_event_type::EVENT_REMAIN_ON_CHANNEL
-- \ref wpa_event_type::EVENT_CANCEL_REMAIN_ON_CHANNEL
-- \ref wpa_event_type::EVENT_RX_PROBE_REQ
-
-
-\section p2p_go_neg P2P device discovery and group formation
-
-This section shows an example sequence of operations that can be used
-to implement P2P device discovery and group formation. The function
-calls are described based on the P2P module API. The exact design for
-the glue code outside the P2P module depends on the architecture used
-in the system.
-
-An upper layer management entity starts P2P device discovery by
-calling \ref p2p_find(). The P2P module start the discovery by requesting a
-full scan to be completed by calling \ref p2p_config::p2p_scan(). Results
-from the scan will be reported by calling \ref p2p_scan_res_handler() and
-after last result, the scan result processing is terminated with a
-call to \ref p2p_scan_res_handled(). The P2P peers that are found during
-the full scan are reported with the \ref p2p_config::dev_found() callback.
-
-After the full scan, P2P module start alternating between Listen and
-Search states until the device discovery operation times out or
-terminated, e.g., with a call to \ref p2p_stop_find().
-
-When going into the Listen state, the P2P module requests the driver
-to be configured to be awake on the listen channel with a call to
-\ref p2p_config::start_listen(). The glue code using the P2P module may
-implement this, e.g., by using remain-on-channel low-level driver
-functionality for off-channel operation. Once the driver is available
-on the requested channel, notification of this is delivered by calling
-\ref p2p_listen_cb(). The Probe Request frames that are received during the
-Listen period are delivered to the P2P module by calling
-\ref p2p_config::p2p_probe_req_rx() and P2P module request a response to
-these to be sent by using \ref p2p_config::send_probe_resp() callback
-function. If a group owner negotiation from another P2P device is
-received during the device discovery phase, that is indicated to the
-upper layer code with the \ref p2p_config::go_neg_req_tx() callback.
-
-The Search state is implemented by using the normal scan interface,
-i.e., the P2P module will call \ref p2p_config::p2p_scan() just like in the
-full scan phase described. Similarly, scan results from the search
-operation will be delivered to the P2P module using the
-\ref p2p_scan_res_handler() and \ref p2p_scan_res_handled() functions.
-
-Once the upper layer management entity has found a peer with which it
-wants to connect by forming a new group, it initiates group owner
-negotiation by calling \ref p2p_connect(). Before doing this, the upper
-layer code is responsible for asking the user to provide the PIN to be
-used during the provisioning step with the peer or the push button
-press for PBC mode. The glue code will need to figure out the intended
-interface address for the group before group owner negotiation can be
-started.
-
-Optional Provision Discovery mechanism can be used to request the peer
-to display a PIN for the local device to enter (and vice versa). Upper
-layer management entity can request the specific mechanism by calling
-\ref p2p_prov_disc_req(). The response to this will be reported with the
-\ref p2p_config::prov_disc_resp() callback. If the peer device started
-Provision Discovery, an accepted request will be reported with the
-\ref p2p_config::prov_disc_req() callback. The P2P module will
-automatically accept the Provision Discovery for display and keypad
-methods, but it is up to the upper layer manegement entity to actually
-generate the PIN and to configure it with following \ref p2p_connect() call
-to actually authorize the connection.
-
-The P2P module will use \ref p2p_config::send_action() callback to request
-lower layer code to transmit an Action frame during group owner
-negotiation. \ref p2p_send_action_cb() is used to report the result of
-transmission. If the peer is not reachable, the P2P module will try to
-find it by alternating between Action frame send and Listen
-states. The Listen state for this phase will be used similarly to the
-Listen state during device discovery as described above.
-
-Once the group owner negotiation has been completed, its results will
-be reported with the \ref p2p_config::go_neg_completed() callback. The
-upper layer management code or the glue code using the P2P module API
-is responsible for creating a new group interface and starting
-provisioning step at this point by configuring WPS Registrar or
-Enrollee functionality based on the reported group owner negotiation
-results. The upper layer code is also responsible for timing out WPS
-provisioning if it cannot be completed in 15 seconds.
-
-Successful completion of the WPS provisioning is reported with a call
-to \ref p2p_wps_success_cb(). The P2P module will clear its group formation
-state at this point and allows new group formation attempts to be
-started. The upper layer management code is responsible for configuring
-the GO to accept associations from devices and the client to connect to
-the GO with the provisioned credentials. GO is also responsible for
-calling \ref p2p_group_notif_formation_done() as described below.
-
-If the WPS provisioning step fails or times out, this is reported with
-a call to \ref p2p_group_formation_failed(). The P2P module will clear its
-group formation state at this point and allows new group formation
-attempts to be started. The upper layer management code is responsible
-for removing the group interface for the failed group.
-
-
-\section p2p_sd P2P service discovery
-
-P2P protocol includes service discovery functionality that can be used
-to discover which services are provided by the peers before forming a
-group. This leverages the Generic Advertisement Service (GAS) protocol
-from IEEE 802.11u and P2P vendor-specific contents inside the Native
-GAS messages.
-
-The P2P module takes care of GAS encapsulation, fragmentation, and
-actual transmission and reception of the Action frames needed for
-service discovery. The user of the P2P module is responsible for
-providing P2P specific Service Request TLV(s) for queries and Service
-Response TLV(s) for responses.
-
-\subsection p2p_sd_query Querying services of peers
-
-Service discovery is implemented by processing pending queries as a
-part of the device discovery phase. \ref p2p_sd_request() function is used
-to schedule service discovery queries to a specific peer or to all
-discovered peers. \ref p2p_sd_cancel_request() can be used to cancel a
-scheduled query. Queries that are specific to a single peer will be
-removed automatically after the response has been received.
-
-After the service discovery queries have been queued, device discovery
-is started with a call to \ref p2p_find(). The pending service discovery
-queries are then sent whenever a peer is discovered during the find
-operation. Responses to the queries will be reported with the
-\ref p2p_config::sd_response() callback.
-
-\subsection p2p_sd_response Replying to service discovery queries from peers
-
-The received service discovery requests will be indicated with the
-\ref p2p_config::sd_request() callback. The response to the query is sent
-by calling \ref p2p_sd_response().
-
-\subsection p2p_sd_indicator Service update indicator
-
-P2P service discovery provides a mechanism to notify peers about
-changes in available services. This works by incrementing Service
-Update Indicator value whenever there is a change in the
-services. This value is included in all SD request and response
-frames. The value received from the peers will be included in the
-\ref p2p_config::sd_request() and \ref p2p_config::sd_response() callbacks. The
-value to be sent to the peers is incremented with a call to
-\ref p2p_sd_service_update() whenever availability of the local services
-changes.
-
-
-\section p2p_go P2P group owner
-
-This section describes how P2P module can be used for managing
-per-group information in a group owner. The function calls are
-described based on the P2P module API. The exact design for the glue
-code outside the P2P module depends on the architecture used in the
-system.
-
-When a P2P group interface is created in group owner role, per-group
-data is initialized with \ref p2p_group_init(). This call provides a
-pointer to the per-device P2P module context and configures the
-per-group operation. The configured \ref p2p_group_config::ie_update()
-callback is used to set the initial P2P IE for Beacon and Probe
-Response frames in the group owner. The AP mode implementation may use
-this information to add IEs into the frames.
-
-Once the group formation has been completed (or if it is skipped in
-case of manual group setup), \ref p2p_group_notif_formation_done() is
-called. This will allow the P2P module to update the P2P IE for
-Beacon and Probe Response frames.
-
-The SME/MLME code that managements IEEE 802.11 association processing
-needs to inform P2P module whenever a P2P client associates or
-disassociates with the group. This is done by calling
-\ref p2p_group_notif_assoc() and \ref p2p_group_notif_disassoc(). The P2P module
-manages a list of group members and updates the P2P Group Information
-subelement in the P2P IE based on the information from the P2P
-clients. The \ref p2p_group_config::ie_update() callback is used whenever
-the P2P IE in Probe Response frames needs to be changed.
-
-The SME/MLME code that takes care of replying to Probe Request frames
-can use \ref p2p_group_match_dev_type() to check whether the Probe Request
-frame request a reply only from groups that include a specific device
-type in one of the clients or GO. A match will be reported if the
-Probe Request does not request a specific device type, so this
-function can be used to filter or received Probe Request frames and
-only the ones that result in non-zero return value need to be replied.
-
-When the P2P group interface for GO role is removed,
-\ref p2p_group_deinit() is used to deinitialize the per-group P2P module
-state.
-
-
-\section p2p_ctrl_iface P2P control interface
-
-wpa_supplicant \ref ctrl_iface_page "control interface" can be used
-to manage P2P functionality from an external program (e.g., a GUI or a
-system configuration manager). This interface can be used directly
-through the control interface backend mechanism (e.g., local domain
-sockets on Linux) or with help of wpa_cli (e.g., from a script).
-
-The following P2P-related commands are available:
-- \ref ctrl_iface_P2P_FIND P2P_FIND
-- \ref ctrl_iface_P2P_STOP_FIND P2P_STOP_FIND
-- \ref ctrl_iface_P2P_CONNECT P2P_CONNECT
-- \ref ctrl_iface_P2P_LISTEN P2P_LISTEN
-- \ref ctrl_iface_P2P_GROUP_REMOVE P2P_GROUP_REMOVE
-- \ref ctrl_iface_P2P_GROUP_ADD P2P_GROUP_ADD
-- \ref ctrl_iface_P2P_PROV_DISC P2P_PROV_DISC
-- \ref ctrl_iface_P2P_SERV_DISC_REQ P2P_SERV_DISC_REQ
-- \ref ctrl_iface_P2P_SERV_DISC_CANCEL_REQ P2P_SERV_DISC_CANCEL_REQ
-- \ref ctrl_iface_P2P_SERV_DISC_RESP P2P_SERV_DISC_RESP
-- \ref ctrl_iface_P2P_SERVICE_UPDATE P2P_SERVICE_UPDATE
-- \ref ctrl_iface_P2P_SERV_DISC_EXTERNAL P2P_SERV_DISC_EXTERNAL
-- \ref ctrl_iface_P2P_REJECT P2P_REJECT
-- \ref ctrl_iface_P2P_INVITE P2P_INVITE
-
-The following P2P-related events are used:
-- \ref ctrl_iface_event_P2P_EVENT_DEVICE_FOUND P2P-DEVICE-FOUND
-- \ref ctrl_iface_event_P2P_EVENT_GO_NEG_REQUEST P2P-GO-NEG-REQUEST
-- \ref ctrl_iface_event_P2P_EVENT_GO_NEG_SUCCESS P2P-GO-NEG-SUCCESS
-- \ref ctrl_iface_event_P2P_EVENT_GO_NEG_FAILURE P2P-GO-NEG-FAILURE
-- \ref ctrl_iface_event_P2P_EVENT_GROUP_FORMATION_SUCCESS P2P-GROUP-FORMATION-SUCCESS
-- \ref ctrl_iface_event_P2P_EVENT_GROUP_FORMATION_FAILURE P2P-GROUP-FORMATION-FAILURE
-- \ref ctrl_iface_event_P2P_EVENT_GROUP_STARTED P2P-GROUP-STARTED
-- \ref ctrl_iface_event_P2P_EVENT_GROUP_REMOVED P2P-GROUP-REMOVED
-- \ref ctrl_iface_event_P2P_EVENT_PROV_DISC_SHOW_PIN P2P-PROV-DISC-SHOW-PIN
-- \ref ctrl_iface_event_P2P_EVENT_PROV_DISC_ENTER_PIN P2P-PROV-DISC-ENTER-PIN
-- \ref ctrl_iface_event_P2P_EVENT_SERV_DISC_REQ P2P-SERV-DISC-REQ
-- \ref ctrl_iface_event_P2P_EVENT_SERV_DISC_RESP P2P-SERV-DISC-RESP
-- \ref ctrl_iface_event_P2P_EVENT_INVITATION_RECEIVED P2P-INVITATION-RECEIVED
-- \ref ctrl_iface_event_P2P_EVENT_INVITATION_RESULT P2P-INVITATION-RESULT
-
-
-\subsection p2p_wpa_gui GUI example (wpa_gui)
-
-wpa_gui has an example implementation of a GUI that could be used to
-manage P2P operations. The P2P related functionality is contained
-mostly in wpa_supplicant/wpa_gui-qt4/peers.cpp and it shows how the
-control interface commands and events can be used.
-
-
-\subsection p2p_wpa_cli wpa_cli example
-
-wpa_cli can be used to control wpa_supplicant in interactive
-mode. The following sessions show examples of commands used for
-device discovery and group formation. The lines starting with "> " are
-commands from the user (followed by command result indication) and
-lines starting with "<2>" are event messages from wpa_supplicant.
-
-P2P device "Wireless Client":
-
-\verbatim
-> p2p_find
-OK
-> <2>P2P-DEVICE-FOUND 02:40:61:c2:f3:b7 p2p_dev_addr=02:40:61:c2:f3:b7
-pri_dev_type=1-0050F204-1 name='Wireless Client 2' config_methods=0x18c
-dev_capab=0x1 group_capab=0x0
-<2>P2P-GO-NEG-REQUEST 02:40:61:c2:f3:b7
-<2>P2P-GO-NEG-REQUEST 02:40:61:c2:f3:b7
-> p2p_connect 02:40:61:c2:f3:b7 pbc
-OK
-<2>P2P-GO-NEG-SUCCESS
-<2>P2P-GROUP-FORMATION-SUCCESS
-<2>P2P-GROUP-STARTED sta0-p2p-0 client DIRECT-vM
-> interface
-Available interfaces:
-sta0-p2p-0
-sta0
-> p2p_group_remove sta0-p2p-0
-<2>P2P-GROUP-REMOVED sta0-p2p-0 client
-OK
-> term
-OK
-\endverbatim
-
-
-P2P device "Wireless Client2" (which ended up operating in GO role):
-
-\verbatim
-> p2p_find
-OK
-<2>P2P-DEVICE-FOUND 02:f0:bc:44:87:62 p2p_dev_addr=02:f0:bc:44:87:62
-pri_dev_type=1-0050F204-1 name='Wireless Client' config_methods=0x18c
-dev_capab=0x1 group_capab=0x0
-> p2p_connect 02:f0:bc:44:87:62 pbc
-OK
-<2>P2P-GO-NEG-SUCCESS
-<2>P2P-GROUP-FORMATION-SUCCESS
-<2>P2P-GROUP-STARTED sta1-p2p-0 GO DIRECT-vM
-> interface
-Available interfaces:
-sta1-p2p-0
-sta1
-> p2p_group_remove sta1-p2p-0
-<2>P2P-GROUP-REMOVED sta1-p2p-0 GO
-OK
-> term
-OK
-\endverbatim
-
-*/
diff --git a/contrib/wpa/doc/p2p_arch.dot b/contrib/wpa/doc/p2p_arch.dot
index 27ae0e2509d4..e69de29bb2d1 100644
--- a/contrib/wpa/doc/p2p_arch.dot
+++ b/contrib/wpa/doc/p2p_arch.dot
@@ -1,85 +0,0 @@
-digraph p2p_arch {
- ranksep=.75;
- size = "7.5,7.5";
-
- edge [dir=none];
-
- subgraph cluster_wpa_gui {
- label = "wpa_gui";
-
- status -> Qt;
- scan -> Qt;
- network -> Qt;
- Qt -> peers;
- Qt -> WPS;
- Qt -> gui_ctrl;
-
- gui_ctrl [label="ctrl i/f"];
- }
-
- subgraph cluster_wpa_supplicant {
- label = "wpa_supplicant"
-
- ctrl_iface [label="ctrl i/f"];
- authenticator [label="Authenticator"];
- supplicant [label="Supplicant"];
- driver_iface [label="driver i/f"];
- p2p_module [label="P2P\nmodule"];
- wps_registrar [label="WPS\nRegistrar"];
- wps_enrollee [label="WPS\nEnrollee"];
- mgmt_entity [label="Management\nentity"];
-
- ctrl_iface -> mgmt_entity;
- p2p_module -> mgmt_entity;
- wps_registrar -> mgmt_entity;
- wps_enrollee -> mgmt_entity;
- mgmt_entity -> authenticator;
- mgmt_entity -> supplicant;
- mgmt_entity -> driver_iface;
-
- { rank = same; mgmt_entity; p2p_module; }
- }
-
- subgraph cluster_wpa_cli {
- label = "wpa_cli -a"
-
- wpa_cli_action;
- }
-
- subgraph cluster_dnsmasq {
- label = "dnsmasq"
-
- dnsmasq;
- }
-
- subgraph cluster_dhclient {
- label = "dhclient"
-
- dhclient;
- }
-
- subgraph cluster_kernel {
- label = "Linux kernel"
-
- cfg80211 -> mac80211;
- netdev -> mac80211;
- mac80211 -> ath9k;
- }
-
- gui_ctrl -> ctrl_iface;
- wpa_cli_action -> ctrl_iface;
-
- driver_iface -> cfg80211;
-
- wpa_cli_action -> dnsmasq;
- wpa_cli_action -> dhclient;
-
- dnsmasq -> netdev;
- dhclient -> netdev;
-
- edge [color=blue,dir=both];
- p2p_module -> mgmt_entity -> driver_iface -> cfg80211 -> mac80211 -> ath9k;
-
- edge [color=green,dir=both];
- peers -> Qt -> gui_ctrl -> ctrl_iface -> mgmt_entity -> p2p_module;
-}
diff --git a/contrib/wpa/doc/p2p_arch2.dot b/contrib/wpa/doc/p2p_arch2.dot
index 9c7b4b57a17f..e69de29bb2d1 100644
--- a/contrib/wpa/doc/p2p_arch2.dot
+++ b/contrib/wpa/doc/p2p_arch2.dot
@@ -1,85 +0,0 @@
-digraph p2p_arch2 {
- ranksep=.75;
- size = "7.5,7.5";
-
- edge [dir=none];
-
- subgraph cluster_wpa_gui {
- label = "wpa_gui";
-
- status -> Qt;
- scan -> Qt;
- network -> Qt;
- Qt -> peers;
- Qt -> WPS;
- Qt -> gui_ctrl;
-
- gui_ctrl [label="ctrl i/f"];
- }
-
- subgraph cluster_wpa_supplicant {
- label = "wpa_supplicant"
-
- ctrl_iface [label="ctrl i/f"];
- authenticator [label="Authenticator"];
- supplicant [label="Supplicant"];
- driver_iface [label="driver i/f"];
- wps_registrar [label="WPS\nRegistrar"];
- wps_enrollee [label="WPS\nEnrollee"];
- mgmt_entity [label="Management\nentity"];
-
- ctrl_iface -> mgmt_entity;
- wps_registrar -> mgmt_entity;
- wps_enrollee -> mgmt_entity;
- mgmt_entity -> authenticator;
- mgmt_entity -> supplicant;
- mgmt_entity -> driver_iface;
- }
-
- subgraph cluster_wpa_cli {
- label = "wpa_cli -a"
-
- wpa_cli_action;
- }
-
- subgraph cluster_dnsmasq {
- label = "dnsmasq"
-
- dnsmasq;
- }
-
- subgraph cluster_dhclient {
- label = "dhclient"
-
- dhclient;
- }
-
- subgraph cluster_kernel {
- label = "Kernel"
-
- ioctl -> umac;
- netdev -> umac;
- umac -> p2p_module;
- p2p_module [label="P2P\nmodule"];
- umac -> driver;
-
- { rank = same; umac; p2p_module; }
- }
-
- gui_ctrl -> ctrl_iface;
- wpa_cli_action -> ctrl_iface;
-
- driver_iface -> ioctl;
-
- wpa_cli_action -> dnsmasq;
- wpa_cli_action -> dhclient;
-
- dnsmasq -> netdev;
- dhclient -> netdev;
-
- edge [color=blue,dir=both];
- p2p_module -> umac -> driver;
-
- edge [color=green,dir=both];
- peers -> Qt -> gui_ctrl -> ctrl_iface -> mgmt_entity -> driver_iface -> ioctl -> umac -> p2p_module;
-}
diff --git a/contrib/wpa/doc/p2p_sm.dot b/contrib/wpa/doc/p2p_sm.dot
index 640caefcc6ad..e69de29bb2d1 100644
--- a/contrib/wpa/doc/p2p_sm.dot
+++ b/contrib/wpa/doc/p2p_sm.dot
@@ -1,62 +0,0 @@
-digraph p2p {
- ranksep=.75;
- size = "8.5,7.5";
-
- start -> IDLE;
- start [label="Init",shape=none];
-
- /* Discovery: Scan followed by Find(SEARCH,LISTEN) */
- subgraph cluster_0 {
- label="Discovery";
- color=lightgrey;
- node [color=blue];
- /* SCAN and LISTEN currently not used in the implementation */
- SCAN [style=dotted];
- LISTEN [style=dotted];
-
- SCAN -> LISTEN;
- LISTEN -> SEARCH -> LISTEN [style=dotted];
- SEARCH -> SD_DURING_FIND [label="Peer SD capab\nand no info", weight=100];
- SD_DURING_FIND -> SEARCH [label="RX SD Resp\nor timeout", weight=100];
- SEARCH -> PROV_DISC_DURING_FIND [label="Prov Disc cmd\nand no Resp", weight=100];
- PROV_DISC_DURING_FIND -> SEARCH [label="RX Prov Disc Resp\nor timeout", weight=100];
- }
-
- /* Group Formation */
- subgraph cluster_1 {
- label="Group Formation";
- color=lightgrey;
- node [color=green];
-
- CONNECT -> CONNECT_LISTEN [style=dotted,weight=100];
- CONNECT_LISTEN -> CONNECT [style=dotted,weight=100];
- CONNECT -> WAIT_PEER_IDLE [label="RX GO Neg Resp\n(info unavail)"];
- WAIT_PEER_IDLE -> WAIT_PEER_CONNECT [style=dotted,weight=100];
- WAIT_PEER_CONNECT -> WAIT_PEER_IDLE [style=dotted,weight=100];
-
- CONNECT -> GO_NEG [label="RX GO Neg Resp\n(success)", weight=10];
- CONNECT_LISTEN -> GO_NEG [label="RX GO Neg Req or\nTX GO Neg Resp"];
- WAIT_PEER_CONNECT -> GO_NEG [label="RX GO Neg Req"];
- GO_NEG -> PROVISIONING [label="TX/RX GO Neg Conf"];
- }
-
- PROVISIONING -> IDLE [label="WPS\nsuccess"];
-
- /* External triggers */
- IDLE -> SCAN [label="Find cmd",weight=20];
- IDLE -> CONNECT [label="Connect cmd",weight=20];
- IDLE -> LISTEN_ONLY [label="Listen cmd"];
-
- /* Timeouts */
-/*
- edge [color=red];
- WAIT_PEER_IDLE -> IDLE [label="timeout", weight=0];
- WAIT_PEER_CONNECT -> IDLE [label="timeout", weight=0];
- CONNECT -> IDLE [label="timeout", weight=0];
- CONNECT_LISTEN -> IDLE [label="timeout", weight=0];
- GO_NEG -> IDLE [label="timeout", weight=0];
- PROVISIONING -> IDLE [label="timeout", weight=0];
- LISTEN_ONLY -> IDLE [label="timeout", weight=0];
- SEARCH -> IDLE [label="timeout", weight=0];
-*/
-}
diff --git a/contrib/wpa/doc/porting.doxygen b/contrib/wpa/doc/porting.doxygen
index b4b78ef0504a..e69de29bb2d1 100644
--- a/contrib/wpa/doc/porting.doxygen
+++ b/contrib/wpa/doc/porting.doxygen
@@ -1,209 +0,0 @@
-/**
-\page porting Porting to different target boards and operating systems
-
-wpa_supplicant was designed to be easily portable to different
-hardware (board, CPU) and software (OS, drivers) targets. It is
-already used with number of operating systems and numerous wireless
-card models and drivers. The main wpa_supplicant repository includes
-support for Linux, FreeBSD, and Windows. In addition, the code has been
-ported to number of other operating systems like VxWorks, PalmOS,
-Windows CE, and Windows Mobile. On the hardware
-side, wpa_supplicant is used on various systems: desktops, laptops,
-PDAs, and embedded devices with CPUs including x86, PowerPC,
-arm/xscale, and MIPS. Both big and little endian configurations are
-supported.
-
-
-\section ansi_c_extra Extra functions on top of ANSI C
-
-wpa_supplicant is mostly using ANSI C functions that are available on
-most targets. However, couple of additional functions that are common
-on modern UNIX systems are used. Number of these are listed with
-prototypes in \ref common.h (the \verbatim #ifdef CONFIG_ANSI_C_EXTRA \endverbatim
-block). These functions may need to be implemented or at least defined
-as macros to native functions in the target OS or C library.
-
-Many of the common ANSI C functions are used through a wrapper
-definitions in \ref os.h to allow these to be replaced easily with a
-platform specific version in case standard C libraries are not
-available. In addition, \ref os.h defines couple of common platform
-specific functions that are implemented in \ref os_unix.c for UNIX like
-targets and in \ref os_win32.c for Win32 API. If the target platform does
-not support either of these examples, a new os_*.c file may need to be
-added.
-
-Unless OS_NO_C_LIB_DEFINES is defined, the standard ANSI C and POSIX
-functions are used by defining the os_*() wrappers to use them
-directly in order to avoid extra cost in size and speed. If the target
-platform needs different versions of the functions, \ref os.h can be
-modified to define the suitable macros or alternatively,
-OS_NO_C_LIB_DEFINES may be defined for the build and the wrapper
-functions can then be implemented in a new os_*.c wrapper file.
-
-\ref common.h defines number of helper macros for handling integers of
-different size and byte order. Suitable version of these definitions
-may need to be added for the target platform.
-
-
-\section configuration_backend Configuration backend
-
-wpa_supplicant implements a configuration interface that allows the
-backend to be easily replaced in order to read configuration data from
-a suitable source depending on the target platform. \ref config.c
-implements the generic code that can be shared with all configuration
-backends. Each backend is implemented in its own config_*.c file.
-
-The included \ref config_file.c backend uses a text file for configuration
-and \ref config_winreg.c uses Windows registry. These files can be used as
-an example for a new configuration backend if the target platform uses
-different mechanism for configuration parameters. In addition,
-\ref config_none.c can be used as an empty starting point for building a
-new configuration backend.
-
-
-\section driver_iface_porting Driver interface
-
-Unless the target OS and driver is already supported, most porting
-projects have to implement a driver wrapper. This may be done by
-adding a new driver interface module or modifying an existing module
-(driver_*.c) if the new target is similar to one of them. \ref
-driver_wrapper "Driver wrapper implementation" describes the details
-of the driver interface and discusses the tasks involved in porting
-this part of wpa_supplicant.
-
-
-\section l2_packet_porting l2_packet (link layer access)
-
-wpa_supplicant needs to have access to sending and receiving layer 2
-(link layer) packets with two Ethertypes: EAP-over-LAN (EAPOL) 0x888e
-and RSN pre-authentication 0x88c7. \ref l2_packet.h defines the interfaces
-used for this in the core wpa_supplicant implementation.
-
-If the target operating system supports a generic mechanism for link
-layer access, that is likely the best mechanism for providing the
-needed functionality for wpa_supplicant. Linux packet socket is an
-example of such a generic mechanism. If this is not available, a
-separate interface may need to be implemented to the network stack or
-driver. This is usually an intermediate or protocol driver that is
-operating between the device driver and the OS network stack. If such
-a mechanism is not feasible, the interface can also be implemented
-directly in the device driver.
-
-The main wpa_supplicant repository includes l2_packet implementations
-for Linux using packet sockets (\ref l2_packet_linux.c), more portable
-version using libpcap/libdnet libraries (\ref l2_packet_pcap.c; this
-supports WinPcap, too), and FreeBSD specific version of libpcap
-interface (\ref l2_packet_freebsd.c).
-
-If the target operating system is supported by libpcap (receiving) and
-libdnet (sending), \ref l2_packet_pcap.c can likely be used with minimal or
-no changes. If this is not a case or a proprietary interface for link
-layer is required, a new l2_packet module may need to be
-added. Alternatively, for hostapd,
-struct \ref wpa_driver_ops::hapd_send_eapol() handler can
-be used to override the l2_packet library if the link layer access is
-integrated with the driver interface implementation.
-
-
-\section eloop_porting Event loop
-
-wpa_supplicant uses a single process/thread model and an event loop
-to provide callbacks on events (registered timeout, received packet,
-signal). eloop.h defines the event loop interface. \ref eloop.c is an
-implementation of such an event loop using select() and sockets. This
-is suitable for most UNIX/POSIX systems. When porting to other
-operating systems, it may be necessary to replace that implementation
-with OS specific mechanisms that provide similar functionality.
-
-
-\section ctrl_iface_porting Control interface
-
-wpa_supplicant uses a \ref ctrl_iface_page "control interface"
-to allow external processed
-to get status information and to control the operations. Currently,
-this is implemented with socket based communication; both UNIX domain
-sockets and UDP sockets are supported. If the target OS does not
-support sockets, this interface will likely need to be modified to use
-another mechanism like message queues. The control interface is
-optional component, so it is also possible to run wpa_supplicant
-without porting this part.
-
-The wpa_supplicant side of the control interface is implemented in
-\ref wpa_supplicant/ctrl_iface.c. Matching client side is implemented as a control
-interface library in \ref wpa_ctrl.c.
-
-
-\section entry_point Program entry point
-
-wpa_supplicant defines a set of functions that can be used to
-initialize main supplicant processing. Each operating system has a
-mechanism for starting new processing or threads. This is usually a
-function with a specific set of arguments and calling convention. This
-function is responsible on initializing wpa_supplicant.
-
-\ref wpa_supplicant/main.c includes an entry point for UNIX-like
-operating system, i.e., main() function that uses command line arguments
-for setting parameters for wpa_supplicant. When porting to other
-operating systems, similar OS-specific entry point implementation is
-needed. It can be implemented in a new file that is then linked with
-wpa_supplicant instead of main.o. \ref wpa_supplicant/main.c is also a
-good example on how the initialization process should be done.
-
-The supplicant initialization functions are defined in
-\ref wpa_supplicant_i.h. In most cases, the entry point function should
-start by fetching configuration parameters. After this, a global
-wpa_supplicant context is initialized with a call to
-\ref wpa_supplicant_init(). After this, existing network interfaces can be
-added with \ref wpa_supplicant_add_iface(). \ref wpa_supplicant_run() is then
-used to start the main event loop. Once this returns at program
-termination time, \ref wpa_supplicant_deinit() is used to release global
-context data.
-
-\ref wpa_supplicant_add_iface() and \ref wpa_supplicant_remove_iface() can be
-used dynamically to add and remove interfaces based on when
-wpa_supplicant processing is needed for them. This can be done, e.g.,
-when hotplug network adapters are being inserted and ejected. It is
-also possible to do this when a network interface is being
-enabled/disabled if it is desirable that wpa_supplicant processing
-for the interface is fully enabled/disabled at the same time.
-
-
-\section simple_build Simple build example
-
-One way to start a porting project is to begin with a very simple
-build of wpa_supplicant with WPA-PSK support and once that is
-building correctly, start adding features.
-
-Following command can be used to build very simple version of
-wpa_supplicant:
-
-\verbatim
-cc -o wpa_supplicant config.c eloop.c common.c md5.c rc4.c sha1.c \
- config_none.c l2_packet_none.c tls_none.c wpa.c preauth.c \
- aes_wrap.c wpa_supplicant.c events.c main_none.c drivers.c
-\endverbatim
-
-The end result is not really very useful since it uses empty functions
-for configuration parsing and layer 2 packet access and does not
-include a driver interface. However, this is a good starting point
-since the build is complete in the sense that all functions are
-present and this is easy to configure to a build system by just
-including the listed C files.
-
-Once this version can be build successfully, the end result can be
-made functional by adding a proper program entry point (main*.c),
-driver interface (driver_*.c and matching CONFIG_DRIVER_* define for
-registration in \ref drivers.c), configuration parser/writer (config_*.c),
-and layer 2 packet access implementation (l2_packet_*.c). After these
-components have been added, the end result should be a working
-WPA/WPA2-PSK enabled supplicant.
-
-After the basic functionality has been verified to work, more features
-can be added by linking in more files and defining C pre-processor
-defines. Currently, the best source of information for what options
-are available and which files needs to be included is in the Makefile
-used for building the supplicant with make. Similar configuration will
-be needed for build systems that either use different type of make
-tool or a GUI-based project configuration.
-
-*/
diff --git a/contrib/wpa/doc/testing_tools.doxygen b/contrib/wpa/doc/testing_tools.doxygen
index d12652415634..e69de29bb2d1 100644
--- a/contrib/wpa/doc/testing_tools.doxygen
+++ b/contrib/wpa/doc/testing_tools.doxygen
@@ -1,201 +0,0 @@
-/**
-\page testing_tools Testing and development tools
-
-[ \ref eapol_test "eapol_test" |
-\ref preauth_test "preauth_test" |
-\ref unit_tests "Unit tests" |
-\ref wpa_trace "Tracing code" ]
-
-wpa_supplicant source tree includes number of testing and development
-tools that make it easier to test the programs without having to setup
-a full test setup with wireless cards. In addition, these tools can be
-used to implement automatic tests suites.
-
-\section eapol_test eapol_test - EAP peer and RADIUS client testing
-
-eapol_test is a program that links together the same EAP peer
-implementation that wpa_supplicant is using and the RADIUS
-authentication client code from hostapd. In addition, it has minimal
-glue code to combine these two components in similar ways to IEEE
-802.1X/EAPOL Authenticator state machines. In other words, it
-integrates IEEE 802.1X Authenticator (normally, an access point) and
-IEEE 802.1X Supplicant (normally, a wireless client) together to
-generate a single program that can be used to test EAP methods without
-having to setup an access point and a wireless client.
-
-The main uses for eapol_test are in interoperability testing of EAP
-methods against RADIUS servers and in development testing for new EAP
-methods. It can be easily used to automate EAP testing for
-interoperability and regression since the program can be run from
-shell scripts without require additional test components apart from a
-RADIUS server. For example, the automated EAP tests described in
-eap_testing.txt are implemented with eapol_test. Similarly, eapol_test
-could be used to implement an automated regression test suite for a
-RADIUS authentication server.
-
-eapol_test uses the same build time configuration file, .config, as
-wpa_supplicant. This file is used to select which EAP methods are
-included in eapol_test. This program is not built with the default
-Makefile target, so a separate make command needs to be used to
-compile the tool:
-
-\verbatim
-make eapol_test
-\endverbatim
-
-The resulting eapol_test binary has following command like options:
-
-\verbatim
-usage:
-eapol_test [-nWS] -c [-a] [-p] [-s] \
- [-r] [-t] [-C] \
- [-M]
-eapol_test scard
-eapol_test sim [debug]
-
-options:
- -c = configuration file
- -a = IP address of the authentication server, default 127.0.0.1
- -p = UDP port of the authentication server, default 1812
- -s = shared secret with the authentication server, default 'radius'
- -r = number of re-authentications
- -W = wait for a control interface monitor before starting
- -S = save configuration after authentiation
- -n = no MPPE keys expected
- -t = sets timeout in seconds (default: 30 s)
- -C = RADIUS Connect-Info (default: CONNECT 11Mbps 802.11b)
- -M = Set own MAC address (Calling-Station-Id,
- default: 02:00:00:00:00:01)
-\endverbatim
-
-
-As an example,
-\verbatim
-eapol_test -ctest.conf -a127.0.0.1 -p1812 -ssecret -r1
-\endverbatim
-tries to complete EAP authentication based on the network
-configuration from test.conf against the RADIUS server running on the
-local host. A re-authentication is triggered to test fast
-re-authentication. The configuration file uses the same format for
-network blocks as wpa_supplicant.
-
-
-\section preauth_test preauth_test - WPA2 pre-authentication and EAP peer testing
-
-preauth_test is similar to eapol_test in the sense that in combines
-EAP peer implementation with something else, in this case, with WPA2
-pre-authentication. This tool can be used to test pre-authentication
-based on the code that wpa_supplicant is using. As such, it tests
-both the wpa_supplicant implementation and the functionality of an
-access point.
-
-preauth_test is built with:
-
-\verbatim
-make preauth_test
-\endverbatim
-
-and it uses following command line arguments:
-
-\verbatim
-usage: preauth_test
-\endverbatim
-
-For example,
-\verbatim
-preauth_test test.conf 02:11:22:33:44:55 eth0
-\endverbatim
-would use network configuration from test.conf to try to complete
-pre-authentication with AP using BSSID 02:11:22:33:44:55. The
-pre-authentication packets would be sent using the eth0 interface.
-
-
-\section unit_tests Unit tests
-
-Number of the components (.c files) used in wpa_supplicant define
-their own unit tests for automated validation of the basic
-functionality. Most of the tests for cryptographic algorithms are
-using standard test vectors to validate functionality. These tests can
-be useful especially when verifying port to a new CPU target.
-
-The test programs are collected in the tests subdirectory. All
-automated unit tests can be run with
-
-\verbatim
-make run-tests
-\endverbatim
-
-This make target builds and runs each test and terminates with zero
-exit code if all tests were completed successfully.
-
-
-\section wpa_trace Tracing code for developer debuggin
-
-wpa_supplicant and hostapd can be built with tracing code that will
-track and analyze memory allocations and other resource registrations
-and certain API uses. If incorrect use is detected, a backtrace of the
-call location (and/or allocation location) is shown. This can also be
-used to detect certain categories of memory leaks and report them
-automatically when the program is terminated. The report will also
-include information about forgotten eloop events.
-
-The trace code can be enabled with CONFIG_WPA_TRACE=y build
-option. More verbose backtrace information can be generated if libbfd
-is available and the binaries are not stripped of symbol
-information. This is enabled with CONFIG_WPA_TRACE_BFD=y.
-
-For example, a memory leak (forgotten os_free() call) would show up
-like this when the program is terminated:
-
-\verbatim
-MEMLEAK[0x82d200]: len 128
-WPA_TRACE: memleak - START
-[0]: ./wpa_supplicant(os_malloc+0x59) [0x41a5e9]
- os_malloc() ../src/utils/os_unix.c:359
-[1]: ./wpa_supplicant(os_zalloc+0x16) [0x41a676]
- os_zalloc() ../src/utils/os_unix.c:418
-[2]: ./wpa_supplicant(wpa_supplicant_init+0x38) [0x48b508]
- wpa_supplicant_init() wpa_supplicant.c:2315
-[3]: ./wpa_supplicant(main+0x2f3) [0x491073]
- main() main.c:252
-WPA_TRACE: memleak - END
-MEMLEAK: total 128 bytes
-\endverbatim
-
-Another type of error that can be detected is freeing of memory area
-that was registered for some use and is still be referenced:
-
-\verbatim
-WPA_TRACE: Freeing referenced memory - START
-[2]: ./wpa_supplicant(os_free+0x5c) [0x41a53c]
- os_free() ../src/utils/os_unix.c:411
-[3]: ./wpa_supplicant(wpa_supplicant_remove_iface+0x30) [0x48b380]
- wpa_supplicant_remove_iface() wpa_supplicant.c:2259
-[4]: ./wpa_supplicant(wpa_supplicant_deinit+0x20) [0x48b3e0]
- wpa_supplicant_deinit() wpa_supplicant.c:2430
-[5]: ./wpa_supplicant(main+0x357) [0x4910d7]
- main() main.c:276
-WPA_TRACE: Freeing referenced memory - END
-WPA_TRACE: Reference registration - START
-[1]: ./wpa_supplicant [0x41c040]
- eloop_trace_sock_add_ref() ../src/utils/eloop.c:94
-[2]: ./wpa_supplicant(wpa_supplicant_ctrl_iface_deinit+0x17) [0x473247]
- wpa_supplicant_ctrl_iface_deinit() ctrl_iface_unix.c:436
-[3]: ./wpa_supplicant [0x48b21c]
- wpa_supplicant_cleanup() wpa_supplicant.c:378
- wpa_supplicant_deinit_iface() wpa_supplicant.c:2155
-[4]: ./wpa_supplicant(wpa_supplicant_remove_iface+0x30) [0x48b380]
- wpa_supplicant_remove_iface() wpa_supplicant.c:2259
-[5]: ./wpa_supplicant(wpa_supplicant_deinit+0x20) [0x48b3e0]
- wpa_supplicant_deinit() wpa_supplicant.c:2430
-[6]: ./wpa_supplicant(main+0x357) [0x4910d7]
- main() main.c:276
-WPA_TRACE: Reference registration - END
-Aborted
-\endverbatim
-
-This type of error results in showing backtraces for both the location
-where the incorrect freeing happened and the location where the memory
-area was marked referenced.
-
-*/
diff --git a/contrib/wpa/doc/wpa_supplicant.fig b/contrib/wpa/doc/wpa_supplicant.fig
index d2c4306b8e03..e69de29bb2d1 100644
--- a/contrib/wpa/doc/wpa_supplicant.fig
+++ b/contrib/wpa/doc/wpa_supplicant.fig
@@ -1,247 +0,0 @@
-#FIG 3.2
-Landscape
-Center
-Inches
-Letter
-100.00
-Single
--2
-1200 2
-6 1875 4050 2925 4350
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 1875 4050 2925 4050 2925 4350 1875 4350 1875 4050
-4 0 0 50 -1 0 12 0.0000 4 180 735 2025 4275 l2_packet\001
--6
-6 3450 1200 4275 1500
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 3450 1200 4275 1200 4275 1500 3450 1500 3450 1200
-4 0 0 50 -1 0 12 0.0000 4 180 585 3600 1425 wpa_cli\001
--6
-6 4725 1200 5925 1500
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4725 1200 5925 1200 5925 1500 4725 1500 4725 1200
-4 0 0 50 -1 0 12 0.0000 4 135 1005 4800 1425 GUI frontend\001
--6
-6 6000 2700 7200 3225
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 6000 2700 7200 2700 7200 3225 6000 3225 6000 2700
-4 0 0 50 -1 0 12 0.0000 4 135 975 6075 2925 WPA/WPA2\001
-4 0 0 50 -1 0 12 0.0000 4 135 1065 6075 3150 state machine\001
--6
-6 6000 4950 7200 5475
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 6000 4950 7200 4950 7200 5475 6000 5475 6000 4950
-4 0 0 50 -1 0 12 0.0000 4 135 360 6075 5175 EAP\001
-4 0 0 50 -1 0 12 0.0000 4 135 1065 6075 5400 state machine\001
--6
-6 8700 3000 9375 3300
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8700 3000 9375 3000 9375 3300 8700 3300 8700 3000
-4 0 0 50 -1 0 12 0.0000 4 150 480 8775 3225 crypto\001
--6
-6 4350 3900 5025 4425
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4350 3900 5025 3900 5025 4425 4350 4425 4350 3900
-4 0 0 50 -1 0 12 0.0000 4 105 420 4500 4125 event\001
-4 0 0 50 -1 0 12 0.0000 4 180 315 4500 4350 loop\001
--6
-6 4275 2550 5100 2850
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4275 2550 5100 2550 5100 2850 4275 2850 4275 2550
-4 0 0 50 -1 0 12 0.0000 4 135 450 4425 2775 ctrl i/f\001
--6
-6 6000 3900 7200 4425
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 6000 3900 7200 3900 7200 4425 6000 4425 6000 3900
-4 0 0 50 -1 0 12 0.0000 4 135 600 6075 4125 EAPOL\001
-4 0 0 50 -1 0 12 0.0000 4 135 1065 6075 4350 state machine\001
--6
-6 1800 6000 7800 8100
-6 1800 6000 7800 7200
-6 1800 6900 2700 7200
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 1800 6900 2700 6900 2700 7200 1800 7200 1800 6900
-4 0 0 50 -1 0 12 0.0000 4 105 375 1875 7125 wext\001
--6
-6 4725 6900 5625 7200
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4725 6900 5625 6900 5625 7200 4725 7200 4725 6900
-4 0 0 50 -1 0 12 0.0000 4 135 555 4800 7125 hermes\001
--6
-6 6675 6900 7800 7200
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 6675 6900 7800 6900 7800 7200 6675 7200 6675 6900
-4 0 0 50 -1 0 12 0.0000 4 180 930 6750 7125 ndiswrapper\001
--6
-6 5700 6900 6600 7200
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 5700 6900 6600 6900 6600 7200 5700 7200 5700 6900
-4 0 0 50 -1 0 12 0.0000 4 135 420 5775 7125 atmel\001
--6
-6 4275 6000 5100 6300
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 4275 6000 5100 6000 5100 6300 4275 6300 4275 6000
-4 0 0 50 -1 0 12 0.0000 4 135 630 4350 6225 driver i/f\001
--6
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 2775 6900 3675 6900 3675 7200 2775 7200 2775 6900
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 3750 6900 4650 6900 4650 7200 3750 7200 3750 6900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 4
- 2250 6900 2250 6600 7200 6600 7200 6900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 3225 6900 3225 6600
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4200 6900 4200 6600
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5175 6900 5175 6600
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6150 6900 6150 6600
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4650 6600 4650 6300
-4 0 0 50 -1 0 12 0.0000 4 180 510 2850 7125 hostap\001
-4 0 0 50 -1 0 12 0.0000 4 135 600 3825 7125 nl80211\001
--6
-6 3525 7800 5775 8100
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 3525 7800 5775 7800 5775 8100 3525 8100 3525 7800
-4 0 0 50 -1 0 12 0.0000 4 135 2145 3600 8025 kernel network device driver\001
--6
-2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
- 2250 7200 4200 7800
-2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
- 7200 7200 5100 7800
--6
-6 9600 3000 10275 3300
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9600 3000 10275 3000 10275 3300 9600 3300 9600 3000
-4 0 0 50 -1 0 12 0.0000 4 135 315 9750 3225 TLS\001
--6
-6 8100 4425 10425 7350
-6 8175 4725 9225 5025
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 4725 9225 4725 9225 5025 8175 5025 8175 4725
-4 0 0 50 -1 0 12 0.0000 4 135 735 8250 4950 EAP-TLS\001
--6
-6 9300 4725 10350 5025
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 4725 10350 4725 10350 5025 9300 5025 9300 4725
-4 0 0 50 -1 0 12 0.0000 4 135 810 9375 4950 EAP-MD5\001
--6
-6 8175 5100 9225 5400
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 5100 9225 5100 9225 5400 8175 5400 8175 5100
-4 0 0 50 -1 0 12 0.0000 4 135 885 8250 5325 EAP-PEAP\001
--6
-6 9300 5100 10350 5400
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 5100 10350 5100 10350 5400 9300 5400 9300 5100
-4 0 0 50 -1 0 12 0.0000 4 135 840 9375 5325 EAP-TTLS\001
--6
-6 8175 5475 9225 5775
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 5475 9225 5475 9225 5775 8175 5775 8175 5475
-4 0 0 50 -1 0 12 0.0000 4 135 780 8250 5700 EAP-GTC\001
--6
-6 9300 5475 10350 5775
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 5475 10350 5475 10350 5775 9300 5775 9300 5475
-4 0 0 50 -1 0 12 0.0000 4 135 765 9375 5700 EAP-OTP\001
--6
-6 8175 5850 9225 6150
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 5850 9225 5850 9225 6150 8175 6150 8175 5850
-4 0 0 50 -1 0 12 0.0000 4 135 750 8250 6075 EAP-SIM\001
--6
-6 9300 6225 10350 6525
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 6225 10350 6225 10350 6525 9300 6525 9300 6225
-4 0 0 50 -1 0 12 0.0000 4 135 465 9375 6450 LEAP\001
--6
-6 8175 6225 9225 6525
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 6225 9225 6225 9225 6525 8175 6525 8175 6225
-4 0 0 50 -1 0 12 0.0000 4 135 765 8250 6450 EAP-PSK\001
--6
-6 9300 5850 10350 6150
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 5850 10350 5850 10350 6150 9300 6150 9300 5850
-4 0 0 50 -1 0 12 0.0000 4 135 825 9375 6075 EAP-AKA\001
--6
-6 8175 6975 9675 7275
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 6975 9675 6975 9675 7275 8175 7275 8175 6975
-4 0 0 50 -1 0 12 0.0000 4 135 1365 8250 7200 EAP-MSCHAPv2\001
--6
-6 9300 6600 10350 6900
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 9300 6600 10350 6600 10350 6900 9300 6900 9300 6600
-4 0 0 50 -1 0 12 0.0000 4 135 870 9375 6825 EAP-FAST\001
--6
-6 8175 6600 9225 6900
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8175 6600 9225 6600 9225 6900 8175 6900 8175 6600
-4 0 0 50 -1 0 12 0.0000 4 135 795 8250 6825 EAP-PAX\001
--6
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 8100 7350 10425 7350 10425 4425 8100 4425 8100 7350
-4 0 0 50 -1 0 12 0.0000 4 135 1050 8700 4650 EAP methods\001
--6
-6 2775 5025 4050 5325
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 2775 5025 4050 5025 4050 5325 2775 5325 2775 5025
-4 0 0 50 -1 0 12 0.0000 4 135 990 2925 5250 driver events\001
--6
-6 2775 3150 4050 3450
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 2775 3150 4050 3150 4050 3450 2775 3450 2775 3150
-4 0 0 50 -1 0 12 0.0000 4 180 990 2925 3375 configuration\001
--6
-2 1 1 1 0 7 50 -1 -1 3.000 0 0 -1 0 0 2
- 1275 4200 1875 4200
-2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
- 4500 2550 3900 1500
-2 1 1 1 0 7 50 -1 -1 4.000 0 0 -1 0 0 2
- 4800 2550 5400 1500
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 2925 4200 4350 4200
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5025 3900 6000 3000
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 5025 4200 6000 4200
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4650 6000 4650 4425
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6600 4425 6600 4950
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6600 3225 6600 3900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 7200 5250 8100 5250
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 9075 4425 9075 3300
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 7200 3000 8700 3150
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4650 3900 4650 2850
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 7200 4125 8700 3300
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6000 4350 5025 6000
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 6000 3150 4875 6000
-2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
- 1500 2100 10800 2100 10800 7500 1500 7500 1500 2100
-2 1 0 1 2 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 9900 4425 9900 3300
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 1
- 4350 3900
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4350 3900 4050 3450
-2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
- 4350 4425 4050 5025
-4 0 0 50 -1 0 12 0.0000 4 135 915 375 3975 EAPOL and\001
-4 0 0 50 -1 0 12 0.0000 4 180 630 375 4200 pre-auth\001
-4 0 0 50 -1 0 12 0.0000 4 180 810 375 4425 ethertypes\001
-4 0 0 50 -1 0 12 0.0000 4 135 1050 375 4650 from/to kernel\001
-4 0 0 50 -1 0 12 0.0000 4 135 1920 3675 1875 frontend control interface\001
-4 0 0 50 -1 2 14 0.0000 4 210 1440 1637 2371 wpa_supplicant\001
diff --git a/contrib/wpa/eap_example/.gitignore b/contrib/wpa/eap_example/.gitignore
index 4d6d2d1301b2..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/.gitignore
+++ b/contrib/wpa/eap_example/.gitignore
@@ -1,4 +0,0 @@
-*.d
-eap_example
-libeap.so
-libeap.a
diff --git a/contrib/wpa/eap_example/Makefile b/contrib/wpa/eap_example/Makefile
index 691466f03c9a..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/Makefile
+++ b/contrib/wpa/eap_example/Makefile
@@ -1,119 +0,0 @@
-ALL=eap_example
-
-include ../src/build.rules
-
-CFLAGS += -I.
-CFLAGS += -I../src
-CFLAGS += -I../src/utils
-
-
-EAP_LIBS += ../src/utils/libutils.a
-EAP_LIBS += ../src/crypto/libcrypto.a
-EAP_LIBS += ../src/tls/libtls.a
-
-OBJS_both += ../src/eap_common/eap_peap_common.o
-OBJS_both += ../src/eap_common/eap_psk_common.o
-OBJS_both += ../src/eap_common/eap_pax_common.o
-OBJS_both += ../src/eap_common/eap_sake_common.o
-OBJS_both += ../src/eap_common/eap_gpsk_common.o
-OBJS_both += ../src/eap_common/chap.o
-
-OBJS_peer += ../src/eap_peer/eap_tls.o
-OBJS_peer += ../src/eap_peer/eap_peap.o
-OBJS_peer += ../src/eap_peer/eap_ttls.o
-OBJS_peer += ../src/eap_peer/eap_md5.o
-OBJS_peer += ../src/eap_peer/eap_mschapv2.o
-OBJS_peer += ../src/eap_peer/mschapv2.o
-OBJS_peer += ../src/eap_peer/eap_otp.o
-OBJS_peer += ../src/eap_peer/eap_gtc.o
-OBJS_peer += ../src/eap_peer/eap_leap.o
-OBJS_peer += ../src/eap_peer/eap_psk.o
-OBJS_peer += ../src/eap_peer/eap_pax.o
-OBJS_peer += ../src/eap_peer/eap_sake.o
-OBJS_peer += ../src/eap_peer/eap_gpsk.o
-OBJS_peer += ../src/eap_peer/eap.o
-OBJS_peer += ../src/eap_common/eap_common.o
-OBJS_peer += ../src/eap_peer/eap_methods.o
-OBJS_peer += ../src/eap_peer/eap_tls_common.o
-
-CFLAGS += -DEAP_TLS
-CFLAGS += -DEAP_PEAP
-CFLAGS += -DEAP_TTLS
-CFLAGS += -DEAP_MD5
-CFLAGS += -DEAP_MSCHAPv2
-CFLAGS += -DEAP_GTC
-CFLAGS += -DEAP_OTP
-CFLAGS += -DEAP_LEAP
-CFLAGS += -DEAP_PSK
-CFLAGS += -DEAP_PAX
-CFLAGS += -DEAP_SAKE
-CFLAGS += -DEAP_GPSK -DEAP_GPSK_SHA256
-
-CFLAGS += -DEAP_SERVER_IDENTITY
-CFLAGS += -DEAP_SERVER_TLS
-CFLAGS += -DEAP_SERVER_PEAP
-CFLAGS += -DEAP_SERVER_TTLS
-CFLAGS += -DEAP_SERVER_MD5
-CFLAGS += -DEAP_SERVER_MSCHAPV2
-CFLAGS += -DEAP_SERVER_GTC
-CFLAGS += -DEAP_SERVER_PSK
-CFLAGS += -DEAP_SERVER_PAX
-CFLAGS += -DEAP_SERVER_SAKE
-CFLAGS += -DEAP_SERVER_GPSK -DEAP_SERVER_GPSK_SHA256
-
-CFLAGS += -DIEEE8021X_EAPOL
-
-
-# Optional components to add EAP server support
-OBJS_server += ../src/eap_server/eap_server_tls.o
-OBJS_server += ../src/eap_server/eap_server_peap.o
-OBJS_server += ../src/eap_server/eap_server_ttls.o
-OBJS_server += ../src/eap_server/eap_server_md5.o
-OBJS_server += ../src/eap_server/eap_server_mschapv2.o
-OBJS_server += ../src/eap_server/eap_server_gtc.o
-OBJS_server += ../src/eap_server/eap_server_psk.o
-OBJS_server += ../src/eap_server/eap_server_pax.o
-OBJS_server += ../src/eap_server/eap_server_sake.o
-OBJS_server += ../src/eap_server/eap_server_gpsk.o
-OBJS_server += ../src/eap_server/eap_server.o
-OBJS_server += ../src/eap_server/eap_server_identity.o
-OBJS_server += ../src/eap_server/eap_server_methods.o
-OBJS_server += ../src/eap_server/eap_server_tls_common.o
-CFLAGS += -DEAP_SERVER
-
-
-OBJS_lib=$(OBJS_both) $(OBJS_peer) $(OBJS_server)
-_OBJS_VAR := OBJS_lib
-include ../src/objs.mk
-
-OBJS_ex = eap_example.o eap_example_peer.o eap_example_server.o
-_OBJS_VAR := OBJS_ex
-include ../src/objs.mk
-
-_OBJS_VAR := EAP_LIBS
-include ../src/objs.mk
-
-
-ifneq ($(CONFIG_SOLIB), yes)
-LIBEAP = libeap.a
-libeap.a: $(EAP_LIBS) $(OBJS_lib)
- $(AR) crT libeap.a $^
- $(RANLIB) libeap.a
-
-else
-CFLAGS += -fPIC -DPIC
-LDFLAGS += -shared
-
-LIBEAP = libeap.so
-libeap.so: $(EAP_LIBS) $(OBJS_lib)
- $(LDO) $(LDFLAGS) $^ -o $(LIBEAP)
-
-endif
-
-eap_example: $(OBJS_ex) $(LIBEAP)
- $(LDO) $(LDFLAGS) -o eap_example $(OBJS_ex) -L. -leap $(LIBS)
-
-clean: common-clean
- rm -f core *~ *.o *.d libeap.a libeap.so
-
--include $(OBJS:%.o=%.d)
diff --git a/contrib/wpa/eap_example/README b/contrib/wpa/eap_example/README
index 0c2921e3be93..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/README
+++ b/contrib/wpa/eap_example/README
@@ -1,42 +0,0 @@
-EAP peer/server library and example program
-Copyright (c) 2007, Jouni Malinen
-
-This software may be distributed under the terms of the BSD license.
-See the parent directory README for more details.
-
-
-The interfaces of the EAP server/peer implementation are based on RFC
-4137 (EAP State Machines). This RFC is coordinated with the state
-machines defined in IEEE 802.1X-2004. hostapd and wpa_supplicant
-include implementation of the IEEE 802.1X EAPOL state machines and the
-interface between them and EAP. However, the EAP implementation can be
-used with other protocols, too, by providing a compatible interface
-which maps the EAPOL<->EAP variables to another protocol.
-
-This directory contains an example showing how EAP peer and server
-code from wpa_supplicant and hostapd can be used as a library. The
-example program initializes both an EAP server and an EAP peer
-entities and then runs through an EAP-PEAP/MSCHAPv2 authentication.
-
-eap_example_peer.c shows the initialization and glue code needed to
-control the EAP peer implementation. eap_example_server.c does the
-same for EAP server. eap_example.c is an example that ties in both the
-EAP server and client parts to allow an EAP authentication to be
-shown.
-
-In this example, the EAP messages are passed between the server and
-the peer are passed by direct function calls within the same process.
-In practice, server and peer functionalities would likely reside in
-separate devices and the EAP messages would be transmitted between the
-devices based on an external protocol. For example, in IEEE 802.11
-uses IEEE 802.1X EAPOL state machines to control the transmission of
-EAP messages and WiMax supports optional PMK EAP authentication
-mechanism that transmits EAP messages as defined in IEEE 802.16e.
-
-
-The EAP library links in number of helper functions from src/utils and
-src/crypto directories. Most of these are suitable as-is, but it may
-be desirable to replace the debug output code in src/utils/wpa_debug.c
-by dropping this file from the library and re-implementing the
-functions there in a way that better fits in with the main
-application.
diff --git a/contrib/wpa/eap_example/ca.pem b/contrib/wpa/eap_example/ca.pem
index b128893a1e7b..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/ca.pem
+++ b/contrib/wpa/eap_example/ca.pem
@@ -1,55 +0,0 @@
-Certificate:
- Data:
- Version: 3 (0x2)
- Serial Number: 15624081837803162817 (0xd8d3e3a6cbe3ccc1)
- Signature Algorithm: sha1WithRSAEncryption
- Issuer: C=FI, O=w1.fi, CN=Root CA
- Validity
- Not Before: Jun 29 16:41:22 2013 GMT
- Not After : Jun 27 16:41:22 2023 GMT
- Subject: C=FI, O=w1.fi, CN=Root CA
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
- Public-Key: (1024 bit)
- Modulus:
- 00:be:1e:86:e4:79:03:c1:d1:94:d5:d4:b3:b1:28:
- 90:76:fb:b8:a6:cd:6d:1c:d1:48:f4:08:9a:67:ff:
- f9:a6:54:b1:19:29:df:29:1b:cd:f1:6f:66:01:e7:
- db:79:ce:c0:39:2a:25:13:26:94:0c:2c:7b:5a:2c:
- 81:0f:94:ee:51:d0:75:e6:46:db:17:46:a7:15:8b:
- 0e:57:0f:b0:54:76:63:12:ca:86:18:bc:1a:c3:16:
- c0:70:09:d6:6b:43:39:b8:98:29:46:ac:cb:6a:ad:
- 38:88:3b:07:dc:81:cd:3a:f6:1d:f6:2f:ef:1d:d7:
- ae:8a:b6:d1:e7:b3:15:02:b9
- Exponent: 65537 (0x10001)
- X509v3 extensions:
- X509v3 Subject Key Identifier:
- B8:92:DE:FD:8A:18:B3:30:C3:9F:55:F3:33:5D:B4:C8:29:8A:41:14
- X509v3 Authority Key Identifier:
- keyid:B8:92:DE:FD:8A:18:B3:30:C3:9F:55:F3:33:5D:B4:C8:29:8A:41:14
-
- X509v3 Basic Constraints:
- CA:TRUE
- Signature Algorithm: sha1WithRSAEncryption
- 1a:cf:77:60:44:43:c4:55:0e:99:e0:89:aa:b9:d3:7b:32:b7:
- 5c:9c:7c:ca:fe:8c:d4:94:c6:5e:f3:83:19:5f:29:59:68:a4:
- 4f:dc:04:2e:b8:71:c0:6d:3b:ae:01:e4:b9:88:99:cc:ce:82:
- be:6a:28:c2:ac:6a:94:c6:87:90:ed:85:3c:10:71:c5:ff:3c:
- 70:64:e2:41:62:31:ea:86:7b:11:8c:93:ea:c6:f3:f3:4e:f9:
- d4:f2:81:90:d7:f4:fa:a1:91:6e:d4:dd:15:3e:26:3b:ac:1e:
- c3:c2:1f:ed:bb:34:bf:cb:b2:67:c6:c6:51:e8:51:22:b4:f3:
- 92:e8
------BEGIN CERTIFICATE-----
-MIICLDCCAZWgAwIBAgIJANjT46bL48zBMA0GCSqGSIb3DQEBBQUAMC8xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xMzA2
-MjkxNjQxMjJaFw0yMzA2MjcxNjQxMjJaMC8xCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
-DAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
-gYkCgYEAvh6G5HkDwdGU1dSzsSiQdvu4ps1tHNFI9AiaZ//5plSxGSnfKRvN8W9m
-Aefbec7AOSolEyaUDCx7WiyBD5TuUdB15kbbF0anFYsOVw+wVHZjEsqGGLwawxbA
-cAnWa0M5uJgpRqzLaq04iDsH3IHNOvYd9i/vHdeuirbR57MVArkCAwEAAaNQME4w
-HQYDVR0OBBYEFLiS3v2KGLMww59V8zNdtMgpikEUMB8GA1UdIwQYMBaAFLiS3v2K
-GLMww59V8zNdtMgpikEUMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEA
-Gs93YERDxFUOmeCJqrnTezK3XJx8yv6M1JTGXvODGV8pWWikT9wELrhxwG07rgHk
-uYiZzM6CvmoowqxqlMaHkO2FPBBxxf88cGTiQWIx6oZ7EYyT6sbz80751PKBkNf0
-+qGRbtTdFT4mO6wew8If7bs0v8uyZ8bGUehRIrTzkug=
------END CERTIFICATE-----
diff --git a/contrib/wpa/eap_example/dh.conf b/contrib/wpa/eap_example/dh.conf
index 7bc83251c592..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/dh.conf
+++ b/contrib/wpa/eap_example/dh.conf
@@ -1,5 +0,0 @@
------BEGIN DH PARAMETERS-----
-MIGHAoGBAP3V8IHq3H2DUlYywsvjYNuS17eCdt0mJo6/os6PHqdhgkMrPxF9u4Gr
-qKXq9e6GqmZYdjta30N3FkXaV924BJ0xOqb2TntiKg4u50/l6hSUneWt6UFBaizd
-XrqjNFIme/5RXMZ7RglXliBpCepAaFLMcKhOS4ulUyYYHSy+oqRjAgEC
------END DH PARAMETERS-----
diff --git a/contrib/wpa/eap_example/eap_example.c b/contrib/wpa/eap_example/eap_example.c
index 8a48cd34b030..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/eap_example.c
+++ b/contrib/wpa/eap_example/eap_example.c
@@ -1,47 +0,0 @@
-/*
- * Example application showing how EAP peer and server code from
- * wpa_supplicant/hostapd can be used as a library. This example program
- * initializes both an EAP server and an EAP peer entities and then runs
- * through an EAP-PEAP/MSCHAPv2 authentication.
- * Copyright (c) 2007, Jouni Malinen
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "includes.h"
-
-#include "common.h"
-
-
-int eap_example_peer_init(void);
-void eap_example_peer_deinit(void);
-int eap_example_peer_step(void);
-
-int eap_example_server_init(void);
-void eap_example_server_deinit(void);
-int eap_example_server_step(void);
-
-
-int main(int argc, char *argv[])
-{
- int res_s, res_p;
-
- wpa_debug_level = 0;
-
- if (eap_example_peer_init() < 0 ||
- eap_example_server_init() < 0)
- return -1;
-
- do {
- printf("---[ server ]--------------------------------\n");
- res_s = eap_example_server_step();
- printf("---[ peer ]----------------------------------\n");
- res_p = eap_example_peer_step();
- } while (res_s || res_p);
-
- eap_example_peer_deinit();
- eap_example_server_deinit();
-
- return 0;
-}
diff --git a/contrib/wpa/eap_example/eap_example_peer.c b/contrib/wpa/eap_example/eap_example_peer.c
index 5fe0cb7fa7f6..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/eap_example_peer.c
+++ b/contrib/wpa/eap_example/eap_example_peer.c
@@ -1,377 +0,0 @@
-/*
- * Example application showing how EAP peer code from wpa_supplicant can be
- * used as a library.
- * Copyright (c) 2007, Jouni Malinen
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "includes.h"
-
-#include "common.h"
-#include "eap_peer/eap.h"
-#include "eap_peer/eap_config.h"
-#include "wpabuf.h"
-
-void eap_example_server_rx(const u8 *data, size_t data_len);
-
-
-struct eap_peer_ctx {
- bool eapSuccess;
- bool eapRestart;
- bool eapFail;
- bool eapResp;
- bool eapNoResp;
- bool eapReq;
- bool portEnabled;
- bool altAccept; /* for EAP */
- bool altReject; /* for EAP */
- bool eapTriggerStart;
-
- struct wpabuf *eapReqData; /* for EAP */
-
- unsigned int idleWhile; /* for EAP state machine */
-
- struct eap_peer_config eap_config;
- struct eap_sm *eap;
-};
-
-
-static struct eap_peer_ctx eap_ctx;
-
-
-static struct eap_peer_config * peer_get_config(void *ctx)
-{
- struct eap_peer_ctx *peer = ctx;
- return &peer->eap_config;
-}
-
-
-static bool peer_get_bool(void *ctx, enum eapol_bool_var variable)
-{
- struct eap_peer_ctx *peer = ctx;
- if (peer == NULL)
- return false;
- switch (variable) {
- case EAPOL_eapSuccess:
- return peer->eapSuccess;
- case EAPOL_eapRestart:
- return peer->eapRestart;
- case EAPOL_eapFail:
- return peer->eapFail;
- case EAPOL_eapResp:
- return peer->eapResp;
- case EAPOL_eapNoResp:
- return peer->eapNoResp;
- case EAPOL_eapReq:
- return peer->eapReq;
- case EAPOL_portEnabled:
- return peer->portEnabled;
- case EAPOL_altAccept:
- return peer->altAccept;
- case EAPOL_altReject:
- return peer->altReject;
- case EAPOL_eapTriggerStart:
- return peer->eapTriggerStart;
- }
- return false;
-}
-
-
-static void peer_set_bool(void *ctx, enum eapol_bool_var variable, bool value)
-{
- struct eap_peer_ctx *peer = ctx;
- if (peer == NULL)
- return;
- switch (variable) {
- case EAPOL_eapSuccess:
- peer->eapSuccess = value;
- break;
- case EAPOL_eapRestart:
- peer->eapRestart = value;
- break;
- case EAPOL_eapFail:
- peer->eapFail = value;
- break;
- case EAPOL_eapResp:
- peer->eapResp = value;
- break;
- case EAPOL_eapNoResp:
- peer->eapNoResp = value;
- break;
- case EAPOL_eapReq:
- peer->eapReq = value;
- break;
- case EAPOL_portEnabled:
- peer->portEnabled = value;
- break;
- case EAPOL_altAccept:
- peer->altAccept = value;
- break;
- case EAPOL_altReject:
- peer->altReject = value;
- break;
- case EAPOL_eapTriggerStart:
- peer->eapTriggerStart = value;
- break;
- }
-}
-
-
-static unsigned int peer_get_int(void *ctx, enum eapol_int_var variable)
-{
- struct eap_peer_ctx *peer = ctx;
- if (peer == NULL)
- return 0;
- switch (variable) {
- case EAPOL_idleWhile:
- return peer->idleWhile;
- }
- return 0;
-}
-
-
-static void peer_set_int(void *ctx, enum eapol_int_var variable,
- unsigned int value)
-{
- struct eap_peer_ctx *peer = ctx;
- if (peer == NULL)
- return;
- switch (variable) {
- case EAPOL_idleWhile:
- peer->idleWhile = value;
- break;
- }
-}
-
-
-static struct wpabuf * peer_get_eapReqData(void *ctx)
-{
- struct eap_peer_ctx *peer = ctx;
- if (peer == NULL || peer->eapReqData == NULL)
- return NULL;
-
- return peer->eapReqData;
-}
-
-
-static void peer_set_config_blob(void *ctx, struct wpa_config_blob *blob)
-{
- printf("TODO: %s\n", __func__);
-}
-
-
-static const struct wpa_config_blob *
-peer_get_config_blob(void *ctx, const char *name)
-{
- printf("TODO: %s\n", __func__);
- return NULL;
-}
-
-
-static void peer_notify_pending(void *ctx)
-{
- printf("TODO: %s\n", __func__);
-}
-
-
-static int eap_peer_register_methods(void)
-{
- int ret = 0;
-
-#ifdef EAP_MD5
- if (ret == 0)
- ret = eap_peer_md5_register();
-#endif /* EAP_MD5 */
-
-#ifdef EAP_TLS
- if (ret == 0)
- ret = eap_peer_tls_register();
-#endif /* EAP_TLS */
-
-#ifdef EAP_MSCHAPv2
- if (ret == 0)
- ret = eap_peer_mschapv2_register();
-#endif /* EAP_MSCHAPv2 */
-
-#ifdef EAP_PEAP
- if (ret == 0)
- ret = eap_peer_peap_register();
-#endif /* EAP_PEAP */
-
-#ifdef EAP_TTLS
- if (ret == 0)
- ret = eap_peer_ttls_register();
-#endif /* EAP_TTLS */
-
-#ifdef EAP_GTC
- if (ret == 0)
- ret = eap_peer_gtc_register();
-#endif /* EAP_GTC */
-
-#ifdef EAP_OTP
- if (ret == 0)
- ret = eap_peer_otp_register();
-#endif /* EAP_OTP */
-
-#ifdef EAP_SIM
- if (ret == 0)
- ret = eap_peer_sim_register();
-#endif /* EAP_SIM */
-
-#ifdef EAP_LEAP
- if (ret == 0)
- ret = eap_peer_leap_register();
-#endif /* EAP_LEAP */
-
-#ifdef EAP_PSK
- if (ret == 0)
- ret = eap_peer_psk_register();
-#endif /* EAP_PSK */
-
-#ifdef EAP_AKA
- if (ret == 0)
- ret = eap_peer_aka_register();
-#endif /* EAP_AKA */
-
-#ifdef EAP_AKA_PRIME
- if (ret == 0)
- ret = eap_peer_aka_prime_register();
-#endif /* EAP_AKA_PRIME */
-
-#ifdef EAP_FAST
- if (ret == 0)
- ret = eap_peer_fast_register();
-#endif /* EAP_FAST */
-
-#ifdef EAP_PAX
- if (ret == 0)
- ret = eap_peer_pax_register();
-#endif /* EAP_PAX */
-
-#ifdef EAP_SAKE
- if (ret == 0)
- ret = eap_peer_sake_register();
-#endif /* EAP_SAKE */
-
-#ifdef EAP_GPSK
- if (ret == 0)
- ret = eap_peer_gpsk_register();
-#endif /* EAP_GPSK */
-
-#ifdef EAP_WSC
- if (ret == 0)
- ret = eap_peer_wsc_register();
-#endif /* EAP_WSC */
-
-#ifdef EAP_IKEV2
- if (ret == 0)
- ret = eap_peer_ikev2_register();
-#endif /* EAP_IKEV2 */
-
-#ifdef EAP_VENDOR_TEST
- if (ret == 0)
- ret = eap_peer_vendor_test_register();
-#endif /* EAP_VENDOR_TEST */
-
-#ifdef EAP_TNC
- if (ret == 0)
- ret = eap_peer_tnc_register();
-#endif /* EAP_TNC */
-
- return ret;
-}
-
-
-static struct eapol_callbacks eap_cb;
-static struct eap_config eap_conf;
-
-int eap_example_peer_init(void)
-{
- if (eap_peer_register_methods() < 0)
- return -1;
-
- os_memset(&eap_ctx, 0, sizeof(eap_ctx));
-
- eap_ctx.eap_config.identity = (u8 *) os_strdup("user");
- eap_ctx.eap_config.identity_len = 4;
- eap_ctx.eap_config.password = (u8 *) os_strdup("password");
- eap_ctx.eap_config.password_len = 8;
- eap_ctx.eap_config.cert.ca_cert = os_strdup("ca.pem");
- eap_ctx.eap_config.fragment_size = 1398;
-
- os_memset(&eap_cb, 0, sizeof(eap_cb));
- eap_cb.get_config = peer_get_config;
- eap_cb.get_bool = peer_get_bool;
- eap_cb.set_bool = peer_set_bool;
- eap_cb.get_int = peer_get_int;
- eap_cb.set_int = peer_set_int;
- eap_cb.get_eapReqData = peer_get_eapReqData;
- eap_cb.set_config_blob = peer_set_config_blob;
- eap_cb.get_config_blob = peer_get_config_blob;
- eap_cb.notify_pending = peer_notify_pending;
-
- os_memset(&eap_conf, 0, sizeof(eap_conf));
- eap_ctx.eap = eap_peer_sm_init(&eap_ctx, &eap_cb, &eap_ctx, &eap_conf);
- if (eap_ctx.eap == NULL)
- return -1;
-
- /* Enable "port" to allow authentication */
- eap_ctx.portEnabled = true;
-
- return 0;
-}
-
-
-void eap_example_peer_deinit(void)
-{
- eap_peer_sm_deinit(eap_ctx.eap);
- eap_peer_unregister_methods();
- wpabuf_free(eap_ctx.eapReqData);
- os_free(eap_ctx.eap_config.identity);
- os_free(eap_ctx.eap_config.password);
- os_free(eap_ctx.eap_config.cert.ca_cert);
-}
-
-
-int eap_example_peer_step(void)
-{
- int res;
- res = eap_peer_sm_step(eap_ctx.eap);
-
- if (eap_ctx.eapResp) {
- struct wpabuf *resp;
- printf("==> Response\n");
- eap_ctx.eapResp = false;
- resp = eap_get_eapRespData(eap_ctx.eap);
- if (resp) {
- /* Send EAP response to the server */
- eap_example_server_rx(wpabuf_head(resp),
- wpabuf_len(resp));
- wpabuf_free(resp);
- }
- }
-
- if (eap_ctx.eapSuccess) {
- res = 0;
- if (eap_key_available(eap_ctx.eap)) {
- const u8 *key;
- size_t key_len;
- key = eap_get_eapKeyData(eap_ctx.eap, &key_len);
- wpa_hexdump(MSG_DEBUG, "EAP keying material",
- key, key_len);
- }
- }
-
- return res;
-}
-
-
-void eap_example_peer_rx(const u8 *data, size_t data_len)
-{
- /* Make received EAP message available to the EAP library */
- eap_ctx.eapReq = true;
- wpabuf_free(eap_ctx.eapReqData);
- eap_ctx.eapReqData = wpabuf_alloc_copy(data, data_len);
-}
diff --git a/contrib/wpa/eap_example/eap_example_server.c b/contrib/wpa/eap_example/eap_example_server.c
index 3a132bb3466e..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/eap_example_server.c
+++ b/contrib/wpa/eap_example/eap_example_server.c
@@ -1,300 +0,0 @@
-/*
- * Example application showing how EAP server code from hostapd can be used as
- * a library.
- * Copyright (c) 2007, Jouni Malinen
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "includes.h"
-
-#include "common.h"
-#include "crypto/tls.h"
-#include "eap_server/eap.h"
-#include "wpabuf.h"
-
-void eap_example_peer_rx(const u8 *data, size_t data_len);
-
-
-struct eap_server_ctx {
- struct eap_eapol_interface *eap_if;
- struct eap_sm *eap;
- void *tls_ctx;
-};
-
-static struct eap_server_ctx eap_ctx;
-
-
-static int server_get_eap_user(void *ctx, const u8 *identity,
- size_t identity_len, int phase2,
- struct eap_user *user)
-{
- os_memset(user, 0, sizeof(*user));
-
- if (!phase2) {
- /* Only allow EAP-PEAP as the Phase 1 method */
- user->methods[0].vendor = EAP_VENDOR_IETF;
- user->methods[0].method = EAP_TYPE_PEAP;
- return 0;
- }
-
- if (identity_len != 4 || identity == NULL ||
- os_memcmp(identity, "user", 4) != 0) {
- printf("Unknown user\n");
- return -1;
- }
-
- /* Only allow EAP-MSCHAPv2 as the Phase 2 method */
- user->methods[0].vendor = EAP_VENDOR_IETF;
- user->methods[0].method = EAP_TYPE_MSCHAPV2;
- user->password = (u8 *) os_strdup("password");
- user->password_len = 8;
-
- return 0;
-}
-
-
-static const char * server_get_eap_req_id_text(void *ctx, size_t *len)
-{
- *len = 0;
- return NULL;
-}
-
-
-static struct eapol_callbacks eap_cb;
-static struct eap_config eap_conf;
-
-static int eap_example_server_init_tls(void)
-{
- struct tls_config tconf;
- struct tls_connection_params tparams;
-
- os_memset(&tconf, 0, sizeof(tconf));
- eap_ctx.tls_ctx = tls_init(&tconf);
- if (eap_ctx.tls_ctx == NULL)
- return -1;
-
- os_memset(&tparams, 0, sizeof(tparams));
- tparams.ca_cert = "ca.pem";
- tparams.client_cert = "server.pem";
- /* tparams.private_key = "server.key"; */
- tparams.private_key = "server-key.pem";
- /* tparams.private_key_passwd = "whatever"; */
- tparams.dh_file = "dh.conf";
-
- if (tls_global_set_params(eap_ctx.tls_ctx, &tparams)) {
- printf("Failed to set TLS parameters\n");
- return -1;
- }
-
- if (tls_global_set_verify(eap_ctx.tls_ctx, 0, 1)) {
- printf("Failed to set check_crl\n");
- return -1;
- }
-
- return 0;
-}
-
-
-static int eap_server_register_methods(void)
-{
- int ret = 0;
-
-#ifdef EAP_SERVER_IDENTITY
- if (ret == 0)
- ret = eap_server_identity_register();
-#endif /* EAP_SERVER_IDENTITY */
-
-#ifdef EAP_SERVER_MD5
- if (ret == 0)
- ret = eap_server_md5_register();
-#endif /* EAP_SERVER_MD5 */
-
-#ifdef EAP_SERVER_TLS
- if (ret == 0)
- ret = eap_server_tls_register();
-#endif /* EAP_SERVER_TLS */
-
-#ifdef EAP_SERVER_MSCHAPV2
- if (ret == 0)
- ret = eap_server_mschapv2_register();
-#endif /* EAP_SERVER_MSCHAPV2 */
-
-#ifdef EAP_SERVER_PEAP
- if (ret == 0)
- ret = eap_server_peap_register();
-#endif /* EAP_SERVER_PEAP */
-
-#ifdef EAP_SERVER_TLV
- if (ret == 0)
- ret = eap_server_tlv_register();
-#endif /* EAP_SERVER_TLV */
-
-#ifdef EAP_SERVER_GTC
- if (ret == 0)
- ret = eap_server_gtc_register();
-#endif /* EAP_SERVER_GTC */
-
-#ifdef EAP_SERVER_TTLS
- if (ret == 0)
- ret = eap_server_ttls_register();
-#endif /* EAP_SERVER_TTLS */
-
-#ifdef EAP_SERVER_SIM
- if (ret == 0)
- ret = eap_server_sim_register();
-#endif /* EAP_SERVER_SIM */
-
-#ifdef EAP_SERVER_AKA
- if (ret == 0)
- ret = eap_server_aka_register();
-#endif /* EAP_SERVER_AKA */
-
-#ifdef EAP_SERVER_AKA_PRIME
- if (ret == 0)
- ret = eap_server_aka_prime_register();
-#endif /* EAP_SERVER_AKA_PRIME */
-
-#ifdef EAP_SERVER_PAX
- if (ret == 0)
- ret = eap_server_pax_register();
-#endif /* EAP_SERVER_PAX */
-
-#ifdef EAP_SERVER_PSK
- if (ret == 0)
- ret = eap_server_psk_register();
-#endif /* EAP_SERVER_PSK */
-
-#ifdef EAP_SERVER_SAKE
- if (ret == 0)
- ret = eap_server_sake_register();
-#endif /* EAP_SERVER_SAKE */
-
-#ifdef EAP_SERVER_GPSK
- if (ret == 0)
- ret = eap_server_gpsk_register();
-#endif /* EAP_SERVER_GPSK */
-
-#ifdef EAP_SERVER_VENDOR_TEST
- if (ret == 0)
- ret = eap_server_vendor_test_register();
-#endif /* EAP_SERVER_VENDOR_TEST */
-
-#ifdef EAP_SERVER_FAST
- if (ret == 0)
- ret = eap_server_fast_register();
-#endif /* EAP_SERVER_FAST */
-
-#ifdef EAP_SERVER_WSC
- if (ret == 0)
- ret = eap_server_wsc_register();
-#endif /* EAP_SERVER_WSC */
-
-#ifdef EAP_SERVER_IKEV2
- if (ret == 0)
- ret = eap_server_ikev2_register();
-#endif /* EAP_SERVER_IKEV2 */
-
-#ifdef EAP_SERVER_TNC
- if (ret == 0)
- ret = eap_server_tnc_register();
-#endif /* EAP_SERVER_TNC */
-
- return ret;
-}
-
-
-int eap_example_server_init(void)
-{
- struct eap_session_data eap_sess;
-
- if (eap_server_register_methods() < 0)
- return -1;
-
- os_memset(&eap_ctx, 0, sizeof(eap_ctx));
-
- if (eap_example_server_init_tls() < 0)
- return -1;
-
- os_memset(&eap_cb, 0, sizeof(eap_cb));
- eap_cb.get_eap_user = server_get_eap_user;
- eap_cb.get_eap_req_id_text = server_get_eap_req_id_text;
-
- os_memset(&eap_conf, 0, sizeof(eap_conf));
- eap_conf.eap_server = 1;
- eap_conf.ssl_ctx = eap_ctx.tls_ctx;
-
- os_memset(&eap_sess, 0, sizeof(eap_sess));
- eap_ctx.eap = eap_server_sm_init(&eap_ctx, &eap_cb, &eap_conf,
- &eap_sess);
- if (eap_ctx.eap == NULL)
- return -1;
-
- eap_ctx.eap_if = eap_get_interface(eap_ctx.eap);
-
- /* Enable "port" and request EAP to start authentication. */
- eap_ctx.eap_if->portEnabled = true;
- eap_ctx.eap_if->eapRestart = true;
-
- return 0;
-}
-
-
-void eap_example_server_deinit(void)
-{
- eap_server_sm_deinit(eap_ctx.eap);
- eap_server_unregister_methods();
- tls_deinit(eap_ctx.tls_ctx);
-}
-
-
-int eap_example_server_step(void)
-{
- int res, process = 0;
-
- res = eap_server_sm_step(eap_ctx.eap);
-
- if (eap_ctx.eap_if->eapReq) {
- printf("==> Request\n");
- process = 1;
- eap_ctx.eap_if->eapReq = 0;
- }
-
- if (eap_ctx.eap_if->eapSuccess) {
- printf("==> Success\n");
- process = 1;
- res = 0;
- eap_ctx.eap_if->eapSuccess = 0;
-
- if (eap_ctx.eap_if->eapKeyAvailable) {
- wpa_hexdump(MSG_DEBUG, "EAP keying material",
- eap_ctx.eap_if->eapKeyData,
- eap_ctx.eap_if->eapKeyDataLen);
- }
- }
-
- if (eap_ctx.eap_if->eapFail) {
- printf("==> Fail\n");
- process = 1;
- eap_ctx.eap_if->eapFail = 0;
- }
-
- if (process && eap_ctx.eap_if->eapReqData) {
- /* Send EAP request to the peer */
- eap_example_peer_rx(wpabuf_head(eap_ctx.eap_if->eapReqData),
- wpabuf_len(eap_ctx.eap_if->eapReqData));
- }
-
- return res;
-}
-
-
-void eap_example_server_rx(const u8 *data, size_t data_len)
-{
- /* Make received EAP message available to the EAP library */
- wpabuf_free(eap_ctx.eap_if->eapRespData);
- eap_ctx.eap_if->eapRespData = wpabuf_alloc_copy(data, data_len);
- if (eap_ctx.eap_if->eapRespData)
- eap_ctx.eap_if->eapResp = true;
-}
diff --git a/contrib/wpa/eap_example/server-key.pem b/contrib/wpa/eap_example/server-key.pem
index 0fe2cec47330..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/server-key.pem
+++ b/contrib/wpa/eap_example/server-key.pem
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC6oHdVIhSFVWWbZCyt7ZvdZTHJ2mBQzjjWNNzovBueMOcS41Ns
-ye1IA3mBaZjOirh3RzZFz8bg8XsecYlU9wHMIq2gQrGoNZ5gqjqYUdD/H+6+jQpj
-+6I5F/JkYfZlAjJ5dOGf0YllVanDIJ6/aVaz908/qVTC2o88r/J1VPp+gQIDAQAB
-AoGAR/C5b3DOtkMgAtGPw5AXiDWNBsGOZTfJgxEnovN4Nfel64sDyqjgNeVY/kDl
-baDd0OT7j9ezU1zi1+5uQPlikFSvzgpdLgQhKkvWLzzehafb2uVaJ4VsRqS3WXK8
-RE06cYx4VQRkvQvMAXWsuua9pw36OrlpQnm3HlAbrks8Mm0CQQDgMEu2WPMWP2wj
-Q8735zbj7D0AxEFlcegPZr/QZ3qU//G0HL35FG18lsuTbDzesrf7apo3W1BBQLjS
-ZSNtyNsLAkEA1Ru6aEy/Cj2u1GYHu1u/RcshKC+W7rdVT0wDeiSTUzKafZNiwVhY
-1Epk4k5HnHB327ysTI1LiOzUMMmuNYUkIwJAKUkbmFAXLCCv5GqnYcXluOGXdl2u
-AWWRq8xrRJDZ5TihJV8pqQYXB5upj9Od/hEBir5d+hXJ2Mp3ft97P8t+cwJAGeWQ
-tXP+EySDxlPPxLjVeYnBsbx2vvOQbl5yXblsHcQcef4bFhvCT6nqsIWKtjwElLNM
-zNCuySjecD9R6DcRuQJBAJWrpgny77wP29x1WQ/29J8ZJfxe4N5wAj1SePBVNgZ3
-gfm1O+c6niNwe8RnfQimppLrrR+qK33te2SPGXiwi6g=
------END RSA PRIVATE KEY-----
diff --git a/contrib/wpa/eap_example/server.key b/contrib/wpa/eap_example/server.key
index 1416327bef21..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/server.key
+++ b/contrib/wpa/eap_example/server.key
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALqgd1UiFIVVZZtk
-LK3tm91lMcnaYFDOONY03Oi8G54w5xLjU2zJ7UgDeYFpmM6KuHdHNkXPxuDxex5x
-iVT3AcwiraBCsag1nmCqOphR0P8f7r6NCmP7ojkX8mRh9mUCMnl04Z/RiWVVqcMg
-nr9pVrP3Tz+pVMLajzyv8nVU+n6BAgMBAAECgYBH8LlvcM62QyAC0Y/DkBeINY0G
-wY5lN8mDESei83g196XriwPKqOA15Vj+QOVtoN3Q5PuP17NTXOLX7m5A+WKQVK/O
-Cl0uBCEqS9YvPN6Fp9va5VonhWxGpLdZcrxETTpxjHhVBGS9C8wBday65r2nDfo6
-uWlCebceUBuuSzwybQJBAOAwS7ZY8xY/bCNDzvfnNuPsPQDEQWVx6A9mv9BnepT/
-8bQcvfkUbXyWy5NsPN6yt/tqmjdbUEFAuNJlI23I2wsCQQDVG7poTL8KPa7UZge7
-W79FyyEoL5but1VPTAN6JJNTMpp9k2LBWFjUSmTiTkeccHfbvKxMjUuI7NQwya41
-hSQjAkApSRuYUBcsIK/kaqdhxeW44Zd2Xa4BZZGrzGtEkNnlOKElXympBhcHm6mP
-053+EQGKvl36FcnYynd+33s/y35zAkAZ5ZC1c/4TJIPGU8/EuNV5icGxvHa+85Bu
-XnJduWwdxBx5/hsWG8JPqeqwhYq2PASUs0zM0K7JKN5wP1HoNxG5AkEAlaumCfLv
-vA/b3HVZD/b0nxkl/F7g3nACPVJ48FU2BneB+bU75zqeI3B7xGd9CKamkuutH6or
-fe17ZI8ZeLCLqA==
------END PRIVATE KEY-----
diff --git a/contrib/wpa/eap_example/server.pem b/contrib/wpa/eap_example/server.pem
index 93b39b9d5027..e69de29bb2d1 100644
--- a/contrib/wpa/eap_example/server.pem
+++ b/contrib/wpa/eap_example/server.pem
@@ -1,64 +0,0 @@
-Certificate:
- Data:
- Version: 3 (0x2)
- Serial Number: 15624081837803162903 (0xd8d3e3a6cbe3cd17)
- Signature Algorithm: sha256WithRSAEncryption
- Issuer: C=FI, O=w1.fi, CN=Root CA
- Validity
- Not Before: Oct 3 22:13:55 2018 GMT
- Not After : Oct 3 22:13:55 2019 GMT
- Subject: C=FI, O=w1.fi, CN=server.w1.fi
- Subject Public Key Info:
- Public Key Algorithm: rsaEncryption
- Public-Key: (1024 bit)
- Modulus:
- 00:ba:a0:77:55:22:14:85:55:65:9b:64:2c:ad:ed:
- 9b:dd:65:31:c9:da:60:50:ce:38:d6:34:dc:e8:bc:
- 1b:9e:30:e7:12:e3:53:6c:c9:ed:48:03:79:81:69:
- 98:ce:8a:b8:77:47:36:45:cf:c6:e0:f1:7b:1e:71:
- 89:54:f7:01:cc:22:ad:a0:42:b1:a8:35:9e:60:aa:
- 3a:98:51:d0:ff:1f:ee:be:8d:0a:63:fb:a2:39:17:
- f2:64:61:f6:65:02:32:79:74:e1:9f:d1:89:65:55:
- a9:c3:20:9e:bf:69:56:b3:f7:4f:3f:a9:54:c2:da:
- 8f:3c:af:f2:75:54:fa:7e:81
- Exponent: 65537 (0x10001)
- X509v3 extensions:
- X509v3 Basic Constraints:
- CA:FALSE
- X509v3 Subject Key Identifier:
- 31:4F:10:5C:67:9F:BE:4E:88:D6:DC:C5:AB:9E:12:88:86:69:02:4F
- X509v3 Authority Key Identifier:
- keyid:B8:92:DE:FD:8A:18:B3:30:C3:9F:55:F3:33:5D:B4:C8:29:8A:41:14
-
- Authority Information Access:
- OCSP - URI:http://server.w1.fi:8888/
-
- X509v3 Subject Alternative Name:
- DNS:server.w1.fi
- X509v3 Extended Key Usage:
- TLS Web Server Authentication
- Signature Algorithm: sha256WithRSAEncryption
- b6:98:ae:d9:9b:9a:44:49:b2:06:ee:af:36:83:cb:cd:cb:c9:
- f3:38:6d:65:cb:e9:81:d2:25:dd:76:12:5c:da:3f:a1:0e:11:
- a5:04:ed:05:29:2d:66:94:82:a2:80:67:d1:d8:78:71:72:5f:
- 10:c3:51:a2:7b:f5:0b:5f:ec:70:12:99:cb:65:6f:50:7f:2b:
- 05:7c:b4:d7:1b:21:77:66:47:33:f3:a7:d6:fb:ce:97:fe:5f:
- fd:df:1f:1d:6f:ef:22:5a:c6:78:d2:2b:07:1e:55:ec:80:62:
- 06:7a:be:6a:0d:4d:96:c2:d5:df:76:56:b0:85:6a:f8:a0:27:
- 62:31
------BEGIN CERTIFICATE-----
-MIIClTCCAf6gAwIBAgIJANjT46bL480XMA0GCSqGSIb3DQEBCwUAMC8xCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQKDAV3MS5maTEQMA4GA1UEAwwHUm9vdCBDQTAeFw0xODEw
-MDMyMjEzNTVaFw0xOTEwMDMyMjEzNTVaMDQxCzAJBgNVBAYTAkZJMQ4wDAYDVQQK
-DAV3MS5maTEVMBMGA1UEAwwMc2VydmVyLncxLmZpMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQC6oHdVIhSFVWWbZCyt7ZvdZTHJ2mBQzjjWNNzovBueMOcS41Ns
-ye1IA3mBaZjOirh3RzZFz8bg8XsecYlU9wHMIq2gQrGoNZ5gqjqYUdD/H+6+jQpj
-+6I5F/JkYfZlAjJ5dOGf0YllVanDIJ6/aVaz908/qVTC2o88r/J1VPp+gQIDAQAB
-o4GzMIGwMAkGA1UdEwQCMAAwHQYDVR0OBBYEFDFPEFxnn75OiNbcxaueEoiGaQJP
-MB8GA1UdIwQYMBaAFLiS3v2KGLMww59V8zNdtMgpikEUMDUGCCsGAQUFBwEBBCkw
-JzAlBggrBgEFBQcwAYYZaHR0cDovL3NlcnZlci53MS5maTo4ODg4LzAXBgNVHREE
-EDAOggxzZXJ2ZXIudzEuZmkwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDQYJKoZIhvcN
-AQELBQADgYEAtpiu2ZuaREmyBu6vNoPLzcvJ8zhtZcvpgdIl3XYSXNo/oQ4RpQTt
-BSktZpSCooBn0dh4cXJfEMNRonv1C1/scBKZy2VvUH8rBXy01xshd2ZHM/On1vvO
-l/5f/d8fHW/vIlrGeNIrBx5V7IBiBnq+ag1NlsLV33ZWsIVq+KAnYjE=
------END CERTIFICATE-----
diff --git a/contrib/wpa/hostapd/.gitignore b/contrib/wpa/hostapd/.gitignore
index 857f3dc4196c..e69de29bb2d1 100644
--- a/contrib/wpa/hostapd/.gitignore
+++ b/contrib/wpa/hostapd/.gitignore
@@ -1,5 +0,0 @@
-.config
-hostapd
-hostapd_cli
-hlr_auc_gw
-nt_password_hash
diff --git a/contrib/wpa/hostapd/sae_pk_gen.c b/contrib/wpa/hostapd/sae_pk_gen.c
index c31eff75b538..e69de29bb2d1 100644
--- a/contrib/wpa/hostapd/sae_pk_gen.c
+++ b/contrib/wpa/hostapd/sae_pk_gen.c
@@ -1,196 +0,0 @@
-/*
- * SAE-PK password/modifier generator
- * Copyright (c) 2020, The Linux Foundation
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "utils/includes.h"
-
-#include "utils/common.h"
-#include "utils/base64.h"
-#include "crypto/crypto.h"
-#include "common/sae.h"
-
-
-int main(int argc, char *argv[])
-{
- char *der = NULL;
- size_t der_len;
- struct crypto_ec_key *key = NULL;
- struct wpabuf *pub = NULL;
- u8 *data = NULL, *m;
- size_t data_len;
- char *b64 = NULL, *pw = NULL, *pos, *src;
- int sec, j;
- int ret = -1;
- u8 hash[SAE_MAX_HASH_LEN];
- char hash_hex[2 * SAE_MAX_HASH_LEN + 1];
- u8 pw_base_bin[SAE_MAX_HASH_LEN];
- u8 *dst;
- int group;
- size_t hash_len;
- unsigned long long i, expected;
- char m_hex[2 * SAE_PK_M_LEN + 1];
- u32 sec_1b, val20;
-
- wpa_debug_level = MSG_INFO;
- if (os_program_init() < 0)
- goto fail;
-
- if (argc != 4) {
- fprintf(stderr,
- "usage: sae_pk_gen \n");
- goto fail;
- }
-
- sec = atoi(argv[2]);
- if (sec != 3 && sec != 5) {
- fprintf(stderr,
- "Invalid Sec value (allowed values: 3 and 5)\n");
- goto fail;
- }
- sec_1b = sec == 3;
- expected = 1;
- for (j = 0; j < sec; j++)
- expected *= 256;
-
- der = os_readfile(argv[1], &der_len);
- if (!der) {
- fprintf(stderr, "Could not read %s: %s\n",
- argv[1], strerror(errno));
- goto fail;
- }
-
- key = crypto_ec_key_parse_priv((u8 *) der, der_len);
- if (!key) {
- fprintf(stderr, "Could not parse ECPrivateKey\n");
- goto fail;
- }
-
- pub = crypto_ec_key_get_subject_public_key(key);
- if (!pub) {
- fprintf(stderr, "Failed to build SubjectPublicKey\n");
- goto fail;
- }
-
- group = crypto_ec_key_group(key);
- switch (group) {
- case 19:
- hash_len = 32;
- break;
- case 20:
- hash_len = 48;
- break;
- case 21:
- hash_len = 64;
- break;
- default:
- fprintf(stderr, "Unsupported private key group\n");
- goto fail;
- }
-
- data_len = os_strlen(argv[3]) + SAE_PK_M_LEN + wpabuf_len(pub);
- data = os_malloc(data_len);
- if (!data) {
- fprintf(stderr, "No memory for data buffer\n");
- goto fail;
- }
- os_memcpy(data, argv[3], os_strlen(argv[3]));
- m = data + os_strlen(argv[3]);
- if (os_get_random(m, SAE_PK_M_LEN) < 0) {
- fprintf(stderr, "Could not generate random Modifier M\n");
- goto fail;
- }
- os_memcpy(m + SAE_PK_M_LEN, wpabuf_head(pub), wpabuf_len(pub));
-
- fprintf(stderr, "Searching for a suitable Modifier M value\n");
- for (i = 0;; i++) {
- if (sae_hash(hash_len, data, data_len, hash) < 0) {
- fprintf(stderr, "Hash failed\n");
- goto fail;
- }
- if (hash[0] == 0 && hash[1] == 0) {
- if ((hash[2] & 0xf0) == 0)
- fprintf(stderr, "\r%3.2f%%",
- 100.0 * (double) i / (double) expected);
- for (j = 2; j < sec; j++) {
- if (hash[j])
- break;
- }
- if (j == sec)
- break;
- }
- inc_byte_array(m, SAE_PK_M_LEN);
- }
-
- if (wpa_snprintf_hex(m_hex, sizeof(m_hex), m, SAE_PK_M_LEN) < 0 ||
- wpa_snprintf_hex(hash_hex, sizeof(hash_hex), hash, hash_len) < 0)
- goto fail;
- fprintf(stderr, "\nFound a valid hash in %llu iterations: %s\n",
- i + 1, hash_hex);
-
- b64 = base64_encode(der, der_len, NULL);
- if (!b64)
- goto fail;
- src = pos = b64;
- while (*src) {
- if (*src != '\n')
- *pos++ = *src;
- src++;
- }
- *pos = '\0';
-
- /* Skip 8*Sec bits and add Sec_1b as the every 20th bit starting with
- * one. */
- os_memset(pw_base_bin, 0, sizeof(pw_base_bin));
- dst = pw_base_bin;
- for (j = 0; j < 8 * (int) hash_len / 20; j++) {
- val20 = sae_pk_get_be19(hash + sec);
- val20 |= sec_1b << 19;
- sae_pk_buf_shift_left_19(hash + sec, hash_len - sec);
-
- if (j & 1) {
- *dst |= (val20 >> 16) & 0x0f;
- dst++;
- *dst++ = (val20 >> 8) & 0xff;
- *dst++ = val20 & 0xff;
- } else {
- *dst++ = (val20 >> 12) & 0xff;
- *dst++ = (val20 >> 4) & 0xff;
- *dst = (val20 << 4) & 0xf0;
- }
- }
- if (wpa_snprintf_hex(hash_hex, sizeof(hash_hex),
- pw_base_bin, hash_len - sec) >= 0)
- fprintf(stderr, "PasswordBase binary data for base32: %s",
- hash_hex);
-
- pw = sae_pk_base32_encode(pw_base_bin, 20 * 3 - 5);
- if (!pw)
- goto fail;
-
- printf("# SAE-PK password/M/private key for Sec=%d.\n", sec);
- printf("sae_password=%s|pk=%s:%s\n", pw, m_hex, b64);
- printf("# Longer passwords can be used for improved security at the cost of usability:\n");
- for (j = 4; j <= ((int) hash_len * 8 + 5 - 8 * sec) / 19; j++) {
- os_free(pw);
- pw = sae_pk_base32_encode(pw_base_bin, 20 * j - 5);
- if (pw)
- printf("# %s\n", pw);
- }
-
- ret = 0;
-fail:
- os_free(der);
- wpabuf_free(pub);
- crypto_ec_key_deinit(key);
- os_free(data);
- os_free(b64);
- os_free(pw);
-
- os_program_deinit();
-
- return ret;
-}
diff --git a/contrib/wpa/hs20/server/.gitignore b/contrib/wpa/hs20/server/.gitignore
index fecb096c128a..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/.gitignore
+++ b/contrib/wpa/hs20/server/.gitignore
@@ -1 +0,0 @@
-hs20_spp_server
diff --git a/contrib/wpa/hs20/server/Makefile b/contrib/wpa/hs20/server/Makefile
index 0cab6d6b010a..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/Makefile
+++ b/contrib/wpa/hs20/server/Makefile
@@ -1,42 +0,0 @@
-ALL=hs20_spp_server
-
-include ../../src/build.rules
-
-CFLAGS += -I../../src
-CFLAGS += -I../../src/utils
-CFLAGS += -I../../src/crypto
-
-LIBS += -lsqlite3
-
-# Using glibc < 2.17 requires -lrt for clock_gettime()
-LIBS += -lrt
-
-ifndef CONFIG_NO_GITVER
-# Add VERSION_STR postfix for builds from a git repository
-ifeq ($(wildcard ../../.git),../../.git)
-GITVER := $(shell git describe --dirty=+)
-ifneq ($(GITVER),)
-CFLAGS += -DGIT_VERSION_STR_POSTFIX=\"-$(GITVER)\"
-endif
-endif
-endif
-
-OBJS=spp_server.o
-OBJS += hs20_spp_server.o
-OBJS += ../../src/utils/xml-utils.o
-OBJS += ../../src/utils/base64.o
-OBJS += ../../src/utils/common.o
-OBJS += ../../src/utils/os_unix.o
-OBJS += ../../src/utils/wpa_debug.o
-OBJS += ../../src/crypto/md5-internal.o
-CFLAGS += $(shell xml2-config --cflags)
-LIBS += $(shell xml2-config --libs)
-OBJS += ../../src/utils/xml_libxml2.o
-
-_OBJS_VAR := OBJS
-include ../../src/objs.mk
-hs20_spp_server: $(OBJS)
- $(LDO) $(LDFLAGS) -o hs20_spp_server $(OBJS) $(LIBS)
-
-clean: common-clean
- rm -f core *~
diff --git a/contrib/wpa/hs20/server/ca/clean.sh b/contrib/wpa/hs20/server/ca/clean.sh
index c72dcbda45e9..e69de29bb2d1 100755
--- a/contrib/wpa/hs20/server/ca/clean.sh
+++ b/contrib/wpa/hs20/server/ca/clean.sh
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-for i in server-client server server-revoked user ocsp; do
- rm -f $i.csr $i.key $i.pem
-done
-
-rm -f openssl.cnf.tmp
-if [ -d demoCA ]; then
- rm -r demoCA
-fi
-rm -f ca.pem logo.asn1 logo.der server.der ocsp-server-cache.der
-rm -f my-openssl.cnf my-openssl-root.cnf
-#rm -r rootCA
diff --git a/contrib/wpa/hs20/server/ca/est-csrattrs.cnf b/contrib/wpa/hs20/server/ca/est-csrattrs.cnf
index b50ea00d0b77..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/ca/est-csrattrs.cnf
+++ b/contrib/wpa/hs20/server/ca/est-csrattrs.cnf
@@ -1,17 +0,0 @@
-asn1 = SEQUENCE:attrs
-
-[attrs]
-#oid1 = OID:challengePassword
-attr1 = SEQUENCE:extreq
-oid2 = OID:sha256WithRSAEncryption
-
-[extreq]
-oid = OID:extensionRequest
-vals = SET:extreqvals
-
-[extreqvals]
-
-oid1 = OID:macAddress
-#oid2 = OID:imei
-#oid3 = OID:meid
-#oid4 = OID:DevId
diff --git a/contrib/wpa/hs20/server/ca/est-csrattrs.sh b/contrib/wpa/hs20/server/ca/est-csrattrs.sh
index 0b73a0408284..e69de29bb2d1 100755
--- a/contrib/wpa/hs20/server/ca/est-csrattrs.sh
+++ b/contrib/wpa/hs20/server/ca/est-csrattrs.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-openssl asn1parse -genconf est-csrattrs.cnf -out est-csrattrs.der -oid hs20.oid
-base64 est-csrattrs.der > est-attrs.b64
diff --git a/contrib/wpa/hs20/server/ca/hs20.oid b/contrib/wpa/hs20/server/ca/hs20.oid
index a829ff29bf44..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/ca/hs20.oid
+++ b/contrib/wpa/hs20/server/ca/hs20.oid
@@ -1,7 +0,0 @@
-1.3.6.1.1.1.1.22 macAddress
-1.2.840.113549.1.9.14 extensionRequest
-1.3.6.1.4.1.40808.1.1.1 id-wfa-hotspot-friendlyName
-1.3.6.1.4.1.40808.1.1.2 id-kp-HS2.0Auth
-1.3.6.1.4.1.40808.1.1.3 imei
-1.3.6.1.4.1.40808.1.1.4 meid
-1.3.6.1.4.1.40808.1.1.5 DevId
diff --git a/contrib/wpa/hs20/server/ca/ocsp-req.sh b/contrib/wpa/hs20/server/ca/ocsp-req.sh
index 931a20696d02..e69de29bb2d1 100755
--- a/contrib/wpa/hs20/server/ca/ocsp-req.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-req.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-for i in *.pem; do
- echo "===[ $i ]==================="
- openssl ocsp -text -CAfile ca.pem -verify_other demoCA/cacert.pem -trust_other -issuer demoCA/cacert.pem -cert $i -url http://localhost:8888/
-
-# openssl ocsp -text -CAfile rootCA/cacert.pem -issuer demoCA/cacert.pem -cert $i -url http://localhost:8888/
-
-# openssl ocsp -text -CAfile rootCA/cacert.pem -verify_other demoCA/cacert.pem -trust_other -issuer demoCA/cacert.pem -cert $i -url http://localhost:8888/
-# openssl ocsp -text -CAfile rootCA/cacert.pem -VAfile ca.pem -trust_other -issuer demoCA/cacert.pem -cert $i -url http://localhost:8888/
-done
diff --git a/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh b/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
index 116c6e1c3d01..e69de29bb2d1 100755
--- a/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-responder-ica.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-openssl ocsp -index demoCA/index.txt -port 8888 -nmin 5 -rsigner demoCA/cacert.pem -rkey demoCA/private/cakey-plain.pem -CA demoCA/cacert.pem -resp_no_certs -text
diff --git a/contrib/wpa/hs20/server/ca/ocsp-responder.sh b/contrib/wpa/hs20/server/ca/ocsp-responder.sh
index 620947d01af0..e69de29bb2d1 100755
--- a/contrib/wpa/hs20/server/ca/ocsp-responder.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-responder.sh
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-openssl ocsp -index demoCA/index.txt -port 8888 -nmin 5 -rsigner ocsp.pem -rkey ocsp.key -CA demoCA/cacert.pem -text -ignore_err
diff --git a/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh b/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
index f2b23250cadd..e69de29bb2d1 100755
--- a/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
+++ b/contrib/wpa/hs20/server/ca/ocsp-update-cache.sh
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# NOTE: You may need to replace 'localhost' with your OCSP server hostname.
-openssl ocsp \
- -no_nonce \
- -CAfile ca.pem \
- -verify_other demoCA/cacert.pem \
- -issuer demoCA/cacert.pem \
- -cert server.pem \
- -url http://localhost:8888/ \
- -respout ocsp-server-cache.der
diff --git a/contrib/wpa/hs20/server/ca/openssl-root.cnf b/contrib/wpa/hs20/server/ca/openssl-root.cnf
index 5bc50be1dbc9..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/ca/openssl-root.cnf
+++ b/contrib/wpa/hs20/server/ca/openssl-root.cnf
@@ -1,125 +0,0 @@
-# OpenSSL configuration file for Hotspot 2.0 PKI (Root CA)
-
-HOME = .
-RANDFILE = $ENV::HOME/.rnd
-oid_section = new_oids
-
-[ new_oids ]
-
-#logotypeoid=1.3.6.1.5.5.7.1.12
-
-####################################################################
-[ ca ]
-default_ca = CA_default # The default ca section
-
-####################################################################
-[ CA_default ]
-
-dir = ./rootCA # Where everything is kept
-certs = $dir/certs # Where the issued certs are kept
-crl_dir = $dir/crl # Where the issued crl are kept
-database = $dir/index.txt # database index file.
-#unique_subject = no # Set to 'no' to allow creation of
- # several certificates with same subject
-new_certs_dir = $dir/newcerts # default place for new certs.
-
-certificate = $dir/cacert.pem # The CA certificate
-serial = $dir/serial # The current serial number
-crlnumber = $dir/crlnumber # the current crl number
- # must be commented out to leave a V1 CRL
-crl = $dir/crl.pem # The current CRL
-private_key = $dir/private/cakey.pem# The private key
-RANDFILE = $dir/private/.rand # private random number file
-
-x509_extensions = usr_cert # The extentions to add to the cert
-
-name_opt = ca_default # Subject Name options
-cert_opt = ca_default # Certificate field options
-
-default_days = 365 # how long to certify for
-default_crl_days= 30 # how long before next CRL
-default_md = default # use public key default MD
-preserve = no # keep passed DN ordering
-
-policy = policy_match
-
-# For the CA policy
-[ policy_match ]
-countryName = match
-stateOrProvinceName = optional
-organizationName = match
-organizationalUnitName = optional
-commonName = supplied
-emailAddress = optional
-
-[ policy_anything ]
-countryName = optional
-stateOrProvinceName = optional
-localityName = optional
-organizationName = optional
-organizationalUnitName = optional
-commonName = supplied
-emailAddress = optional
-
-####################################################################
-[ req ]
-default_bits = 2048
-default_keyfile = privkey.pem
-distinguished_name = req_distinguished_name
-attributes = req_attributes
-x509_extensions = v3_ca # The extentions to add to the self signed cert
-
-input_password = @PASSWORD@
-output_password = @PASSWORD@
-
-string_mask = utf8only
-
-[ req_distinguished_name ]
-countryName = Country Name (2 letter code)
-countryName_default = US
-countryName_min = 2
-countryName_max = 2
-
-localityName = Locality Name (eg, city)
-localityName_default = Tuusula
-
-0.organizationName = Organization Name (eg, company)
-0.organizationName_default = WFA Hotspot 2.0
-
-##organizationalUnitName = Organizational Unit Name (eg, section)
-#organizationalUnitName_default =
-#@OU@
-
-commonName = Common Name (e.g. server FQDN or YOUR name)
-#@CN@
-commonName_max = 64
-
-emailAddress = Email Address
-emailAddress_max = 64
-
-[ req_attributes ]
-
-[ v3_req ]
-
-# Extensions to add to a certificate request
-basicConstraints = CA:FALSE
-keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-subjectAltName=DNS:example.com,DNS:another.example.com
-
-[ v3_ca ]
-
-# Hotspot 2.0 PKI requirements
-subjectKeyIdentifier=hash
-basicConstraints = critical,CA:true
-keyUsage = critical, cRLSign, keyCertSign
-
-[ crl_ext ]
-
-# issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always
-
-[ v3_OCSP ]
-
-basicConstraints = CA:FALSE
-keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-extendedKeyUsage = OCSPSigning
diff --git a/contrib/wpa/hs20/server/ca/openssl.cnf b/contrib/wpa/hs20/server/ca/openssl.cnf
index 61410138340f..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/ca/openssl.cnf
+++ b/contrib/wpa/hs20/server/ca/openssl.cnf
@@ -1,200 +0,0 @@
-# OpenSSL configuration file for Hotspot 2.0 PKI (Intermediate CA)
-
-HOME = .
-RANDFILE = $ENV::HOME/.rnd
-oid_section = new_oids
-
-[ new_oids ]
-
-#logotypeoid=1.3.6.1.5.5.7.1.12
-
-####################################################################
-[ ca ]
-default_ca = CA_default # The default ca section
-
-####################################################################
-[ CA_default ]
-
-dir = ./demoCA # Where everything is kept
-certs = $dir/certs # Where the issued certs are kept
-crl_dir = $dir/crl # Where the issued crl are kept
-database = $dir/index.txt # database index file.
-#unique_subject = no # Set to 'no' to allow creation of
- # several certificates with same subject
-new_certs_dir = $dir/newcerts # default place for new certs.
-
-certificate = $dir/cacert.pem # The CA certificate
-serial = $dir/serial # The current serial number
-crlnumber = $dir/crlnumber # the current crl number
- # must be commented out to leave a V1 CRL
-crl = $dir/crl.pem # The current CRL
-private_key = $dir/private/cakey.pem# The private key
-RANDFILE = $dir/private/.rand # private random number file
-
-x509_extensions = ext_client # The extentions to add to the cert
-
-name_opt = ca_default # Subject Name options
-cert_opt = ca_default # Certificate field options
-
-# Extension copying option: use with caution.
-copy_extensions = copy
-
-default_days = 365 # how long to certify for
-default_crl_days= 30 # how long before next CRL
-default_md = default # use public key default MD
-preserve = no # keep passed DN ordering
-
-policy = policy_match
-
-# For the CA policy
-[ policy_match ]
-countryName = supplied
-stateOrProvinceName = optional
-organizationName = supplied
-organizationalUnitName = optional
-commonName = supplied
-emailAddress = optional
-
-[ policy_osu_server ]
-countryName = match
-stateOrProvinceName = optional
-organizationName = match
-organizationalUnitName = supplied
-commonName = supplied
-emailAddress = optional
-
-[ policy_anything ]
-countryName = optional
-stateOrProvinceName = optional
-localityName = optional
-organizationName = optional
-organizationalUnitName = optional
-commonName = supplied
-emailAddress = optional
-
-####################################################################
-[ req ]
-default_bits = 2048
-default_keyfile = privkey.pem
-distinguished_name = req_distinguished_name
-attributes = req_attributes
-x509_extensions = v3_ca # The extentions to add to the self signed cert
-
-input_password = @PASSWORD@
-output_password = @PASSWORD@
-
-string_mask = utf8only
-
-[ req_distinguished_name ]
-countryName = Country Name (2 letter code)
-countryName_default = FI
-countryName_min = 2
-countryName_max = 2
-
-localityName = Locality Name (eg, city)
-localityName_default = Tuusula
-
-0.organizationName = Organization Name (eg, company)
-0.organizationName_default = @DOMAIN@
-
-##organizationalUnitName = Organizational Unit Name (eg, section)
-#organizationalUnitName_default =
-#@OU@
-
-commonName = Common Name (e.g. server FQDN or YOUR name)
-#@CN@
-commonName_max = 64
-
-emailAddress = Email Address
-emailAddress_max = 64
-
-[ req_attributes ]
-
-[ v3_ca ]
-
-# Hotspot 2.0 PKI requirements
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid:always,issuer
-basicConstraints = critical, CA:true, pathlen:0
-keyUsage = critical, cRLSign, keyCertSign
-authorityInfoAccess = OCSP;URI:@OCSP_URI@
-# For SP intermediate CA
-#subjectAltName=critical,otherName:1.3.6.1.4.1.40808.1.1.1;UTF8String:engExample OSU
-#nameConstraints=permitted;DNS:.@DOMAIN@
-#1.3.6.1.5.5.7.1.12=ASN1:SEQUENCE:LogotypeExtn
-
-[ v3_osu_server ]
-
-basicConstraints = critical, CA:true, pathlen:0
-keyUsage = critical, keyEncipherment
-#@ALTNAME@
-
-#logotypeoid=ASN1:SEQUENCE:LogotypeExtn
-1.3.6.1.5.5.7.1.12=ASN1:SEQUENCE:LogotypeExtn
-[LogotypeExtn]
-communityLogos=EXP:0,SEQUENCE:LogotypeInfo
-[LogotypeInfo]
-# note: implicit tag converted to explicit for CHOICE
-direct=EXP:0,SEQUENCE:LogotypeData
-[LogotypeData]
-image=SEQUENCE:LogotypeImage
-[LogotypeImage]
-imageDetails=SEQUENCE:LogotypeDetails
-imageInfo=SEQUENCE:LogotypeImageInfo
-[LogotypeDetails]
-mediaType=IA5STRING:image/png
-logotypeHash=SEQUENCE:HashAlgAndValues
-logotypeURI=SEQUENCE:URI
-[HashAlgAndValues]
-value1=SEQUENCE:HashAlgAndValueSHA256
-#value2=SEQUENCE:HashAlgAndValueSHA1
-[HashAlgAndValueSHA256]
-hashAlg=SEQUENCE:sha256_alg
-hashValue=FORMAT:HEX,OCTETSTRING:@LOGO_HASH256@
-[HashAlgAndValueSHA1]
-hashAlg=SEQUENCE:sha1_alg
-hashValue=FORMAT:HEX,OCTETSTRING:@LOGO_HASH1@
-[sha256_alg]
-algorithm=OID:sha256
-[sha1_alg]
-algorithm=OID:sha1
-[URI]
-uri=IA5STRING:@LOGO_URI@
-[LogotypeImageInfo]
-# default value color(1), component optional
-#type=IMP:0,INTEGER:1
-fileSize=INTEGER:7549
-xSize=INTEGER:128
-ySize=INTEGER:80
-language=IMP:4,IA5STRING:zxx
-
-[ crl_ext ]
-
-# issuerAltName=issuer:copy
-authorityKeyIdentifier=keyid:always
-
-[ v3_OCSP ]
-
-basicConstraints = CA:FALSE
-keyUsage = nonRepudiation, digitalSignature, keyEncipherment
-extendedKeyUsage = OCSPSigning
-
-[ ext_client ]
-
-basicConstraints=CA:FALSE
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer
-authorityInfoAccess = OCSP;URI:@OCSP_URI@
-#@ALTNAME@
-extendedKeyUsage = clientAuth
-
-[ ext_server ]
-
-# Hotspot 2.0 PKI requirements
-basicConstraints=critical, CA:FALSE
-subjectKeyIdentifier=hash
-authorityKeyIdentifier=keyid,issuer
-authorityInfoAccess = OCSP;URI:@OCSP_URI@
-#@ALTNAME@
-extendedKeyUsage = critical, serverAuth
-keyUsage = critical, keyEncipherment
diff --git a/contrib/wpa/hs20/server/ca/setup.sh b/contrib/wpa/hs20/server/ca/setup.sh
index 78abcccff455..e69de29bb2d1 100755
--- a/contrib/wpa/hs20/server/ca/setup.sh
+++ b/contrib/wpa/hs20/server/ca/setup.sh
@@ -1,209 +0,0 @@
-#!/bin/sh
-
-if [ -z "$OPENSSL" ]; then
- OPENSSL=openssl
-fi
-export OPENSSL_CONF=$PWD/openssl.cnf
-PASS=whatever
-if [ -z "$DOMAIN" ]; then
- DOMAIN=w1.fi
-fi
-COMPANY=w1.fi
-OPER_ENG="engw1.fi TESTING USE"
-OPER_FI="finw1.fi TESTIKÄYTTÖ"
-CNR="Hotspot 2.0 Trust Root CA - 99"
-CNO="ocsp.$DOMAIN"
-CNV="osu-revoked.$DOMAIN"
-CNOC="osu-client.$DOMAIN"
-OSU_SERVER_HOSTNAME="osu.$DOMAIN"
-DEBUG=0
-OCSP_URI="http://$CNO:8888/"
-LOGO_URI="http://osu.w1.fi/w1fi_logo.png"
-LOGO_HASH256="4532f7ec36424381617c03c6ce87b55a51d6e7177ffafda243cebf280a68954d"
-LOGO_HASH1="5e1d5085676eede6b02da14d31c523ec20ffba0b"
-
-# Command line overrides
-USAGE=$( cat < my-openssl-root.cnf
-
-cat openssl.cnf | sed "s/@PASSWORD@/$PASS/" |
-sed "s,@OCSP_URI@,$OCSP_URI," |
-sed "s,@LOGO_URI@,$LOGO_URI," |
-sed "s,@LOGO_HASH1@,$LOGO_HASH1," |
-sed "s,@LOGO_HASH256@,$LOGO_HASH256," |
-sed "s/@DOMAIN@/$DOMAIN/" \
- > my-openssl.cnf
-
-
-cat my-openssl-root.cnf | sed "s/#@CN@/commonName_default = $CNR/" > openssl.cnf.tmp
-mkdir -p rootCA/certs rootCA/crl rootCA/newcerts rootCA/private
-touch rootCA/index.txt
-if [ -e rootCA/private/cakey.pem ]; then
- echo " * Use existing Root CA"
-else
- echo " * Generate Root CA private key"
- $OPENSSL req -config openssl.cnf.tmp -batch -new -newkey rsa:4096 -keyout rootCA/private/cakey.pem -out rootCA/careq.pem || fail "Failed to generate Root CA private key"
- echo " * Sign Root CA certificate"
- $OPENSSL ca -config openssl.cnf.tmp -md sha256 -create_serial -out rootCA/cacert.pem -days 10957 -batch -keyfile rootCA/private/cakey.pem -passin pass:$PASS -selfsign -extensions v3_ca -outdir rootCA/newcerts -infiles rootCA/careq.pem || fail "Failed to sign Root CA certificate"
- $OPENSSL x509 -in rootCA/cacert.pem -out rootCA/cacert.der -outform DER || fail "Failed to create rootCA DER"
- sha256sum rootCA/cacert.der > rootCA/cacert.fingerprint || fail "Failed to create rootCA fingerprint"
-fi
-if [ ! -e rootCA/crlnumber ]; then
- echo 00 > rootCA/crlnumber
-fi
-
-echo
-echo "---[ Intermediate CA ]--------------------------------------------------"
-echo
-
-cat my-openssl.cnf | sed "s/#@CN@/commonName_default = $COMPANY Hotspot 2.0 Intermediate CA/" > openssl.cnf.tmp
-mkdir -p demoCA/certs demoCA/crl demoCA/newcerts demoCA/private
-touch demoCA/index.txt
-if [ -e demoCA/private/cakey.pem ]; then
- echo " * Use existing Intermediate CA"
-else
- echo " * Generate Intermediate CA private key"
- $OPENSSL req -config openssl.cnf.tmp -batch -new -newkey rsa:2048 -keyout demoCA/private/cakey.pem -out demoCA/careq.pem || fail "Failed to generate Intermediate CA private key"
- echo " * Sign Intermediate CA certificate"
- $OPENSSL ca -config openssl.cnf.tmp -md sha256 -create_serial -out demoCA/cacert.pem -days 3652 -batch -keyfile rootCA/private/cakey.pem -cert rootCA/cacert.pem -passin pass:$PASS -extensions v3_ca -infiles demoCA/careq.pem || fail "Failed to sign Intermediate CA certificate"
- # horrible from security view point, but for testing purposes since OCSP responder does not seem to support -passin
- openssl rsa -in demoCA/private/cakey.pem -out demoCA/private/cakey-plain.pem -passin pass:$PASS
- $OPENSSL x509 -in demoCA/cacert.pem -out demoCA/cacert.der -outform DER || fail "Failed to create demoCA DER."
- sha256sum demoCA/cacert.der > demoCA/cacert.fingerprint || fail "Failed to create demoCA fingerprint"
-fi
-if [ ! -e demoCA/crlnumber ]; then
- echo 00 > demoCA/crlnumber
-fi
-
-echo
-echo "OCSP responder"
-echo
-
-cat my-openssl.cnf | sed "s/#@CN@/commonName_default = $CNO/" > openssl.cnf.tmp
-$OPENSSL req -config $PWD/openssl.cnf.tmp -batch -new -newkey rsa:2048 -nodes -out ocsp.csr -keyout ocsp.key -extensions v3_OCSP
-$OPENSSL ca -config $PWD/openssl.cnf.tmp -batch -md sha256 -keyfile demoCA/private/cakey.pem -passin pass:$PASS -in ocsp.csr -out ocsp.pem -days 730 -extensions v3_OCSP || fail "Could not generate ocsp.pem"
-
-echo
-echo "---[ Server - to be revoked ] ------------------------------------------"
-echo
-
-cat my-openssl.cnf | sed "s/#@CN@/commonName_default = $CNV/" > openssl.cnf.tmp
-$OPENSSL req -config $PWD/openssl.cnf.tmp -batch -new -newkey rsa:2048 -nodes -out server-revoked.csr -keyout server-revoked.key
-$OPENSSL ca -config $PWD/openssl.cnf.tmp -batch -md sha256 -in server-revoked.csr -out server-revoked.pem -key $PASS -days 730 -extensions ext_server
-$OPENSSL ca -revoke server-revoked.pem -key $PASS
-
-echo
-echo "---[ Server - with client ext key use ] ---------------------------------"
-echo "---[ Only used for negative-testing for OSU-client implementation ] -----"
-echo
-
-cat my-openssl.cnf | sed "s/#@CN@/commonName_default = $CNOC/" > openssl.cnf.tmp
-$OPENSSL req -config $PWD/openssl.cnf.tmp -batch -new -newkey rsa:2048 -nodes -out server-client.csr -keyout server-client.key || fail "Could not create server-client.key"
-$OPENSSL ca -config $PWD/openssl.cnf.tmp -batch -md sha256 -in server-client.csr -out server-client.pem -key $PASS -days 730 -extensions ext_client || fail "Could not create server-client.pem"
-
-echo
-echo "---[ User ]-------------------------------------------------------------"
-echo
-
-cat my-openssl.cnf | sed "s/#@CN@/commonName_default = User/" > openssl.cnf.tmp
-$OPENSSL req -config $PWD/openssl.cnf.tmp -batch -new -newkey rsa:2048 -nodes -out user.csr -keyout user.key || fail "Could not create user.key"
-$OPENSSL ca -config $PWD/openssl.cnf.tmp -batch -md sha256 -in user.csr -out user.pem -key $PASS -days 730 -extensions ext_client || fail "Could not create user.pem"
-
-echo
-echo "---[ Server ]-----------------------------------------------------------"
-echo
-
-ALT="DNS:$OSU_SERVER_HOSTNAME"
-ALT="$ALT,otherName:1.3.6.1.4.1.40808.1.1.1;UTF8String:$OPER_ENG"
-ALT="$ALT,otherName:1.3.6.1.4.1.40808.1.1.1;UTF8String:$OPER_FI"
-
-cat my-openssl.cnf |
- sed "s/#@CN@/commonName_default = $OSU_SERVER_HOSTNAME/" |
- sed "s/^##organizationalUnitName/organizationalUnitName/" |
- sed "s/#@OU@/organizationalUnitName_default = Hotspot 2.0 Online Sign Up Server/" |
- sed "s/#@ALTNAME@/subjectAltName=critical,$ALT/" \
- > openssl.cnf.tmp
-echo $OPENSSL req -config $PWD/openssl.cnf.tmp -batch -sha256 -new -newkey rsa:2048 -nodes -out server.csr -keyout server.key -reqexts v3_osu_server
-$OPENSSL req -config $PWD/openssl.cnf.tmp -batch -sha256 -new -newkey rsa:2048 -nodes -out server.csr -keyout server.key -reqexts v3_osu_server || fail "Failed to generate server request"
-$OPENSSL ca -config $PWD/openssl.cnf.tmp -batch -md sha256 -in server.csr -out server.pem -key $PASS -days 730 -extensions ext_server -policy policy_osu_server || fail "Failed to sign server certificate"
-
-#dump logotype details for debugging
-$OPENSSL x509 -in server.pem -out server.der -outform DER
-openssl asn1parse -in server.der -inform DER | grep HEX | tail -1 | sed 's/.*://' | xxd -r -p > logo.der
-openssl asn1parse -in logo.der -inform DER > logo.asn1
-
-
-echo
-echo "---[ CRL ]---------------------------------------------------------------"
-echo
-
-$OPENSSL ca -config $PWD/my-openssl.cnf -gencrl -md sha256 -out demoCA/crl/crl.pem -passin pass:$PASS
-
-echo
-echo "---[ Verify ]------------------------------------------------------------"
-echo
-
-$OPENSSL verify -CAfile rootCA/cacert.pem demoCA/cacert.pem
-$OPENSSL verify -CAfile rootCA/cacert.pem -untrusted demoCA/cacert.pem *.pem
-
-cat rootCA/cacert.pem demoCA/cacert.pem > ca.pem
diff --git a/contrib/wpa/hs20/server/hs20-osu-server.txt b/contrib/wpa/hs20/server/hs20-osu-server.txt
index 22478ad9d2cb..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/hs20-osu-server.txt
+++ b/contrib/wpa/hs20/server/hs20-osu-server.txt
@@ -1,262 +0,0 @@
-Hotspot 2.0 OSU server
-======================
-
-The information in this document is based on the assumption that Ubuntu
-16.04 server (64-bit) distribution is used and the web server is
-Apache2. Neither of these are requirements for the installation, but if
-other combinations are used, the package names and configuration
-parameters may need to be adjusted.
-
-NOTE: This implementation and the example configuration here is meant
-only for testing purposes in a lab environment. This design is not
-secure to be installed in a publicly available Internet server without
-considerable amount of modification and review for security issues.
-
-
-Build dependencies
-------------------
-
-Ubuntu 16.04 server
-- default installation
-- upgraded to latest package versions
- sudo apt-get update
- sudo apt-get upgrade
-
-Packages needed for running the service:
- sudo apt-get install sqlite3
- sudo apt-get install apache2
- sudo apt-get install php-sqlite3 php-xml libapache2-mod-php
-
-Additional packages needed for building the components:
- sudo apt-get install build-essential
- sudo apt-get install libsqlite3-dev
- sudo apt-get install libssl-dev
- sudo apt-get install libxml2-dev
-
-
-Installation location
----------------------
-
-Select a location for the installation root directory. The example here
-assumes /home/user/hs20-server to be used, but this can be changed by
-editing couple of files as indicated below.
-
-sudo mkdir -p /home/user/hs20-server
-sudo chown $USER /home/user/hs20-server
-mkdir -p /home/user/hs20-server/spp
-mkdir -p /home/user/hs20-server/AS
-
-
-Build
------
-
-# hostapd as RADIUS server
-cd hostapd
-
-#example build configuration
-cat > .config < /home/user/hs20-server/terms-and-conditions <Terms and conditions..
-EOF
-
-# Build local keys and certs
-cd ca
-# Display help options.
-./setup.sh -h
-
-# Remove old keys, fill in appropriate values, and generate your keys.
-# For instance:
-./clean.sh
-rm -fr rootCA"
-old_hostname=myserver.local
-./setup.sh -C "Hotspot 2.0 Trust Root CA - CT" \
- -o $old_hostname-osu-client \
- -O $old_hostname-oscp -p lanforge -S $old_hostname \
- -V $old_hostname-osu-revoked \
- -m local -u http://$old_hostname:8888/
-
-# Configure subscription policies
-mkdir -p /home/user/hs20-server/spp/policy
-cat > /home/user/hs20-server/spp/policy/default.xml <
-
- 30
- ClientInitiated
- Unrestricted
- https://policy-server.osu.example.com/hs20/spp.php
-
-
-EOF
-
-
-# Install Hotspot 2.0 SPP and OMA DM XML schema/DTD files
-
-# XML schema for SPP
-# Copy the latest XML schema into /home/user/hs20-server/spp/spp.xsd
-
-# OMA DM Device Description Framework DTD
-# Copy into /home/user/hs20-server/spp/dm_ddf-v1_2.dtd
-# http://www.openmobilealliance.org/tech/DTD/dm_ddf-v1_2.dtd
-
-
-# Configure RADIUS authentication service
-# Note: Change the URL to match the setup
-# Note: Install AAA server key/certificate and root CA in Key directory
-
-cat > /home/user/hs20-server/AS/as-sql.conf < /home/user/hs20-server/AS/as.radius_clients <
- Options Indexes MultiViews FollowSymLinks
- AllowOverride None
- Require all granted
- SSLOptions +StdEnvVars
-
-
-Update SSL configuration to use the OSU server certificate/key.
-They keys and certs are called 'server.key' and 'server.pem' from
-ca/setup.sh.
-
-To support subscription remediation using client certificates, set
-"SSLVerifyClient optional" and configure the trust root CA(s) for the
-client certificates with SSLCACertificateFile.
-
-Enable default-ssl site and restart Apache2:
- sudo a2ensite default-ssl
- sudo a2enmod ssl
- sudo service apache2 restart
-
-
-Management UI
--------------
-
-The sample PHP scripts include a management UI for testing
-purposes. That is available at https:///hs20/users.php
-
-
-AP configuration
-----------------
-
-APs can now be configured to use the OSU server as the RADIUS
-authentication server. In addition, the OSU Provider List ANQP element
-should be configured to use the SPP (SOAP+XML) option and with the
-following Server URL:
-https:///hs20/spp.php/signup?realm=example.com
diff --git a/contrib/wpa/hs20/server/hs20_spp_server.c b/contrib/wpa/hs20/server/hs20_spp_server.c
index 347c40a73d6a..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/hs20_spp_server.c
+++ b/contrib/wpa/hs20/server/hs20_spp_server.c
@@ -1,207 +0,0 @@
-/*
- * Hotspot 2.0 SPP server - standalone version
- * Copyright (c) 2012-2013, Qualcomm Atheros, Inc.
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include "includes.h"
-#include
-#include
-
-#include "common.h"
-#include "common/version.h"
-#include "xml-utils.h"
-#include "spp_server.h"
-
-
-static void write_timestamp(FILE *f)
-{
- time_t t;
- struct tm *tm;
-
- time(&t);
- tm = localtime(&t);
-
- fprintf(f, "%04u-%02u-%02u %02u:%02u:%02u ",
- tm->tm_year + 1900, tm->tm_mon + 1, tm->tm_mday,
- tm->tm_hour, tm->tm_min, tm->tm_sec);
-}
-
-
-void debug_print(struct hs20_svc *ctx, int print, const char *fmt, ...)
-{
- va_list ap;
-
- if (ctx->debug_log == NULL)
- return;
-
- write_timestamp(ctx->debug_log);
- va_start(ap, fmt);
- vfprintf(ctx->debug_log, fmt, ap);
- va_end(ap);
-
- fprintf(ctx->debug_log, "\n");
-}
-
-
-void debug_dump_node(struct hs20_svc *ctx, const char *title, xml_node_t *node)
-{
- char *str;
-
- if (ctx->debug_log == NULL)
- return;
- str = xml_node_to_str(ctx->xml, node);
- if (str == NULL)
- return;
-
- write_timestamp(ctx->debug_log);
- fprintf(ctx->debug_log, "%s: '%s'\n", title, str);
- os_free(str);
-}
-
-
-static int process(struct hs20_svc *ctx)
-{
- int dmacc = 0;
- xml_node_t *soap, *spp, *resp;
- char *user, *realm, *post, *str;
-
- ctx->addr = getenv("HS20ADDR");
- if (ctx->addr)
- debug_print(ctx, 1, "Connection from %s", ctx->addr);
- ctx->test = getenv("HS20TEST");
- if (ctx->test)
- debug_print(ctx, 1, "Requested test functionality: %s",
- ctx->test);
-
- user = getenv("HS20USER");
- if (user && strlen(user) == 0)
- user = NULL;
- realm = getenv("HS20REALM");
- if (realm == NULL) {
- debug_print(ctx, 1, "HS20REALM not set");
- return -1;
- }
- post = getenv("HS20POST");
- if (post == NULL) {
- debug_print(ctx, 1, "HS20POST not set");
- return -1;
- }
-
- ctx->imsi = getenv("HS20IMSI");
- if (ctx->imsi)
- debug_print(ctx, 1, "IMSI %s", ctx->imsi);
-
- ctx->eap_method = getenv("HS20EAPMETHOD");
- if (ctx->eap_method)
- debug_print(ctx, 1, "EAP method %s", ctx->eap_method);
-
- ctx->id_hash = getenv("HS20IDHASH");
- if (ctx->id_hash)
- debug_print(ctx, 1, "ID-HASH %s", ctx->id_hash);
-
- soap = xml_node_from_buf(ctx->xml, post);
- if (soap == NULL) {
- debug_print(ctx, 1, "Could not parse SOAP data");
- return -1;
- }
- debug_dump_node(ctx, "Received SOAP message", soap);
- spp = soap_get_body(ctx->xml, soap);
- if (spp == NULL) {
- debug_print(ctx, 1, "Could not get SPP message");
- xml_node_free(ctx->xml, soap);
- return -1;
- }
- debug_dump_node(ctx, "Received SPP message", spp);
-
- resp = hs20_spp_server_process(ctx, spp, user, realm, dmacc);
- xml_node_free(ctx->xml, soap);
- if (resp == NULL && user == NULL) {
- debug_print(ctx, 1, "Request HTTP authentication");
- return 2; /* Request authentication */
- }
- if (resp == NULL) {
- debug_print(ctx, 1, "No response");
- return -1;
- }
-
- soap = soap_build_envelope(ctx->xml, resp);
- if (soap == NULL) {
- debug_print(ctx, 1, "SOAP envelope building failed");
- return -1;
- }
- str = xml_node_to_str(ctx->xml, soap);
- xml_node_free(ctx->xml, soap);
- if (str == NULL) {
- debug_print(ctx, 1, "Could not get node string");
- return -1;
- }
- printf("%s", str);
- free(str);
-
- return 0;
-}
-
-
-static void usage(void)
-{
- printf("usage:\n"
- "hs20_spp_server -r [-f]\n");
-}
-
-
-int main(int argc, char *argv[])
-{
- struct hs20_svc ctx;
- int ret;
-
- os_memset(&ctx, 0, sizeof(ctx));
- for (;;) {
- int c = getopt(argc, argv, "f:r:v");
- if (c < 0)
- break;
- switch (c) {
- case 'f':
- if (ctx.debug_log)
- break;
- ctx.debug_log = fopen(optarg, "a");
- if (ctx.debug_log == NULL) {
- printf("Could not write to %s\n", optarg);
- return -1;
- }
- break;
- case 'r':
- ctx.root_dir = optarg;
- break;
- case 'v':
- printf("hs20_spp_server v%s\n", VERSION_STR);
- return 0;
- default:
- usage();
- return -1;
- }
- }
- if (ctx.root_dir == NULL) {
- usage();
- return -1;
- }
- ctx.xml = xml_node_init_ctx(&ctx, NULL);
- if (ctx.xml == NULL)
- return -1;
- if (hs20_spp_server_init(&ctx) < 0) {
- xml_node_deinit_ctx(ctx.xml);
- return -1;
- }
-
- ret = process(&ctx);
- debug_print(&ctx, 1, "process() --> %d", ret);
-
- xml_node_deinit_ctx(ctx.xml);
- hs20_spp_server_deinit(&ctx);
- if (ctx.debug_log)
- fclose(ctx.debug_log);
-
- return ret;
-}
diff --git a/contrib/wpa/hs20/server/spp_server.c b/contrib/wpa/hs20/server/spp_server.c
index a50e9074f7b4..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/spp_server.c
+++ b/contrib/wpa/hs20/server/spp_server.c
@@ -1,2933 +0,0 @@
-/*
- * Hotspot 2.0 SPP server
- * Copyright (c) 2012-2013, Qualcomm Atheros, Inc.
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "common.h"
-#include "base64.h"
-#include "md5_i.h"
-#include "xml-utils.h"
-#include "spp_server.h"
-
-
-#define SPP_NS_URI "http://www.wi-fi.org/specifications/hotspot2dot0/v1.0/spp"
-
-#define URN_OMA_DM_DEVINFO "urn:oma:mo:oma-dm-devinfo:1.0"
-#define URN_OMA_DM_DEVDETAIL "urn:oma:mo:oma-dm-devdetail:1.0"
-#define URN_OMA_DM_DMACC "urn:oma:mo:oma-dm-dmacc:1.0"
-#define URN_HS20_PPS "urn:wfa:mo:hotspot2dot0-perprovidersubscription:1.0"
-
-
-/* TODO: timeout to expire sessions */
-
-enum hs20_session_operation {
- NO_OPERATION,
- UPDATE_PASSWORD,
- CONTINUE_SUBSCRIPTION_REMEDIATION,
- CONTINUE_POLICY_UPDATE,
- USER_REMEDIATION,
- SUBSCRIPTION_REGISTRATION,
- POLICY_REMEDIATION,
- POLICY_UPDATE,
- FREE_REMEDIATION,
- CLEAR_REMEDIATION,
- CERT_REENROLL,
-};
-
-
-static char * db_get_session_val(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *session_id,
- const char *field);
-static char * db_get_osu_config_val(struct hs20_svc *ctx, const char *realm,
- const char *field);
-static xml_node_t * build_policy(struct hs20_svc *ctx, const char *user,
- const char *realm, int use_dmacc);
-static xml_node_t * spp_exec_get_certificate(struct hs20_svc *ctx,
- const char *session_id,
- const char *user,
- const char *realm,
- int add_est_user);
-
-
-static int db_add_session(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *sessionid, const char *pw,
- const char *redirect_uri,
- enum hs20_session_operation operation,
- const u8 *mac_addr)
-{
- char *sql;
- int ret = 0;
- char addr[20];
-
- if (mac_addr)
- snprintf(addr, sizeof(addr), MACSTR, MAC2STR(mac_addr));
- else
- addr[0] = '\0';
- sql = sqlite3_mprintf("INSERT INTO sessions(timestamp,id,user,realm,"
- "operation,password,redirect_uri,mac_addr,test) "
- "VALUES "
- "(strftime('%%Y-%%m-%%d %%H:%%M:%%f','now'),"
- "%Q,%Q,%Q,%d,%Q,%Q,%Q,%Q)",
- sessionid, user ? user : "", realm ? realm : "",
- operation, pw ? pw : "",
- redirect_uri ? redirect_uri : "",
- addr, ctx->test);
- if (sql == NULL)
- return -1;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to add session entry into sqlite "
- "database: %s", sqlite3_errmsg(ctx->db));
- ret = -1;
- }
- sqlite3_free(sql);
- return ret;
-}
-
-
-static void db_update_session_password(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *sessionid,
- const char *pw)
-{
- char *sql;
-
- sql = sqlite3_mprintf("UPDATE sessions SET password=%Q WHERE id=%Q AND "
- "user=%Q AND realm=%Q",
- pw, sessionid, user, realm);
- if (sql == NULL)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to update session password: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void db_update_session_machine_managed(struct hs20_svc *ctx,
- const char *user,
- const char *realm,
- const char *sessionid,
- const int pw_mm)
-{
- char *sql;
-
- sql = sqlite3_mprintf("UPDATE sessions SET machine_managed=%Q WHERE id=%Q AND user=%Q AND realm=%Q",
- pw_mm ? "1" : "0", sessionid, user, realm);
- if (sql == NULL)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1,
- "Failed to update session machine_managed: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void db_add_session_pps(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *sessionid,
- xml_node_t *node)
-{
- char *str;
- char *sql;
-
- str = xml_node_to_str(ctx->xml, node);
- if (str == NULL)
- return;
- sql = sqlite3_mprintf("UPDATE sessions SET pps=%Q WHERE id=%Q AND "
- "user=%Q AND realm=%Q",
- str, sessionid, user, realm);
- free(str);
- if (sql == NULL)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to add session pps: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void db_add_session_devinfo(struct hs20_svc *ctx, const char *sessionid,
- xml_node_t *node)
-{
- char *str;
- char *sql;
-
- str = xml_node_to_str(ctx->xml, node);
- if (str == NULL)
- return;
- sql = sqlite3_mprintf("UPDATE sessions SET devinfo=%Q WHERE id=%Q",
- str, sessionid);
- free(str);
- if (sql == NULL)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to add session devinfo: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void db_add_session_devdetail(struct hs20_svc *ctx,
- const char *sessionid,
- xml_node_t *node)
-{
- char *str;
- char *sql;
-
- str = xml_node_to_str(ctx->xml, node);
- if (str == NULL)
- return;
- sql = sqlite3_mprintf("UPDATE sessions SET devdetail=%Q WHERE id=%Q",
- str, sessionid);
- free(str);
- if (sql == NULL)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to add session devdetail: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void db_add_session_dmacc(struct hs20_svc *ctx, const char *sessionid,
- const char *username, const char *password)
-{
- char *sql;
-
- sql = sqlite3_mprintf("UPDATE sessions SET osu_user=%Q, osu_password=%Q WHERE id=%Q",
- username, password, sessionid);
- if (!sql)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to add session DMAcc: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void db_add_session_eap_method(struct hs20_svc *ctx,
- const char *sessionid,
- const char *method)
-{
- char *sql;
-
- sql = sqlite3_mprintf("UPDATE sessions SET eap_method=%Q WHERE id=%Q",
- method, sessionid);
- if (!sql)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to add session EAP method: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void db_add_session_id_hash(struct hs20_svc *ctx, const char *sessionid,
- const char *id_hash)
-{
- char *sql;
-
- sql = sqlite3_mprintf("UPDATE sessions SET mobile_identifier_hash=%Q WHERE id=%Q",
- id_hash, sessionid);
- if (!sql)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to add session ID hash: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void db_remove_session(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *sessionid)
-{
- char *sql;
-
- if (user == NULL || realm == NULL) {
- sql = sqlite3_mprintf("DELETE FROM sessions WHERE "
- "id=%Q", sessionid);
- } else {
- sql = sqlite3_mprintf("DELETE FROM sessions WHERE "
- "user=%Q AND realm=%Q AND id=%Q",
- user, realm, sessionid);
- }
- if (sql == NULL)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to delete session entry from "
- "sqlite database: %s", sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void hs20_eventlog(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *sessionid, const char *notes,
- const char *dump)
-{
- char *sql;
- char *user_buf = NULL, *realm_buf = NULL;
-
- debug_print(ctx, 1, "eventlog: %s", notes);
-
- if (user == NULL) {
- user_buf = db_get_session_val(ctx, NULL, NULL, sessionid,
- "user");
- user = user_buf;
- realm_buf = db_get_session_val(ctx, NULL, NULL, sessionid,
- "realm");
- realm = realm_buf;
- }
-
- sql = sqlite3_mprintf("INSERT INTO eventlog"
- "(user,realm,sessionid,timestamp,notes,dump,addr)"
- " VALUES (%Q,%Q,%Q,"
- "strftime('%%Y-%%m-%%d %%H:%%M:%%f','now'),"
- "%Q,%Q,%Q)",
- user, realm, sessionid, notes,
- dump ? dump : "", ctx->addr ? ctx->addr : "");
- free(user_buf);
- free(realm_buf);
- if (sql == NULL)
- return;
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to add eventlog entry into sqlite "
- "database: %s", sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void hs20_eventlog_node(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *sessionid, const char *notes,
- xml_node_t *node)
-{
- char *str;
-
- if (node)
- str = xml_node_to_str(ctx->xml, node);
- else
- str = NULL;
- hs20_eventlog(ctx, user, realm, sessionid, notes, str);
- free(str);
-}
-
-
-static void db_update_mo_str(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *name,
- const char *str)
-{
- char *sql;
- if (user == NULL || realm == NULL || name == NULL)
- return;
- sql = sqlite3_mprintf("UPDATE users SET %s=%Q WHERE identity=%Q AND realm=%Q AND (phase2=1 OR methods='TLS')",
- name, str, user, realm);
- if (sql == NULL)
- return;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to update user MO entry in sqlite "
- "database: %s", sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
-}
-
-
-static void db_update_mo(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *name, xml_node_t *mo)
-{
- char *str;
-
- str = xml_node_to_str(ctx->xml, mo);
- if (str == NULL)
- return;
-
- db_update_mo_str(ctx, user, realm, name, str);
- free(str);
-}
-
-
-static void add_text_node(struct hs20_svc *ctx, xml_node_t *parent,
- const char *name, const char *value)
-{
- xml_node_create_text(ctx->xml, parent, NULL, name, value ? value : "");
-}
-
-
-static void add_text_node_conf(struct hs20_svc *ctx, const char *realm,
- xml_node_t *parent, const char *name,
- const char *field)
-{
- char *val;
- val = db_get_osu_config_val(ctx, realm, field);
- xml_node_create_text(ctx->xml, parent, NULL, name, val ? val : "");
- os_free(val);
-}
-
-
-static void add_text_node_conf_corrupt(struct hs20_svc *ctx, const char *realm,
- xml_node_t *parent, const char *name,
- const char *field)
-{
- char *val;
-
- val = db_get_osu_config_val(ctx, realm, field);
- if (val) {
- size_t len;
-
- len = os_strlen(val);
- if (len > 0) {
- if (val[len - 1] == '0')
- val[len - 1] = '1';
- else
- val[len - 1] = '0';
- }
- }
- xml_node_create_text(ctx->xml, parent, NULL, name, val ? val : "");
- os_free(val);
-}
-
-
-static int new_password(char *buf, int buflen)
-{
- int i;
-
- if (buflen < 1)
- return -1;
- buf[buflen - 1] = '\0';
- if (os_get_random((unsigned char *) buf, buflen - 1) < 0)
- return -1;
-
- for (i = 0; i < buflen - 1; i++) {
- unsigned char val = buf[i];
- val %= 2 * 26 + 10;
- if (val < 26)
- buf[i] = 'a' + val;
- else if (val < 2 * 26)
- buf[i] = 'A' + val - 26;
- else
- buf[i] = '0' + val - 2 * 26;
- }
-
- return 0;
-}
-
-
-struct get_db_field_data {
- const char *field;
- char *value;
-};
-
-
-static int get_db_field(void *ctx, int argc, char *argv[], char *col[])
-{
- struct get_db_field_data *data = ctx;
- int i;
-
- for (i = 0; i < argc; i++) {
- if (os_strcmp(col[i], data->field) == 0 && argv[i]) {
- os_free(data->value);
- data->value = os_strdup(argv[i]);
- break;
- }
- }
-
- return 0;
-}
-
-
-static char * db_get_val(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *field, int dmacc)
-{
- char *cmd;
- struct get_db_field_data data;
-
- cmd = sqlite3_mprintf("SELECT %s FROM users WHERE %s=%Q AND realm=%Q AND (phase2=1 OR methods='TLS')",
- field, dmacc ? "osu_user" : "identity",
- user, realm);
- if (cmd == NULL)
- return NULL;
- memset(&data, 0, sizeof(data));
- data.field = field;
- if (sqlite3_exec(ctx->db, cmd, get_db_field, &data, NULL) != SQLITE_OK)
- {
- debug_print(ctx, 1, "Could not find user '%s'", user);
- sqlite3_free(cmd);
- return NULL;
- }
- sqlite3_free(cmd);
-
- debug_print(ctx, 1, "DB: user='%s' realm='%s' field='%s' dmacc=%d --> "
- "value='%s'", user, realm, field, dmacc, data.value);
-
- return data.value;
-}
-
-
-static int db_update_val(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *field,
- const char *val, int dmacc)
-{
- char *cmd;
- int ret;
-
- cmd = sqlite3_mprintf("UPDATE users SET %s=%Q WHERE %s=%Q AND realm=%Q AND (phase2=1 OR methods='TLS')",
- field, val, dmacc ? "osu_user" : "identity", user,
- realm);
- if (cmd == NULL)
- return -1;
- debug_print(ctx, 1, "DB: %s", cmd);
- if (sqlite3_exec(ctx->db, cmd, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1,
- "Failed to update user in sqlite database: %s",
- sqlite3_errmsg(ctx->db));
- ret = -1;
- } else {
- debug_print(ctx, 1,
- "DB: user='%s' realm='%s' field='%s' set to '%s'",
- user, realm, field, val);
- ret = 0;
- }
- sqlite3_free(cmd);
-
- return ret;
-}
-
-
-static char * db_get_session_val(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *session_id,
- const char *field)
-{
- char *cmd;
- struct get_db_field_data data;
-
- if (user == NULL || realm == NULL) {
- cmd = sqlite3_mprintf("SELECT %s FROM sessions WHERE "
- "id=%Q", field, session_id);
- } else {
- cmd = sqlite3_mprintf("SELECT %s FROM sessions WHERE "
- "user=%Q AND realm=%Q AND id=%Q",
- field, user, realm, session_id);
- }
- if (cmd == NULL)
- return NULL;
- debug_print(ctx, 1, "DB: %s", cmd);
- memset(&data, 0, sizeof(data));
- data.field = field;
- if (sqlite3_exec(ctx->db, cmd, get_db_field, &data, NULL) != SQLITE_OK)
- {
- debug_print(ctx, 1, "DB: Could not find session %s: %s",
- session_id, sqlite3_errmsg(ctx->db));
- sqlite3_free(cmd);
- return NULL;
- }
- sqlite3_free(cmd);
-
- debug_print(ctx, 1, "DB: return '%s'", data.value);
- return data.value;
-}
-
-
-static int update_password(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *pw, int dmacc)
-{
- char *cmd;
-
- cmd = sqlite3_mprintf("UPDATE users SET password=%Q, "
- "remediation='' "
- "WHERE %s=%Q AND phase2=1",
- pw, dmacc ? "osu_user" : "identity",
- user);
- if (cmd == NULL)
- return -1;
- debug_print(ctx, 1, "DB: %s", cmd);
- if (sqlite3_exec(ctx->db, cmd, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to update database for user '%s'",
- user);
- }
- sqlite3_free(cmd);
-
- return 0;
-}
-
-
-static int clear_remediation(struct hs20_svc *ctx, const char *user,
- const char *realm, int dmacc)
-{
- char *cmd;
-
- cmd = sqlite3_mprintf("UPDATE users SET remediation='' WHERE %s=%Q",
- dmacc ? "osu_user" : "identity",
- user);
- if (cmd == NULL)
- return -1;
- debug_print(ctx, 1, "DB: %s", cmd);
- if (sqlite3_exec(ctx->db, cmd, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to update database for user '%s'",
- user);
- }
- sqlite3_free(cmd);
-
- return 0;
-}
-
-
-static int add_eap_ttls(struct hs20_svc *ctx, xml_node_t *parent)
-{
- xml_node_t *node;
-
- node = xml_node_create(ctx->xml, parent, NULL, "EAPMethod");
- if (node == NULL)
- return -1;
-
- add_text_node(ctx, node, "EAPType", "21");
- add_text_node(ctx, node, "InnerMethod", "MS-CHAP-V2");
-
- return 0;
-}
-
-
-static xml_node_t * build_username_password(struct hs20_svc *ctx,
- xml_node_t *parent,
- const char *user, const char *pw)
-{
- xml_node_t *node;
- char *b64;
- size_t len;
-
- node = xml_node_create(ctx->xml, parent, NULL, "UsernamePassword");
- if (node == NULL)
- return NULL;
-
- add_text_node(ctx, node, "Username", user);
-
- b64 = base64_encode(pw, strlen(pw), NULL);
- if (b64 == NULL)
- return NULL;
- len = os_strlen(b64);
- if (len > 0 && b64[len - 1] == '\n')
- b64[len - 1] = '\0';
- add_text_node(ctx, node, "Password", b64);
- free(b64);
-
- return node;
-}
-
-
-static int add_username_password(struct hs20_svc *ctx, xml_node_t *cred,
- const char *user, const char *pw,
- int machine_managed)
-{
- xml_node_t *node;
-
- node = build_username_password(ctx, cred, user, pw);
- if (node == NULL)
- return -1;
-
- add_text_node(ctx, node, "MachineManaged",
- machine_managed ? "TRUE" : "FALSE");
- add_text_node(ctx, node, "SoftTokenApp", "");
- add_eap_ttls(ctx, node);
-
- return 0;
-}
-
-
-static void add_creation_date(struct hs20_svc *ctx, xml_node_t *cred)
-{
- char str[30];
- time_t now;
- struct tm tm;
-
- time(&now);
- gmtime_r(&now, &tm);
- snprintf(str, sizeof(str), "%04u-%02u-%02uT%02u:%02u:%02uZ",
- tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
- tm.tm_hour, tm.tm_min, tm.tm_sec);
- xml_node_create_text(ctx->xml, cred, NULL, "CreationDate", str);
-}
-
-
-static xml_node_t * build_credential_pw(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *pw, int machine_managed)
-{
- xml_node_t *cred;
-
- cred = xml_node_create_root(ctx->xml, NULL, NULL, NULL, "Credential");
- if (cred == NULL) {
- debug_print(ctx, 1, "Failed to create Credential node");
- return NULL;
- }
- add_creation_date(ctx, cred);
- if (add_username_password(ctx, cred, user, pw, machine_managed) < 0) {
- xml_node_free(ctx->xml, cred);
- return NULL;
- }
- add_text_node(ctx, cred, "Realm", realm);
-
- return cred;
-}
-
-
-static xml_node_t * build_credential(struct hs20_svc *ctx,
- const char *user, const char *realm,
- char *new_pw, size_t new_pw_len)
-{
- if (new_password(new_pw, new_pw_len) < 0)
- return NULL;
- debug_print(ctx, 1, "Update password to '%s'", new_pw);
- return build_credential_pw(ctx, user, realm, new_pw, 1);
-}
-
-
-static xml_node_t * build_credential_cert(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *cert_fingerprint)
-{
- xml_node_t *cred, *cert;
-
- cred = xml_node_create_root(ctx->xml, NULL, NULL, NULL, "Credential");
- if (cred == NULL) {
- debug_print(ctx, 1, "Failed to create Credential node");
- return NULL;
- }
- add_creation_date(ctx, cred);
- cert = xml_node_create(ctx->xml, cred, NULL, "DigitalCertificate");
- add_text_node(ctx, cert, "CertificateType", "x509v3");
- add_text_node(ctx, cert, "CertSHA256Fingerprint", cert_fingerprint);
- add_text_node(ctx, cred, "Realm", realm);
-
- return cred;
-}
-
-
-static xml_node_t * build_post_dev_data_response(struct hs20_svc *ctx,
- xml_namespace_t **ret_ns,
- const char *session_id,
- const char *status,
- const char *error_code)
-{
- xml_node_t *spp_node = NULL;
- xml_namespace_t *ns;
-
- spp_node = xml_node_create_root(ctx->xml, SPP_NS_URI, "spp", &ns,
- "sppPostDevDataResponse");
- if (spp_node == NULL)
- return NULL;
- if (ret_ns)
- *ret_ns = ns;
-
- xml_node_add_attr(ctx->xml, spp_node, ns, "sppVersion", "1.0");
- xml_node_add_attr(ctx->xml, spp_node, ns, "sessionID", session_id);
- xml_node_add_attr(ctx->xml, spp_node, ns, "sppStatus", status);
-
- if (error_code) {
- xml_node_t *node;
- node = xml_node_create(ctx->xml, spp_node, ns, "sppError");
- if (node)
- xml_node_add_attr(ctx->xml, node, NULL, "errorCode",
- error_code);
- }
-
- return spp_node;
-}
-
-
-static int add_update_node(struct hs20_svc *ctx, xml_node_t *spp_node,
- xml_namespace_t *ns, const char *uri,
- xml_node_t *upd_node)
-{
- xml_node_t *node, *tnds;
- char *str;
-
- tnds = mo_to_tnds(ctx->xml, upd_node, 0, NULL, NULL);
- if (!tnds)
- return -1;
-
- str = xml_node_to_str(ctx->xml, tnds);
- xml_node_free(ctx->xml, tnds);
- if (str == NULL)
- return -1;
- node = xml_node_create_text(ctx->xml, spp_node, ns, "updateNode", str);
- free(str);
-
- xml_node_add_attr(ctx->xml, node, ns, "managementTreeURI", uri);
-
- return 0;
-}
-
-
-static xml_node_t * read_subrem_file(struct hs20_svc *ctx,
- const char *subrem_id,
- char *uri, size_t uri_size)
-{
- char fname[200];
- char *buf, *buf2, *pos;
- size_t len;
- xml_node_t *node;
-
- os_snprintf(fname, sizeof(fname), "%s/spp/subrem/%s",
- ctx->root_dir, subrem_id);
- debug_print(ctx, 1, "Use subrem file %s", fname);
-
- buf = os_readfile(fname, &len);
- if (!buf)
- return NULL;
- buf2 = os_realloc(buf, len + 1);
- if (!buf2) {
- os_free(buf);
- return NULL;
- }
- buf = buf2;
- buf[len] = '\0';
-
- pos = os_strchr(buf, '\n');
- if (!pos) {
- os_free(buf);
- return NULL;
- }
- *pos++ = '\0';
- os_strlcpy(uri, buf, uri_size);
-
- node = xml_node_from_buf(ctx->xml, pos);
- os_free(buf);
-
- return node;
-}
-
-
-static xml_node_t * build_sub_rem_resp(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *session_id,
- int machine_rem, int dmacc)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node, *cred;
- char buf[400];
- char new_pw[33];
- char *status;
- char *cert;
-
- cert = db_get_val(ctx, user, realm, "cert", dmacc);
- if (cert && cert[0] == '\0') {
- os_free(cert);
- cert = NULL;
- }
- if (cert) {
- char *subrem;
-
- /* No change needed in PPS MO unless specifically asked to */
- cred = NULL;
- buf[0] = '\0';
-
- subrem = db_get_val(ctx, user, realm, "subrem", dmacc);
- if (subrem && subrem[0]) {
- cred = read_subrem_file(ctx, subrem, buf, sizeof(buf));
- if (!cred) {
- debug_print(ctx, 1,
- "Could not create updateNode from subrem file");
- os_free(subrem);
- os_free(cert);
- return NULL;
- }
- }
- os_free(subrem);
- } else {
- char *real_user = NULL;
- char *pw;
-
- if (dmacc) {
- real_user = db_get_val(ctx, user, realm, "identity",
- dmacc);
- if (!real_user) {
- debug_print(ctx, 1,
- "Could not find user identity for dmacc user '%s'",
- user);
- return NULL;
- }
- }
-
- pw = db_get_session_val(ctx, user, realm, session_id,
- "password");
- if (pw && pw[0]) {
- debug_print(ctx, 1, "New password from the user: '%s'",
- pw);
- snprintf(new_pw, sizeof(new_pw), "%s", pw);
- free(pw);
- cred = build_credential_pw(ctx,
- real_user ? real_user : user,
- realm, new_pw, 0);
- } else {
- cred = build_credential(ctx,
- real_user ? real_user : user,
- realm, new_pw, sizeof(new_pw));
- }
-
- free(real_user);
- if (!cred) {
- debug_print(ctx, 1, "Could not build credential");
- os_free(cert);
- return NULL;
- }
-
- snprintf(buf, sizeof(buf),
- "./Wi-Fi/%s/PerProviderSubscription/Cred01/Credential",
- realm);
- }
-
- status = "Remediation complete, request sppUpdateResponse";
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, status,
- NULL);
- if (spp_node == NULL) {
- debug_print(ctx, 1, "Could not build sppPostDevDataResponse");
- os_free(cert);
- return NULL;
- }
-
- if ((cred && add_update_node(ctx, spp_node, ns, buf, cred) < 0) ||
- (!cred && !xml_node_create(ctx->xml, spp_node, ns, "noMOUpdate"))) {
- debug_print(ctx, 1, "Could not add update node");
- xml_node_free(ctx->xml, spp_node);
- os_free(cert);
- return NULL;
- }
-
- hs20_eventlog_node(ctx, user, realm, session_id,
- machine_rem ? "machine remediation" :
- "user remediation", cred);
- xml_node_free(ctx->xml, cred);
-
- if (cert) {
- debug_print(ctx, 1, "Request DB remediation clearing on success notification (certificate credential)");
- db_add_session(ctx, user, realm, session_id, NULL, NULL,
- CLEAR_REMEDIATION, NULL);
- } else {
- debug_print(ctx, 1, "Request DB password update on success "
- "notification");
- db_add_session(ctx, user, realm, session_id, new_pw, NULL,
- UPDATE_PASSWORD, NULL);
- }
- os_free(cert);
-
- return spp_node;
-}
-
-
-static xml_node_t * machine_remediation(struct hs20_svc *ctx,
- const char *user,
- const char *realm,
- const char *session_id, int dmacc)
-{
- return build_sub_rem_resp(ctx, user, realm, session_id, 1, dmacc);
-}
-
-
-static xml_node_t * cert_reenroll(struct hs20_svc *ctx,
- const char *user,
- const char *realm,
- const char *session_id)
-{
- db_add_session(ctx, user, realm, session_id, NULL, NULL,
- CERT_REENROLL, NULL);
- return spp_exec_get_certificate(ctx, session_id, user, realm, 0);
-}
-
-
-static xml_node_t * policy_remediation(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *session_id, int dmacc)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node, *policy;
- char buf[400];
- const char *status;
-
- hs20_eventlog(ctx, user, realm, session_id,
- "requires policy remediation", NULL);
-
- db_add_session(ctx, user, realm, session_id, NULL, NULL,
- POLICY_REMEDIATION, NULL);
-
- policy = build_policy(ctx, user, realm, dmacc);
- if (!policy) {
- return build_post_dev_data_response(
- ctx, NULL, session_id,
- "No update available at this time", NULL);
- }
-
- status = "Remediation complete, request sppUpdateResponse";
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, status,
- NULL);
- if (spp_node == NULL)
- return NULL;
-
- snprintf(buf, sizeof(buf),
- "./Wi-Fi/%s/PerProviderSubscription/Cred01/Policy",
- realm);
-
- if (add_update_node(ctx, spp_node, ns, buf, policy) < 0) {
- xml_node_free(ctx->xml, spp_node);
- xml_node_free(ctx->xml, policy);
- return NULL;
- }
-
- hs20_eventlog_node(ctx, user, realm, session_id,
- "policy update (sub rem)", policy);
- xml_node_free(ctx->xml, policy);
-
- return spp_node;
-}
-
-
-static xml_node_t * browser_remediation(struct hs20_svc *ctx,
- const char *session_id,
- const char *redirect_uri,
- const char *uri)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node, *exec_node;
-
- if (redirect_uri == NULL) {
- debug_print(ctx, 1, "Missing redirectURI attribute for user "
- "remediation");
- return NULL;
- }
- debug_print(ctx, 1, "redirectURI %s", redirect_uri);
-
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, "OK",
- NULL);
- if (spp_node == NULL)
- return NULL;
-
- exec_node = xml_node_create(ctx->xml, spp_node, ns, "exec");
- xml_node_create_text(ctx->xml, exec_node, ns, "launchBrowserToURI",
- uri);
- return spp_node;
-}
-
-
-static xml_node_t * user_remediation(struct hs20_svc *ctx, const char *user,
- const char *realm, const char *session_id,
- const char *redirect_uri)
-{
- char uri[300], *val;
-
- hs20_eventlog(ctx, user, realm, session_id,
- "requires user remediation", NULL);
- val = db_get_osu_config_val(ctx, realm, "remediation_url");
- if (val == NULL)
- return NULL;
-
- db_add_session(ctx, user, realm, session_id, NULL, redirect_uri,
- USER_REMEDIATION, NULL);
-
- snprintf(uri, sizeof(uri), "%s%s", val, session_id);
- os_free(val);
- return browser_remediation(ctx, session_id, redirect_uri, uri);
-}
-
-
-static xml_node_t * free_remediation(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *session_id,
- const char *redirect_uri)
-{
- char uri[300], *val;
-
- hs20_eventlog(ctx, user, realm, session_id,
- "requires free/public account remediation", NULL);
- val = db_get_osu_config_val(ctx, realm, "free_remediation_url");
- if (val == NULL)
- return NULL;
-
- db_add_session(ctx, user, realm, session_id, NULL, redirect_uri,
- FREE_REMEDIATION, NULL);
-
- snprintf(uri, sizeof(uri), "%s%s", val, session_id);
- os_free(val);
- return browser_remediation(ctx, session_id, redirect_uri, uri);
-}
-
-
-static xml_node_t * no_sub_rem(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *session_id)
-{
- const char *status;
-
- hs20_eventlog(ctx, user, realm, session_id,
- "no subscription mediation available", NULL);
-
- status = "No update available at this time";
- return build_post_dev_data_response(ctx, NULL, session_id, status,
- NULL);
-}
-
-
-static xml_node_t * hs20_subscription_remediation(struct hs20_svc *ctx,
- const char *user,
- const char *realm,
- const char *session_id,
- int dmacc,
- const char *redirect_uri)
-{
- char *type, *identity;
- xml_node_t *ret;
- char *free_account;
-
- identity = db_get_val(ctx, user, realm, "identity", dmacc);
- if (identity == NULL || strlen(identity) == 0) {
- hs20_eventlog(ctx, user, realm, session_id,
- "user not found in database for remediation",
- NULL);
- os_free(identity);
- return build_post_dev_data_response(ctx, NULL, session_id,
- "Error occurred",
- "Not found");
- }
- os_free(identity);
-
- free_account = db_get_osu_config_val(ctx, realm, "free_account");
- if (free_account && strcmp(free_account, user) == 0) {
- free(free_account);
- return no_sub_rem(ctx, user, realm, session_id);
- }
- free(free_account);
-
- type = db_get_val(ctx, user, realm, "remediation", dmacc);
- if (type && strcmp(type, "free") != 0) {
- char *val;
- int shared = 0;
- val = db_get_val(ctx, user, realm, "shared", dmacc);
- if (val)
- shared = atoi(val);
- free(val);
- if (shared) {
- free(type);
- return no_sub_rem(ctx, user, realm, session_id);
- }
- }
- if (type && strcmp(type, "user") == 0)
- ret = user_remediation(ctx, user, realm, session_id,
- redirect_uri);
- else if (type && strcmp(type, "free") == 0)
- ret = free_remediation(ctx, user, realm, session_id,
- redirect_uri);
- else if (type && strcmp(type, "policy") == 0)
- ret = policy_remediation(ctx, user, realm, session_id, dmacc);
- else if (type && strcmp(type, "machine") == 0)
- ret = machine_remediation(ctx, user, realm, session_id, dmacc);
- else if (type && strcmp(type, "reenroll") == 0)
- ret = cert_reenroll(ctx, user, realm, session_id);
- else
- ret = no_sub_rem(ctx, user, realm, session_id);
- free(type);
-
- return ret;
-}
-
-
-static xml_node_t * read_policy_file(struct hs20_svc *ctx,
- const char *policy_id)
-{
- char fname[200];
-
- snprintf(fname, sizeof(fname), "%s/spp/policy/%s.xml",
- ctx->root_dir, policy_id);
- debug_print(ctx, 1, "Use policy file %s", fname);
-
- return node_from_file(ctx->xml, fname);
-}
-
-
-static void update_policy_update_uri(struct hs20_svc *ctx, const char *realm,
- xml_node_t *policy)
-{
- xml_node_t *node;
- char *url;
-
- node = get_node_uri(ctx->xml, policy, "Policy/PolicyUpdate/URI");
- if (!node)
- return;
-
- url = db_get_osu_config_val(ctx, realm, "policy_url");
- if (!url)
- return;
- xml_node_set_text(ctx->xml, node, url);
- free(url);
-}
-
-
-static xml_node_t * build_policy(struct hs20_svc *ctx, const char *user,
- const char *realm, int use_dmacc)
-{
- char *policy_id;
- xml_node_t *policy, *node;
-
- policy_id = db_get_val(ctx, user, realm, "policy", use_dmacc);
- if (policy_id == NULL || strlen(policy_id) == 0) {
- free(policy_id);
- policy_id = strdup("default");
- if (policy_id == NULL)
- return NULL;
- }
- policy = read_policy_file(ctx, policy_id);
- free(policy_id);
- if (policy == NULL)
- return NULL;
-
- update_policy_update_uri(ctx, realm, policy);
-
- node = get_node_uri(ctx->xml, policy, "Policy/PolicyUpdate");
- if (node && use_dmacc) {
- char *pw;
- pw = db_get_val(ctx, user, realm, "osu_password", use_dmacc);
- if (pw == NULL ||
- build_username_password(ctx, node, user, pw) == NULL) {
- debug_print(ctx, 1, "Failed to add Policy/PolicyUpdate/"
- "UsernamePassword");
- free(pw);
- xml_node_free(ctx->xml, policy);
- return NULL;
- }
- free(pw);
- }
-
- return policy;
-}
-
-
-static xml_node_t * hs20_policy_update(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *session_id, int dmacc)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node;
- xml_node_t *policy;
- char buf[400];
- const char *status;
- char *identity;
-
- identity = db_get_val(ctx, user, realm, "identity", dmacc);
- if (identity == NULL || strlen(identity) == 0) {
- hs20_eventlog(ctx, user, realm, session_id,
- "user not found in database for policy update",
- NULL);
- os_free(identity);
- return build_post_dev_data_response(ctx, NULL, session_id,
- "Error occurred",
- "Not found");
- }
- os_free(identity);
-
- policy = build_policy(ctx, user, realm, dmacc);
- if (!policy) {
- return build_post_dev_data_response(
- ctx, NULL, session_id,
- "No update available at this time", NULL);
- }
-
- db_add_session(ctx, user, realm, session_id, NULL, NULL, POLICY_UPDATE,
- NULL);
-
- status = "Update complete, request sppUpdateResponse";
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, status,
- NULL);
- if (spp_node == NULL)
- return NULL;
-
- snprintf(buf, sizeof(buf),
- "./Wi-Fi/%s/PerProviderSubscription/Cred01/Policy",
- realm);
-
- if (add_update_node(ctx, spp_node, ns, buf, policy) < 0) {
- xml_node_free(ctx->xml, spp_node);
- xml_node_free(ctx->xml, policy);
- return NULL;
- }
-
- hs20_eventlog_node(ctx, user, realm, session_id, "policy update",
- policy);
- xml_node_free(ctx->xml, policy);
-
- return spp_node;
-}
-
-
-static xml_node_t * spp_get_mo(struct hs20_svc *ctx, xml_node_t *node,
- const char *urn, int *valid, char **ret_err)
-{
- xml_node_t *child, *tnds, *mo;
- const char *name;
- char *mo_urn;
- char *str;
- char fname[200];
-
- *valid = -1;
- if (ret_err)
- *ret_err = NULL;
-
- xml_node_for_each_child(ctx->xml, child, node) {
- xml_node_for_each_check(ctx->xml, child);
- name = xml_node_get_localname(ctx->xml, child);
- if (strcmp(name, "moContainer") != 0)
- continue;
- mo_urn = xml_node_get_attr_value_ns(ctx->xml, child, SPP_NS_URI,
- "moURN");
- if (strcasecmp(urn, mo_urn) == 0) {
- xml_node_get_attr_value_free(ctx->xml, mo_urn);
- break;
- }
- xml_node_get_attr_value_free(ctx->xml, mo_urn);
- }
-
- if (child == NULL)
- return NULL;
-
- debug_print(ctx, 1, "moContainer text for %s", urn);
- debug_dump_node(ctx, "moContainer", child);
-
- str = xml_node_get_text(ctx->xml, child);
- debug_print(ctx, 1, "moContainer payload: '%s'", str);
- tnds = xml_node_from_buf(ctx->xml, str);
- xml_node_get_text_free(ctx->xml, str);
- if (tnds == NULL) {
- debug_print(ctx, 1, "could not parse moContainer text");
- return NULL;
- }
-
- snprintf(fname, sizeof(fname), "%s/spp/dm_ddf-v1_2.dtd", ctx->root_dir);
- if (xml_validate_dtd(ctx->xml, tnds, fname, ret_err) == 0)
- *valid = 1;
- else if (ret_err && *ret_err &&
- os_strcmp(*ret_err, "No declaration for attribute xmlns of element MgmtTree\n") == 0) {
- free(*ret_err);
- debug_print(ctx, 1, "Ignore OMA-DM DDF DTD validation error for MgmtTree namespace declaration with xmlns attribute");
- *ret_err = NULL;
- *valid = 1;
- } else
- *valid = 0;
-
- mo = tnds_to_mo(ctx->xml, tnds);
- xml_node_free(ctx->xml, tnds);
- if (mo == NULL) {
- debug_print(ctx, 1, "invalid moContainer for %s", urn);
- }
-
- return mo;
-}
-
-
-static xml_node_t * spp_exec_upload_mo(struct hs20_svc *ctx,
- const char *session_id, const char *urn)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node, *node, *exec_node;
-
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, "OK",
- NULL);
- if (spp_node == NULL)
- return NULL;
-
- exec_node = xml_node_create(ctx->xml, spp_node, ns, "exec");
-
- node = xml_node_create(ctx->xml, exec_node, ns, "uploadMO");
- xml_node_add_attr(ctx->xml, node, ns, "moURN", urn);
-
- return spp_node;
-}
-
-
-static xml_node_t * hs20_subscription_registration(struct hs20_svc *ctx,
- const char *realm,
- const char *session_id,
- const char *redirect_uri,
- const u8 *mac_addr)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node, *exec_node;
- char uri[300], *val;
-
- if (db_add_session(ctx, NULL, realm, session_id, NULL, redirect_uri,
- SUBSCRIPTION_REGISTRATION, mac_addr) < 0)
- return NULL;
- val = db_get_osu_config_val(ctx, realm, "signup_url");
- if (val == NULL)
- return NULL;
-
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, "OK",
- NULL);
- if (spp_node == NULL)
- return NULL;
-
- exec_node = xml_node_create(ctx->xml, spp_node, ns, "exec");
-
- snprintf(uri, sizeof(uri), "%s%s", val, session_id);
- os_free(val);
- xml_node_create_text(ctx->xml, exec_node, ns, "launchBrowserToURI",
- uri);
- return spp_node;
-}
-
-
-static xml_node_t * hs20_user_input_remediation(struct hs20_svc *ctx,
- const char *user,
- const char *realm, int dmacc,
- const char *session_id)
-{
- return build_sub_rem_resp(ctx, user, realm, session_id, 0, dmacc);
-}
-
-
-static char * db_get_osu_config_val(struct hs20_svc *ctx, const char *realm,
- const char *field)
-{
- char *cmd;
- struct get_db_field_data data;
-
- cmd = sqlite3_mprintf("SELECT value FROM osu_config WHERE realm=%Q AND "
- "field=%Q", realm, field);
- if (cmd == NULL)
- return NULL;
- debug_print(ctx, 1, "DB: %s", cmd);
- memset(&data, 0, sizeof(data));
- data.field = "value";
- if (sqlite3_exec(ctx->db, cmd, get_db_field, &data, NULL) != SQLITE_OK)
- {
- debug_print(ctx, 1, "DB: Could not find osu_config %s: %s",
- realm, sqlite3_errmsg(ctx->db));
- sqlite3_free(cmd);
- return NULL;
- }
- sqlite3_free(cmd);
-
- debug_print(ctx, 1, "DB: return '%s'", data.value);
- return data.value;
-}
-
-
-static xml_node_t * build_pps(struct hs20_svc *ctx,
- const char *user, const char *realm,
- const char *pw, const char *cert,
- int machine_managed, const char *test,
- const char *imsi, const char *dmacc_username,
- const char *dmacc_password,
- xml_node_t *policy_node)
-{
- xml_node_t *pps, *c, *trust, *aaa, *aaa1, *upd, *homesp, *p;
- xml_node_t *cred, *eap, *userpw;
-
- pps = xml_node_create_root(ctx->xml, NULL, NULL, NULL,
- "PerProviderSubscription");
- if (!pps) {
- xml_node_free(ctx->xml, policy_node);
- return NULL;
- }
-
- add_text_node(ctx, pps, "UpdateIdentifier", "1");
-
- c = xml_node_create(ctx->xml, pps, NULL, "Cred01");
-
- add_text_node(ctx, c, "CredentialPriority", "1");
-
- if (imsi)
- goto skip_aaa_trust_root;
- aaa = xml_node_create(ctx->xml, c, NULL, "AAAServerTrustRoot");
- aaa1 = xml_node_create(ctx->xml, aaa, NULL, "AAA1");
- add_text_node_conf(ctx, realm, aaa1, "CertURL",
- "aaa_trust_root_cert_url");
- if (test && os_strcmp(test, "corrupt_aaa_hash") == 0) {
- debug_print(ctx, 1,
- "TEST: Corrupt PPS/Cred*/AAAServerTrustRoot/Root*/CertSHA256FingerPrint");
- add_text_node_conf_corrupt(ctx, realm, aaa1,
- "CertSHA256Fingerprint",
- "aaa_trust_root_cert_fingerprint");
- } else {
- add_text_node_conf(ctx, realm, aaa1, "CertSHA256Fingerprint",
- "aaa_trust_root_cert_fingerprint");
- }
-
- if (test && os_strcmp(test, "corrupt_polupd_hash") == 0) {
- debug_print(ctx, 1,
- "TEST: Corrupt PPS/Cred*/Policy/PolicyUpdate/Trustroot/CertSHA256FingerPrint");
- p = xml_node_create(ctx->xml, c, NULL, "Policy");
- upd = xml_node_create(ctx->xml, p, NULL, "PolicyUpdate");
- add_text_node(ctx, upd, "UpdateInterval", "30");
- add_text_node(ctx, upd, "UpdateMethod", "SPP-ClientInitiated");
- add_text_node(ctx, upd, "Restriction", "Unrestricted");
- add_text_node_conf(ctx, realm, upd, "URI", "policy_url");
- trust = xml_node_create(ctx->xml, upd, NULL, "TrustRoot");
- add_text_node_conf(ctx, realm, trust, "CertURL",
- "policy_trust_root_cert_url");
- add_text_node_conf_corrupt(ctx, realm, trust,
- "CertSHA256Fingerprint",
- "policy_trust_root_cert_fingerprint");
- }
-skip_aaa_trust_root:
-
- upd = xml_node_create(ctx->xml, c, NULL, "SubscriptionUpdate");
- add_text_node(ctx, upd, "UpdateInterval", "4294967295");
- add_text_node(ctx, upd, "UpdateMethod", "SPP-ClientInitiated");
- add_text_node(ctx, upd, "Restriction", "HomeSP");
- add_text_node_conf(ctx, realm, upd, "URI", "spp_http_auth_url");
- trust = xml_node_create(ctx->xml, upd, NULL, "TrustRoot");
- add_text_node_conf(ctx, realm, trust, "CertURL", "trust_root_cert_url");
- if (test && os_strcmp(test, "corrupt_subrem_hash") == 0) {
- debug_print(ctx, 1,
- "TEST: Corrupt PPS/Cred*/SubscriptionUpdate/Trustroot/CertSHA256FingerPrint");
- add_text_node_conf_corrupt(ctx, realm, trust,
- "CertSHA256Fingerprint",
- "trust_root_cert_fingerprint");
- } else {
- add_text_node_conf(ctx, realm, trust, "CertSHA256Fingerprint",
- "trust_root_cert_fingerprint");
- }
-
- if (dmacc_username &&
- !build_username_password(ctx, upd, dmacc_username,
- dmacc_password)) {
- xml_node_free(ctx->xml, pps);
- xml_node_free(ctx->xml, policy_node);
- return NULL;
- }
-
- if (policy_node)
- xml_node_add_child(ctx->xml, c, policy_node);
-
- homesp = xml_node_create(ctx->xml, c, NULL, "HomeSP");
- add_text_node_conf(ctx, realm, homesp, "FriendlyName", "friendly_name");
- add_text_node_conf(ctx, realm, homesp, "FQDN", "fqdn");
-
- xml_node_create(ctx->xml, c, NULL, "SubscriptionParameters");
-
- cred = xml_node_create(ctx->xml, c, NULL, "Credential");
- add_creation_date(ctx, cred);
- if (imsi) {
- xml_node_t *sim;
- const char *type = "18"; /* default to EAP-SIM */
-
- sim = xml_node_create(ctx->xml, cred, NULL, "SIM");
- add_text_node(ctx, sim, "IMSI", imsi);
- if (ctx->eap_method && os_strcmp(ctx->eap_method, "AKA") == 0)
- type = "23";
- else if (ctx->eap_method &&
- os_strcmp(ctx->eap_method, "AKA'") == 0)
- type = "50";
- add_text_node(ctx, sim, "EAPType", type);
- } else if (cert) {
- xml_node_t *dc;
- dc = xml_node_create(ctx->xml, cred, NULL,
- "DigitalCertificate");
- add_text_node(ctx, dc, "CertificateType", "x509v3");
- add_text_node(ctx, dc, "CertSHA256Fingerprint", cert);
- } else {
- userpw = build_username_password(ctx, cred, user, pw);
- add_text_node(ctx, userpw, "MachineManaged",
- machine_managed ? "TRUE" : "FALSE");
- eap = xml_node_create(ctx->xml, userpw, NULL, "EAPMethod");
- add_text_node(ctx, eap, "EAPType", "21");
- add_text_node(ctx, eap, "InnerMethod", "MS-CHAP-V2");
- }
- add_text_node(ctx, cred, "Realm", realm);
-
- return pps;
-}
-
-
-static xml_node_t * spp_exec_get_certificate(struct hs20_svc *ctx,
- const char *session_id,
- const char *user,
- const char *realm,
- int add_est_user)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node, *enroll, *exec_node;
- char *val;
- char password[11];
- char *b64;
-
- if (add_est_user && new_password(password, sizeof(password)) < 0)
- return NULL;
-
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, "OK",
- NULL);
- if (spp_node == NULL)
- return NULL;
-
- exec_node = xml_node_create(ctx->xml, spp_node, ns, "exec");
-
- enroll = xml_node_create(ctx->xml, exec_node, ns, "getCertificate");
- xml_node_add_attr(ctx->xml, enroll, NULL, "enrollmentProtocol", "EST");
-
- val = db_get_osu_config_val(ctx, realm, "est_url");
- xml_node_create_text(ctx->xml, enroll, ns, "enrollmentServerURI",
- val ? val : "");
- os_free(val);
-
- if (!add_est_user)
- return spp_node;
-
- xml_node_create_text(ctx->xml, enroll, ns, "estUserID", user);
-
- b64 = base64_encode(password, strlen(password), NULL);
- if (b64 == NULL) {
- xml_node_free(ctx->xml, spp_node);
- return NULL;
- }
- xml_node_create_text(ctx->xml, enroll, ns, "estPassword", b64);
- free(b64);
-
- db_update_session_password(ctx, user, realm, session_id, password);
-
- return spp_node;
-}
-
-
-static xml_node_t * hs20_user_input_registration(struct hs20_svc *ctx,
- const char *session_id,
- int enrollment_done)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node, *node = NULL;
- xml_node_t *pps, *tnds;
- char buf[400];
- char *str;
- char *user, *realm, *pw, *type, *mm, *test;
- const char *status;
- int cert = 0;
- int machine_managed = 0;
- char *fingerprint;
-
- user = db_get_session_val(ctx, NULL, NULL, session_id, "user");
- realm = db_get_session_val(ctx, NULL, NULL, session_id, "realm");
- pw = db_get_session_val(ctx, NULL, NULL, session_id, "password");
-
- if (!user || !realm || !pw) {
- debug_print(ctx, 1, "Could not find session info from DB for "
- "the new subscription");
- free(user);
- free(realm);
- free(pw);
- return NULL;
- }
-
- mm = db_get_session_val(ctx, NULL, NULL, session_id, "machine_managed");
- if (mm && atoi(mm))
- machine_managed = 1;
- free(mm);
-
- type = db_get_session_val(ctx, NULL, NULL, session_id, "type");
- if (type && strcmp(type, "cert") == 0)
- cert = 1;
- free(type);
-
- if (cert && !enrollment_done) {
- xml_node_t *ret;
- hs20_eventlog(ctx, user, realm, session_id,
- "request client certificate enrollment", NULL);
- ret = spp_exec_get_certificate(ctx, session_id, user, realm, 1);
- free(user);
- free(realm);
- free(pw);
- return ret;
- }
-
- if (!cert && strlen(pw) == 0) {
- machine_managed = 1;
- free(pw);
- pw = malloc(11);
- if (pw == NULL || new_password(pw, 11) < 0) {
- free(user);
- free(realm);
- free(pw);
- return NULL;
- }
- }
-
- status = "Provisioning complete, request sppUpdateResponse";
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, status,
- NULL);
- if (spp_node == NULL)
- return NULL;
-
- fingerprint = db_get_session_val(ctx, NULL, NULL, session_id, "cert");
- test = db_get_session_val(ctx, NULL, NULL, session_id, "test");
- if (test)
- debug_print(ctx, 1, "TEST: Requested special behavior: %s",
- test);
- pps = build_pps(ctx, user, realm, pw,
- fingerprint ? fingerprint : NULL, machine_managed,
- test, NULL, NULL, NULL, NULL);
- free(fingerprint);
- free(test);
- if (!pps) {
- xml_node_free(ctx->xml, spp_node);
- free(user);
- free(realm);
- free(pw);
- return NULL;
- }
-
- debug_print(ctx, 1, "Request DB subscription registration on success "
- "notification");
- if (machine_managed) {
- db_update_session_password(ctx, user, realm, session_id, pw);
- db_update_session_machine_managed(ctx, user, realm, session_id,
- machine_managed);
- }
- db_add_session_pps(ctx, user, realm, session_id, pps);
-
- hs20_eventlog_node(ctx, user, realm, session_id,
- "new subscription", pps);
- free(user);
- free(pw);
-
- tnds = mo_to_tnds(ctx->xml, pps, 0, URN_HS20_PPS, NULL);
- xml_node_free(ctx->xml, pps);
- if (!tnds) {
- xml_node_free(ctx->xml, spp_node);
- free(realm);
- return NULL;
- }
-
- str = xml_node_to_str(ctx->xml, tnds);
- xml_node_free(ctx->xml, tnds);
- if (str == NULL) {
- xml_node_free(ctx->xml, spp_node);
- free(realm);
- return NULL;
- }
-
- node = xml_node_create_text(ctx->xml, spp_node, ns, "addMO", str);
- free(str);
- snprintf(buf, sizeof(buf), "./Wi-Fi/%s/PerProviderSubscription", realm);
- free(realm);
- xml_node_add_attr(ctx->xml, node, ns, "managementTreeURI", buf);
- xml_node_add_attr(ctx->xml, node, ns, "moURN", URN_HS20_PPS);
-
- return spp_node;
-}
-
-
-static xml_node_t * hs20_user_input_free_remediation(struct hs20_svc *ctx,
- const char *user,
- const char *realm,
- const char *session_id)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node;
- xml_node_t *cred;
- char buf[400];
- char *status;
- char *free_account, *pw;
-
- free_account = db_get_osu_config_val(ctx, realm, "free_account");
- if (free_account == NULL)
- return NULL;
- pw = db_get_val(ctx, free_account, realm, "password", 0);
- if (pw == NULL) {
- free(free_account);
- return NULL;
- }
-
- cred = build_credential_pw(ctx, free_account, realm, pw, 1);
- free(free_account);
- free(pw);
- if (!cred) {
- xml_node_free(ctx->xml, cred);
- return NULL;
- }
-
- status = "Remediation complete, request sppUpdateResponse";
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, status,
- NULL);
- if (spp_node == NULL)
- return NULL;
-
- snprintf(buf, sizeof(buf),
- "./Wi-Fi/%s/PerProviderSubscription/Cred01/Credential",
- realm);
-
- if (add_update_node(ctx, spp_node, ns, buf, cred) < 0) {
- xml_node_free(ctx->xml, spp_node);
- return NULL;
- }
-
- hs20_eventlog_node(ctx, user, realm, session_id,
- "free/public remediation", cred);
- xml_node_free(ctx->xml, cred);
-
- return spp_node;
-}
-
-
-static xml_node_t * hs20_user_input_complete(struct hs20_svc *ctx,
- const char *user,
- const char *realm, int dmacc,
- const char *session_id)
-{
- char *val;
- enum hs20_session_operation oper;
-
- val = db_get_session_val(ctx, user, realm, session_id, "operation");
- if (val == NULL) {
- debug_print(ctx, 1, "No session %s found to continue",
- session_id);
- return NULL;
- }
- oper = atoi(val);
- free(val);
-
- if (oper == USER_REMEDIATION) {
- return hs20_user_input_remediation(ctx, user, realm, dmacc,
- session_id);
- }
-
- if (oper == FREE_REMEDIATION) {
- return hs20_user_input_free_remediation(ctx, user, realm,
- session_id);
- }
-
- if (oper == SUBSCRIPTION_REGISTRATION) {
- return hs20_user_input_registration(ctx, session_id, 0);
- }
-
- debug_print(ctx, 1, "User session %s not in state for user input "
- "completion", session_id);
- return NULL;
-}
-
-
-static xml_node_t * hs20_cert_reenroll_complete(struct hs20_svc *ctx,
- const char *session_id)
-{
- char *user, *realm, *cert;
- char *status;
- xml_namespace_t *ns;
- xml_node_t *spp_node, *cred;
- char buf[400];
-
- user = db_get_session_val(ctx, NULL, NULL, session_id, "user");
- realm = db_get_session_val(ctx, NULL, NULL, session_id, "realm");
- cert = db_get_session_val(ctx, NULL, NULL, session_id, "cert");
- if (!user || !realm || !cert) {
- debug_print(ctx, 1,
- "Could not find session info from DB for certificate reenrollment");
- free(user);
- free(realm);
- free(cert);
- return NULL;
- }
-
- cred = build_credential_cert(ctx, user, realm, cert);
- if (!cred) {
- debug_print(ctx, 1, "Could not build credential");
- free(user);
- free(realm);
- free(cert);
- return NULL;
- }
-
- status = "Remediation complete, request sppUpdateResponse";
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, status,
- NULL);
- if (spp_node == NULL) {
- debug_print(ctx, 1, "Could not build sppPostDevDataResponse");
- free(user);
- free(realm);
- free(cert);
- xml_node_free(ctx->xml, cred);
- return NULL;
- }
-
- snprintf(buf, sizeof(buf),
- "./Wi-Fi/%s/PerProviderSubscription/Cred01/Credential",
- realm);
-
- if (add_update_node(ctx, spp_node, ns, buf, cred) < 0) {
- debug_print(ctx, 1, "Could not add update node");
- xml_node_free(ctx->xml, spp_node);
- free(user);
- free(realm);
- free(cert);
- return NULL;
- }
-
- hs20_eventlog_node(ctx, user, realm, session_id,
- "certificate reenrollment", cred);
- xml_node_free(ctx->xml, cred);
-
- free(user);
- free(realm);
- free(cert);
- return spp_node;
-}
-
-
-static xml_node_t * hs20_cert_enroll_completed(struct hs20_svc *ctx,
- const char *user,
- const char *realm, int dmacc,
- const char *session_id)
-{
- char *val;
- enum hs20_session_operation oper;
-
- val = db_get_session_val(ctx, NULL, NULL, session_id, "operation");
- if (val == NULL) {
- debug_print(ctx, 1, "No session %s found to continue",
- session_id);
- return NULL;
- }
- oper = atoi(val);
- free(val);
-
- if (oper == SUBSCRIPTION_REGISTRATION)
- return hs20_user_input_registration(ctx, session_id, 1);
- if (oper == CERT_REENROLL)
- return hs20_cert_reenroll_complete(ctx, session_id);
-
- debug_print(ctx, 1, "User session %s not in state for certificate "
- "enrollment completion", session_id);
- return NULL;
-}
-
-
-static xml_node_t * hs20_cert_enroll_failed(struct hs20_svc *ctx,
- const char *user,
- const char *realm, int dmacc,
- const char *session_id)
-{
- char *val;
- enum hs20_session_operation oper;
- xml_node_t *spp_node, *node;
- char *status;
- xml_namespace_t *ns;
-
- val = db_get_session_val(ctx, user, realm, session_id, "operation");
- if (val == NULL) {
- debug_print(ctx, 1, "No session %s found to continue",
- session_id);
- return NULL;
- }
- oper = atoi(val);
- free(val);
-
- if (oper != SUBSCRIPTION_REGISTRATION) {
- debug_print(ctx, 1, "User session %s not in state for "
- "enrollment failure", session_id);
- return NULL;
- }
-
- status = "Error occurred";
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, status,
- NULL);
- if (spp_node == NULL)
- return NULL;
- node = xml_node_create(ctx->xml, spp_node, ns, "sppError");
- xml_node_add_attr(ctx->xml, node, NULL, "errorCode",
- "Credentials cannot be provisioned at this time");
- db_remove_session(ctx, user, realm, session_id);
-
- return spp_node;
-}
-
-
-static xml_node_t * hs20_sim_provisioning(struct hs20_svc *ctx,
- const char *user,
- const char *realm, int dmacc,
- const char *session_id)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node, *node = NULL;
- xml_node_t *pps, *tnds;
- char buf[400];
- char *str;
- const char *status;
- char dmacc_username[32];
- char dmacc_password[32];
- char *policy;
- xml_node_t *policy_node = NULL;
-
- if (!ctx->imsi) {
- debug_print(ctx, 1, "IMSI not available for SIM provisioning");
- return NULL;
- }
-
- if (new_password(dmacc_username, sizeof(dmacc_username)) < 0 ||
- new_password(dmacc_password, sizeof(dmacc_password)) < 0) {
- debug_print(ctx, 1,
- "Failed to generate DMAcc username/password");
- return NULL;
- }
-
- status = "Provisioning complete, request sppUpdateResponse";
- spp_node = build_post_dev_data_response(ctx, &ns, session_id, status,
- NULL);
- if (!spp_node)
- return NULL;
-
- policy = db_get_osu_config_val(ctx, realm, "sim_policy");
- if (policy) {
- policy_node = read_policy_file(ctx, policy);
- os_free(policy);
- if (!policy_node) {
- xml_node_free(ctx->xml, spp_node);
- return NULL;
- }
- update_policy_update_uri(ctx, realm, policy_node);
- node = get_node_uri(ctx->xml, policy_node,
- "Policy/PolicyUpdate");
- if (node)
- build_username_password(ctx, node, dmacc_username,
- dmacc_password);
- }
-
- pps = build_pps(ctx, NULL, realm, NULL, NULL, 0, NULL, ctx->imsi,
- dmacc_username, dmacc_password, policy_node);
- if (!pps) {
- xml_node_free(ctx->xml, spp_node);
- return NULL;
- }
-
- debug_print(ctx, 1,
- "Request DB subscription registration on success notification");
- if (!user || !user[0])
- user = ctx->imsi;
- db_add_session(ctx, user, realm, session_id, NULL, NULL,
- SUBSCRIPTION_REGISTRATION, NULL);
- db_add_session_dmacc(ctx, session_id, dmacc_username, dmacc_password);
- if (ctx->eap_method)
- db_add_session_eap_method(ctx, session_id, ctx->eap_method);
- if (ctx->id_hash)
- db_add_session_id_hash(ctx, session_id, ctx->id_hash);
- db_add_session_pps(ctx, user, realm, session_id, pps);
-
- hs20_eventlog_node(ctx, user, realm, session_id,
- "new subscription", pps);
-
- tnds = mo_to_tnds(ctx->xml, pps, 0, URN_HS20_PPS, NULL);
- xml_node_free(ctx->xml, pps);
- if (!tnds) {
- xml_node_free(ctx->xml, spp_node);
- return NULL;
- }
-
- str = xml_node_to_str(ctx->xml, tnds);
- xml_node_free(ctx->xml, tnds);
- if (!str) {
- xml_node_free(ctx->xml, spp_node);
- return NULL;
- }
-
- node = xml_node_create_text(ctx->xml, spp_node, ns, "addMO", str);
- free(str);
- snprintf(buf, sizeof(buf), "./Wi-Fi/%s/PerProviderSubscription", realm);
- xml_node_add_attr(ctx->xml, node, ns, "managementTreeURI", buf);
- xml_node_add_attr(ctx->xml, node, ns, "moURN", URN_HS20_PPS);
-
- return spp_node;
-}
-
-
-static xml_node_t * hs20_spp_post_dev_data(struct hs20_svc *ctx,
- xml_node_t *node,
- const char *user,
- const char *realm,
- const char *session_id,
- int dmacc)
-{
- const char *req_reason;
- char *redirect_uri = NULL;
- char *req_reason_buf = NULL;
- char str[200];
- xml_node_t *ret = NULL, *devinfo = NULL, *devdetail = NULL;
- xml_node_t *mo, *macaddr;
- char *version;
- int valid;
- char *supp, *pos;
- char *err;
- u8 wifi_mac_addr[ETH_ALEN];
-
- version = xml_node_get_attr_value_ns(ctx->xml, node, SPP_NS_URI,
- "sppVersion");
- if (version == NULL || strstr(version, "1.0") == NULL) {
- ret = build_post_dev_data_response(
- ctx, NULL, session_id, "Error occurred",
- "SPP version not supported");
- hs20_eventlog_node(ctx, user, realm, session_id,
- "Unsupported sppVersion", ret);
- xml_node_get_attr_value_free(ctx->xml, version);
- return ret;
- }
- xml_node_get_attr_value_free(ctx->xml, version);
-
- mo = get_node(ctx->xml, node, "supportedMOList");
- if (mo == NULL) {
- ret = build_post_dev_data_response(
- ctx, NULL, session_id, "Error occurred",
- "Other");
- hs20_eventlog_node(ctx, user, realm, session_id,
- "No supportedMOList element", ret);
- return ret;
- }
- supp = xml_node_get_text(ctx->xml, mo);
- for (pos = supp; pos && *pos; pos++)
- *pos = tolower(*pos);
- if (supp == NULL ||
- strstr(supp, URN_OMA_DM_DEVINFO) == NULL ||
- strstr(supp, URN_OMA_DM_DEVDETAIL) == NULL ||
- strstr(supp, URN_HS20_PPS) == NULL) {
- xml_node_get_text_free(ctx->xml, supp);
- ret = build_post_dev_data_response(
- ctx, NULL, session_id, "Error occurred",
- "One or more mandatory MOs not supported");
- hs20_eventlog_node(ctx, user, realm, session_id,
- "Unsupported MOs", ret);
- return ret;
- }
- xml_node_get_text_free(ctx->xml, supp);
-
- req_reason_buf = xml_node_get_attr_value(ctx->xml, node,
- "requestReason");
- if (req_reason_buf == NULL) {
- debug_print(ctx, 1, "No requestReason attribute");
- return NULL;
- }
- req_reason = req_reason_buf;
-
- redirect_uri = xml_node_get_attr_value(ctx->xml, node, "redirectURI");
-
- debug_print(ctx, 1, "requestReason: %s sessionID: %s redirectURI: %s",
- req_reason, session_id, redirect_uri);
- snprintf(str, sizeof(str), "sppPostDevData: requestReason=%s",
- req_reason);
- hs20_eventlog(ctx, user, realm, session_id, str, NULL);
-
- devinfo = spp_get_mo(ctx, node, URN_OMA_DM_DEVINFO, &valid, &err);
- if (devinfo == NULL) {
- ret = build_post_dev_data_response(ctx, NULL, session_id,
- "Error occurred", "Other");
- hs20_eventlog_node(ctx, user, realm, session_id,
- "No DevInfo moContainer in sppPostDevData",
- ret);
- os_free(err);
- goto out;
- }
-
- hs20_eventlog_node(ctx, user, realm, session_id,
- "Received DevInfo MO", devinfo);
- if (valid == 0) {
- hs20_eventlog(ctx, user, realm, session_id,
- "OMA-DM DDF DTD validation errors in DevInfo MO",
- err);
- ret = build_post_dev_data_response(ctx, NULL, session_id,
- "Error occurred", "Other");
- os_free(err);
- goto out;
- }
- os_free(err);
- if (user)
- db_update_mo(ctx, user, realm, "devinfo", devinfo);
-
- devdetail = spp_get_mo(ctx, node, URN_OMA_DM_DEVDETAIL, &valid, &err);
- if (devdetail == NULL) {
- ret = build_post_dev_data_response(ctx, NULL, session_id,
- "Error occurred", "Other");
- hs20_eventlog_node(ctx, user, realm, session_id,
- "No DevDetail moContainer in sppPostDevData",
- ret);
- os_free(err);
- goto out;
- }
-
- hs20_eventlog_node(ctx, user, realm, session_id,
- "Received DevDetail MO", devdetail);
- if (valid == 0) {
- hs20_eventlog(ctx, user, realm, session_id,
- "OMA-DM DDF DTD validation errors "
- "in DevDetail MO", err);
- ret = build_post_dev_data_response(ctx, NULL, session_id,
- "Error occurred", "Other");
- os_free(err);
- goto out;
- }
- os_free(err);
-
- os_memset(wifi_mac_addr, 0, ETH_ALEN);
- macaddr = get_node(ctx->xml, devdetail,
- "Ext/org.wi-fi/Wi-Fi/Wi-FiMACAddress");
- if (macaddr) {
- char *addr, buf[50];
-
- addr = xml_node_get_text(ctx->xml, macaddr);
- if (addr && hwaddr_compact_aton(addr, wifi_mac_addr) == 0) {
- snprintf(buf, sizeof(buf), "DevDetail MAC address: "
- MACSTR, MAC2STR(wifi_mac_addr));
- hs20_eventlog(ctx, user, realm, session_id, buf, NULL);
- xml_node_get_text_free(ctx->xml, addr);
- } else {
- hs20_eventlog(ctx, user, realm, session_id,
- "Could not extract MAC address from DevDetail",
- NULL);
- }
- } else {
- hs20_eventlog(ctx, user, realm, session_id,
- "No MAC address in DevDetail", NULL);
- }
-
- if (user)
- db_update_mo(ctx, user, realm, "devdetail", devdetail);
-
- if (user)
- mo = spp_get_mo(ctx, node, URN_HS20_PPS, &valid, &err);
- else {
- mo = NULL;
- err = NULL;
- }
- if (user && mo) {
- hs20_eventlog_node(ctx, user, realm, session_id,
- "Received PPS MO", mo);
- if (valid == 0) {
- hs20_eventlog(ctx, user, realm, session_id,
- "OMA-DM DDF DTD validation errors "
- "in PPS MO", err);
- xml_node_get_attr_value_free(ctx->xml, redirect_uri);
- os_free(err);
- return build_post_dev_data_response(
- ctx, NULL, session_id,
- "Error occurred", "Other");
- }
- db_update_mo(ctx, user, realm, "pps", mo);
- db_update_val(ctx, user, realm, "fetch_pps", "0", dmacc);
- xml_node_free(ctx->xml, mo);
- }
- os_free(err);
-
- if (user && !mo) {
- char *fetch;
- int fetch_pps;
-
- fetch = db_get_val(ctx, user, realm, "fetch_pps", dmacc);
- fetch_pps = fetch ? atoi(fetch) : 0;
- free(fetch);
-
- if (fetch_pps) {
- enum hs20_session_operation oper;
- if (strcasecmp(req_reason, "Subscription remediation")
- == 0)
- oper = CONTINUE_SUBSCRIPTION_REMEDIATION;
- else if (strcasecmp(req_reason, "Policy update") == 0)
- oper = CONTINUE_POLICY_UPDATE;
- else
- oper = NO_OPERATION;
- if (db_add_session(ctx, user, realm, session_id, NULL,
- NULL, oper, NULL) < 0)
- goto out;
-
- ret = spp_exec_upload_mo(ctx, session_id,
- URN_HS20_PPS);
- hs20_eventlog_node(ctx, user, realm, session_id,
- "request PPS MO upload",
- ret);
- goto out;
- }
- }
-
- if (user && strcasecmp(req_reason, "MO upload") == 0) {
- char *val = db_get_session_val(ctx, user, realm, session_id,
- "operation");
- enum hs20_session_operation oper;
- if (!val) {
- debug_print(ctx, 1, "No session %s found to continue",
- session_id);
- goto out;
- }
- oper = atoi(val);
- free(val);
- if (oper == CONTINUE_SUBSCRIPTION_REMEDIATION)
- req_reason = "Subscription remediation";
- else if (oper == CONTINUE_POLICY_UPDATE)
- req_reason = "Policy update";
- else {
- debug_print(ctx, 1,
- "No pending operation in session %s",
- session_id);
- goto out;
- }
- }
-
- if (strcasecmp(req_reason, "Subscription registration") == 0) {
- ret = hs20_subscription_registration(ctx, realm, session_id,
- redirect_uri,
- wifi_mac_addr);
- hs20_eventlog_node(ctx, user, realm, session_id,
- "subscription registration response",
- ret);
- goto out;
- }
- if (user && strcasecmp(req_reason, "Subscription remediation") == 0) {
- ret = hs20_subscription_remediation(ctx, user, realm,
- session_id, dmacc,
- redirect_uri);
- hs20_eventlog_node(ctx, user, realm, session_id,
- "subscription remediation response",
- ret);
- goto out;
- }
- if (user && strcasecmp(req_reason, "Policy update") == 0) {
- ret = hs20_policy_update(ctx, user, realm, session_id, dmacc);
- hs20_eventlog_node(ctx, user, realm, session_id,
- "policy update response",
- ret);
- goto out;
- }
-
- if (strcasecmp(req_reason, "User input completed") == 0) {
- db_add_session_devinfo(ctx, session_id, devinfo);
- db_add_session_devdetail(ctx, session_id, devdetail);
- ret = hs20_user_input_complete(ctx, user, realm, dmacc,
- session_id);
- hs20_eventlog_node(ctx, user, realm, session_id,
- "user input completed response", ret);
- goto out;
- }
-
- if (strcasecmp(req_reason, "Certificate enrollment completed") == 0) {
- ret = hs20_cert_enroll_completed(ctx, user, realm, dmacc,
- session_id);
- hs20_eventlog_node(ctx, user, realm, session_id,
- "certificate enrollment response", ret);
- goto out;
- }
-
- if (strcasecmp(req_reason, "Certificate enrollment failed") == 0) {
- ret = hs20_cert_enroll_failed(ctx, user, realm, dmacc,
- session_id);
- hs20_eventlog_node(ctx, user, realm, session_id,
- "certificate enrollment failed response",
- ret);
- goto out;
- }
-
- if (strcasecmp(req_reason, "Subscription provisioning") == 0) {
- ret = hs20_sim_provisioning(ctx, user, realm, dmacc,
- session_id);
- hs20_eventlog_node(ctx, user, realm, session_id,
- "subscription provisioning response",
- ret);
- goto out;
- }
-
- debug_print(ctx, 1, "Unsupported requestReason '%s' user '%s'",
- req_reason, user);
-out:
- xml_node_get_attr_value_free(ctx->xml, req_reason_buf);
- xml_node_get_attr_value_free(ctx->xml, redirect_uri);
- if (devinfo)
- xml_node_free(ctx->xml, devinfo);
- if (devdetail)
- xml_node_free(ctx->xml, devdetail);
- return ret;
-}
-
-
-static xml_node_t * build_spp_exchange_complete(struct hs20_svc *ctx,
- const char *session_id,
- const char *status,
- const char *error_code)
-{
- xml_namespace_t *ns;
- xml_node_t *spp_node, *node;
-
- spp_node = xml_node_create_root(ctx->xml, SPP_NS_URI, "spp", &ns,
- "sppExchangeComplete");
-
-
- xml_node_add_attr(ctx->xml, spp_node, ns, "sppVersion", "1.0");
- xml_node_add_attr(ctx->xml, spp_node, ns, "sessionID", session_id);
- xml_node_add_attr(ctx->xml, spp_node, ns, "sppStatus", status);
-
- if (error_code) {
- node = xml_node_create(ctx->xml, spp_node, ns, "sppError");
- xml_node_add_attr(ctx->xml, node, NULL, "errorCode",
- error_code);
- }
-
- return spp_node;
-}
-
-
-static int add_subscription(struct hs20_svc *ctx, const char *session_id)
-{
- char *user, *realm, *pw, *pw_mm, *pps, *str;
- char *osu_user, *osu_password, *eap_method;
- char *policy = NULL;
- char *sql;
- int ret = -1;
- char *free_account;
- int free_acc;
- char *type;
- int cert = 0;
- char *cert_pem, *fingerprint;
- const char *method;
-
- user = db_get_session_val(ctx, NULL, NULL, session_id, "user");
- realm = db_get_session_val(ctx, NULL, NULL, session_id, "realm");
- pw = db_get_session_val(ctx, NULL, NULL, session_id, "password");
- pw_mm = db_get_session_val(ctx, NULL, NULL, session_id,
- "machine_managed");
- pps = db_get_session_val(ctx, NULL, NULL, session_id, "pps");
- cert_pem = db_get_session_val(ctx, NULL, NULL, session_id, "cert_pem");
- fingerprint = db_get_session_val(ctx, NULL, NULL, session_id, "cert");
- type = db_get_session_val(ctx, NULL, NULL, session_id, "type");
- if (type && strcmp(type, "cert") == 0)
- cert = 1;
- free(type);
- osu_user = db_get_session_val(ctx, NULL, NULL, session_id, "osu_user");
- osu_password = db_get_session_val(ctx, NULL, NULL, session_id,
- "osu_password");
- eap_method = db_get_session_val(ctx, NULL, NULL, session_id,
- "eap_method");
-
- if (!user || !realm || !pw) {
- debug_print(ctx, 1, "Could not find session info from DB for "
- "the new subscription");
- goto out;
- }
-
- free_account = db_get_osu_config_val(ctx, realm, "free_account");
- free_acc = free_account && strcmp(free_account, user) == 0;
- free(free_account);
-
- policy = db_get_osu_config_val(ctx, realm, "sim_policy");
-
- debug_print(ctx, 1,
- "New subscription: user='%s' realm='%s' free_acc=%d",
- user, realm, free_acc);
- debug_print(ctx, 1, "New subscription: pps='%s'", pps);
-
- sql = sqlite3_mprintf("UPDATE eventlog SET user=%Q, realm=%Q WHERE "
- "sessionid=%Q AND (user='' OR user IS NULL)",
- user, realm, session_id);
- if (sql) {
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to update eventlog in "
- "sqlite database: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
- }
-
- if (free_acc) {
- hs20_eventlog(ctx, user, realm, session_id,
- "completed shared free account registration",
- NULL);
- ret = 0;
- goto out;
- }
-
- str = db_get_session_val(ctx, NULL, NULL, session_id, "mac_addr");
-
- if (eap_method && eap_method[0])
- method = eap_method;
- else
- method = cert ? "TLS" : "TTLS-MSCHAPV2";
- sql = sqlite3_mprintf("INSERT INTO users(identity,realm,phase2,methods,cert,cert_pem,machine_managed,mac_addr,osu_user,osu_password,policy) VALUES (%Q,%Q,%d,%Q,%Q,%Q,%d,%Q,%Q,%Q,%Q)",
- user, realm, cert ? 0 : 1,
- method,
- fingerprint ? fingerprint : "",
- cert_pem ? cert_pem : "",
- pw_mm && atoi(pw_mm) ? 1 : 0,
- str ? str : "",
- osu_user ? osu_user : "",
- osu_password ? osu_password : "",
- policy ? policy : "");
- free(str);
- if (sql == NULL)
- goto out;
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) != SQLITE_OK) {
- debug_print(ctx, 1, "Failed to add user in sqlite database: %s",
- sqlite3_errmsg(ctx->db));
- sqlite3_free(sql);
- goto out;
- }
- sqlite3_free(sql);
-
- if (cert)
- ret = 0;
- else
- ret = update_password(ctx, user, realm, pw, 0);
- if (ret < 0) {
- sql = sqlite3_mprintf("DELETE FROM users WHERE identity=%Q AND realm=%Q AND (phase2=1 OR methods='TLS')",
- user, realm);
- if (sql) {
- debug_print(ctx, 1, "DB: %s", sql);
- sqlite3_exec(ctx->db, sql, NULL, NULL, NULL);
- sqlite3_free(sql);
- }
- }
-
- if (pps)
- db_update_mo_str(ctx, user, realm, "pps", pps);
-
- str = db_get_session_val(ctx, NULL, NULL, session_id, "devinfo");
- if (str) {
- db_update_mo_str(ctx, user, realm, "devinfo", str);
- free(str);
- }
-
- str = db_get_session_val(ctx, NULL, NULL, session_id, "devdetail");
- if (str) {
- db_update_mo_str(ctx, user, realm, "devdetail", str);
- free(str);
- }
-
- if (cert && user) {
- const char *serialnum;
-
- str = db_get_session_val(ctx, NULL, NULL, session_id,
- "mac_addr");
-
- if (os_strncmp(user, "cert-", 5) == 0)
- serialnum = user + 5;
- else
- serialnum = "";
- sql = sqlite3_mprintf("INSERT OR REPLACE INTO cert_enroll (mac_addr,user,realm,serialnum) VALUES(%Q,%Q,%Q,%Q)",
- str ? str : "", user, realm ? realm : "",
- serialnum);
- free(str);
- if (sql) {
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) !=
- SQLITE_OK) {
- debug_print(ctx, 1,
- "Failed to add cert_enroll entry into sqlite database: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
- }
- }
-
- str = db_get_session_val(ctx, NULL, NULL, session_id,
- "mobile_identifier_hash");
- if (str) {
- sql = sqlite3_mprintf("DELETE FROM sim_provisioning WHERE mobile_identifier_hash=%Q",
- str);
- if (sql) {
- debug_print(ctx, 1, "DB: %s", sql);
- if (sqlite3_exec(ctx->db, sql, NULL, NULL, NULL) !=
- SQLITE_OK) {
- debug_print(ctx, 1,
- "Failed to delete pending sim_provisioning entry: %s",
- sqlite3_errmsg(ctx->db));
- }
- sqlite3_free(sql);
- }
- os_free(str);
- }
-
- if (ret == 0) {
- hs20_eventlog(ctx, user, realm, session_id,
- "completed subscription registration", NULL);
- }
-
-out:
- free(user);
- free(realm);
- free(pw);
- free(pw_mm);
- free(pps);
- free(cert_pem);
- free(fingerprint);
- free(osu_user);
- free(osu_password);
- free(eap_method);
- os_free(policy);
- return ret;
-}
-
-
-static xml_node_t * hs20_spp_update_response(struct hs20_svc *ctx,
- xml_node_t *node,
- const char *user,
- const char *realm,
- const char *session_id,
- int dmacc)
-{
- char *status;
- xml_node_t *ret;
- char *val;
- enum hs20_session_operation oper;
-
- status = xml_node_get_attr_value_ns(ctx->xml, node, SPP_NS_URI,
- "sppStatus");
- if (status == NULL) {
- debug_print(ctx, 1, "No sppStatus attribute");
- return NULL;
- }
-
- debug_print(ctx, 1, "sppUpdateResponse: sppStatus: %s sessionID: %s",
- status, session_id);
-
- val = db_get_session_val(ctx, NULL, NULL, session_id, "operation");
- if (!val) {
- debug_print(ctx, 1,
- "No session active for sessionID: %s",
- session_id);
- oper = NO_OPERATION;
- } else
- oper = atoi(val);
-
- if (strcasecmp(status, "OK") == 0) {
- char *new_pw = NULL;
-
- xml_node_get_attr_value_free(ctx->xml, status);
-
- if (oper == USER_REMEDIATION) {
- new_pw = db_get_session_val(ctx, user, realm,
- session_id, "password");
- if (new_pw == NULL || strlen(new_pw) == 0) {
- free(new_pw);
- ret = build_spp_exchange_complete(
- ctx, session_id, "Error occurred",
- "Other");
- hs20_eventlog_node(ctx, user, realm,
- session_id, "No password "
- "had been assigned for "
- "session", ret);
- db_remove_session(ctx, user, realm, session_id);
- return ret;
- }
- oper = UPDATE_PASSWORD;
- }
- if (oper == UPDATE_PASSWORD) {
- if (!new_pw) {
- new_pw = db_get_session_val(ctx, user, realm,
- session_id,
- "password");
- if (!new_pw) {
- db_remove_session(ctx, user, realm,
- session_id);
- return NULL;
- }
- }
- debug_print(ctx, 1, "Update user '%s' password in DB",
- user);
- if (update_password(ctx, user, realm, new_pw, dmacc) <
- 0) {
- debug_print(ctx, 1, "Failed to update user "
- "'%s' password in DB", user);
- ret = build_spp_exchange_complete(
- ctx, session_id, "Error occurred",
- "Other");
- hs20_eventlog_node(ctx, user, realm,
- session_id, "Failed to "
- "update database", ret);
- db_remove_session(ctx, user, realm, session_id);
- return ret;
- }
- hs20_eventlog(ctx, user, realm,
- session_id, "Updated user password "
- "in database", NULL);
- }
- if (oper == CLEAR_REMEDIATION) {
- debug_print(ctx, 1,
- "Clear remediation requirement for user '%s' in DB",
- user);
- if (clear_remediation(ctx, user, realm, dmacc) < 0) {
- debug_print(ctx, 1,
- "Failed to clear remediation requirement for user '%s' in DB",
- user);
- ret = build_spp_exchange_complete(
- ctx, session_id, "Error occurred",
- "Other");
- hs20_eventlog_node(ctx, user, realm,
- session_id,
- "Failed to update database",
- ret);
- db_remove_session(ctx, user, realm, session_id);
- return ret;
- }
- hs20_eventlog(ctx, user, realm,
- session_id,
- "Cleared remediation requirement in database",
- NULL);
- }
- if (oper == SUBSCRIPTION_REGISTRATION) {
- if (add_subscription(ctx, session_id) < 0) {
- debug_print(ctx, 1, "Failed to add "
- "subscription into DB");
- ret = build_spp_exchange_complete(
- ctx, session_id, "Error occurred",
- "Other");
- hs20_eventlog_node(ctx, user, realm,
- session_id, "Failed to "
- "update database", ret);
- db_remove_session(ctx, user, realm, session_id);
- return ret;
- }
- }
- if (oper == POLICY_REMEDIATION || oper == POLICY_UPDATE) {
- char *val;
- val = db_get_val(ctx, user, realm, "remediation",
- dmacc);
- if (val && strcmp(val, "policy") == 0)
- db_update_val(ctx, user, realm, "remediation",
- "", dmacc);
- free(val);
- }
- if (oper == POLICY_UPDATE)
- db_update_val(ctx, user, realm, "polupd_done", "1",
- dmacc);
- if (oper == CERT_REENROLL) {
- char *new_user;
- char event[200];
-
- new_user = db_get_session_val(ctx, NULL, NULL,
- session_id, "user");
- if (!new_user) {
- debug_print(ctx, 1,
- "Failed to find new user name (cert-serialnum)");
- ret = build_spp_exchange_complete(
- ctx, session_id, "Error occurred",
- "Other");
- hs20_eventlog_node(ctx, user, realm,
- session_id,
- "Failed to find new user name (cert reenroll)",
- ret);
- db_remove_session(ctx, NULL, NULL, session_id);
- return ret;
- }
-
- debug_print(ctx, 1,
- "Update certificate user entry to use the new serial number (old=%s new=%s)",
- user, new_user);
- os_snprintf(event, sizeof(event), "renamed user to: %s",
- new_user);
- hs20_eventlog(ctx, user, realm, session_id, event,
- NULL);
-
- if (db_update_val(ctx, user, realm, "identity",
- new_user, 0) < 0 ||
- db_update_val(ctx, new_user, realm, "remediation",
- "", 0) < 0) {
- debug_print(ctx, 1,
- "Failed to update user name (cert-serialnum)");
- ret = build_spp_exchange_complete(
- ctx, session_id, "Error occurred",
- "Other");
- hs20_eventlog_node(ctx, user, realm,
- session_id,
- "Failed to update user name (cert reenroll)",
- ret);
- db_remove_session(ctx, NULL, NULL, session_id);
- os_free(new_user);
- return ret;
- }
-
- os_free(new_user);
- }
- ret = build_spp_exchange_complete(
- ctx, session_id,
- "Exchange complete, release TLS connection", NULL);
- hs20_eventlog_node(ctx, user, realm, session_id,
- "Exchange completed", ret);
- db_remove_session(ctx, NULL, NULL, session_id);
- return ret;
- }
-
- ret = build_spp_exchange_complete(ctx, session_id, "Error occurred",
- "Other");
- hs20_eventlog_node(ctx, user, realm, session_id, "Error occurred", ret);
- db_remove_session(ctx, user, realm, session_id);
- xml_node_get_attr_value_free(ctx->xml, status);
- return ret;
-}
-
-
-#define SPP_SESSION_ID_LEN 16
-
-static char * gen_spp_session_id(void)
-{
- FILE *f;
- int i;
- char *session;
-
- session = os_malloc(SPP_SESSION_ID_LEN * 2 + 1);
- if (session == NULL)
- return NULL;
-
- f = fopen("/dev/urandom", "r");
- if (f == NULL) {
- os_free(session);
- return NULL;
- }
- for (i = 0; i < SPP_SESSION_ID_LEN; i++)
- os_snprintf(session + i * 2, 3, "%02x", fgetc(f));
-
- fclose(f);
- return session;
-}
-
-xml_node_t * hs20_spp_server_process(struct hs20_svc *ctx, xml_node_t *node,
- const char *auth_user,
- const char *auth_realm, int dmacc)
-{
- xml_node_t *ret = NULL;
- char *session_id;
- const char *op_name;
- char *xml_err;
- char fname[200];
-
- debug_dump_node(ctx, "received request", node);
-
- if (!dmacc && auth_user && auth_realm) {
- char *real;
- real = db_get_val(ctx, auth_user, auth_realm, "identity", 0);
- if (!real) {
- real = db_get_val(ctx, auth_user, auth_realm,
- "identity", 1);
- if (real)
- dmacc = 1;
- }
- os_free(real);
- }
-
- snprintf(fname, sizeof(fname), "%s/spp/spp.xsd", ctx->root_dir);
- if (xml_validate(ctx->xml, node, fname, &xml_err) < 0) {
- /*
- * We may not be able to extract the sessionID from invalid
- * input, but well, we can try.
- */
- session_id = xml_node_get_attr_value_ns(ctx->xml, node,
- SPP_NS_URI,
- "sessionID");
- debug_print(ctx, 1,
- "SPP message failed validation, xsd file: %s xml-error: %s",
- fname, xml_err);
- hs20_eventlog_node(ctx, auth_user, auth_realm, session_id,
- "SPP message failed validation", node);
- hs20_eventlog(ctx, auth_user, auth_realm, session_id,
- "Validation errors", xml_err);
- os_free(xml_err);
- xml_node_get_attr_value_free(ctx->xml, session_id);
- /* TODO: what to return here? */
- ret = xml_node_create_root(ctx->xml, NULL, NULL, NULL,
- "SppValidationError");
- return ret;
- }
-
- session_id = xml_node_get_attr_value_ns(ctx->xml, node, SPP_NS_URI,
- "sessionID");
- if (session_id) {
- char *tmp;
- debug_print(ctx, 1, "Received sessionID %s", session_id);
- tmp = os_strdup(session_id);
- xml_node_get_attr_value_free(ctx->xml, session_id);
- if (tmp == NULL)
- return NULL;
- session_id = tmp;
- } else {
- session_id = gen_spp_session_id();
- if (session_id == NULL) {
- debug_print(ctx, 1, "Failed to generate sessionID");
- return NULL;
- }
- debug_print(ctx, 1, "Generated sessionID %s", session_id);
- }
-
- op_name = xml_node_get_localname(ctx->xml, node);
- if (op_name == NULL) {
- debug_print(ctx, 1, "Could not get op_name");
- return NULL;
- }
-
- if (strcmp(op_name, "sppPostDevData") == 0) {
- hs20_eventlog_node(ctx, auth_user, auth_realm, session_id,
- "sppPostDevData received and validated",
- node);
- ret = hs20_spp_post_dev_data(ctx, node, auth_user, auth_realm,
- session_id, dmacc);
- } else if (strcmp(op_name, "sppUpdateResponse") == 0) {
- hs20_eventlog_node(ctx, auth_user, auth_realm, session_id,
- "sppUpdateResponse received and validated",
- node);
- ret = hs20_spp_update_response(ctx, node, auth_user,
- auth_realm, session_id, dmacc);
- } else {
- hs20_eventlog_node(ctx, auth_user, auth_realm, session_id,
- "Unsupported SPP message received and "
- "validated", node);
- debug_print(ctx, 1, "Unsupported operation '%s'", op_name);
- /* TODO: what to return here? */
- ret = xml_node_create_root(ctx->xml, NULL, NULL, NULL,
- "SppUnknownCommandError");
- }
- os_free(session_id);
-
- if (ret == NULL) {
- /* TODO: what to return here? */
- ret = xml_node_create_root(ctx->xml, NULL, NULL, NULL,
- "SppInternalError");
- }
-
- return ret;
-}
-
-
-int hs20_spp_server_init(struct hs20_svc *ctx)
-{
- char fname[200];
- ctx->db = NULL;
- snprintf(fname, sizeof(fname), "%s/AS/DB/eap_user.db", ctx->root_dir);
- if (sqlite3_open(fname, &ctx->db)) {
- printf("Failed to open sqlite database: %s\n",
- sqlite3_errmsg(ctx->db));
- sqlite3_close(ctx->db);
- return -1;
- }
-
- return 0;
-}
-
-
-void hs20_spp_server_deinit(struct hs20_svc *ctx)
-{
- sqlite3_close(ctx->db);
- ctx->db = NULL;
-}
diff --git a/contrib/wpa/hs20/server/spp_server.h b/contrib/wpa/hs20/server/spp_server.h
index 421974c607b8..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/spp_server.h
+++ b/contrib/wpa/hs20/server/spp_server.h
@@ -1,36 +0,0 @@
-/*
- * Hotspot 2.0 SPP server
- * Copyright (c) 2012-2013, Qualcomm Atheros, Inc.
- *
- * This software may be distributed under the terms of the BSD license.
- * See README for more details.
- */
-
-#ifndef SPP_SERVER_H
-#define SPP_SERVER_H
-
-struct hs20_svc {
- const void *ctx;
- struct xml_node_ctx *xml;
- char *root_dir;
- FILE *debug_log;
- sqlite3 *db;
- const char *addr;
- const char *test;
- const char *imsi;
- const char *eap_method;
- const char *id_hash;
-};
-
-
-void debug_print(struct hs20_svc *ctx, int print, const char *fmt, ...)
- __attribute__ ((format (printf, 3, 4)));
-void debug_dump_node(struct hs20_svc *ctx, const char *title, xml_node_t *node);
-
-xml_node_t * hs20_spp_server_process(struct hs20_svc *ctx, xml_node_t *node,
- const char *auth_user,
- const char *auth_realm, int dmacc);
-int hs20_spp_server_init(struct hs20_svc *ctx);
-void hs20_spp_server_deinit(struct hs20_svc *ctx);
-
-#endif /* SPP_SERVER_H */
diff --git a/contrib/wpa/hs20/server/sql-example.txt b/contrib/wpa/hs20/server/sql-example.txt
index 20dcf2f5c688..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/sql-example.txt
+++ b/contrib/wpa/hs20/server/sql-example.txt
@@ -1,17 +0,0 @@
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','fqdn','example.com');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','friendly_name','Example Operator');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','spp_http_auth_url','https://subscription-server.osu.example.com/hs20/spp.php?realm=example.com');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','trust_root_cert_url','https://osu-server.osu.example.com/hs20/files/spp-root-ca.der');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','trust_root_cert_fingerprint','5b393a9246865569485c2605c3304e48212b449367858299beba9384c4cf4647');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','aaa_trust_root_cert_url','https://osu-server.osu.example.com/hs20/files/aaa-root-ca.der');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','aaa_trust_root_cert_fingerprint','5b393a9246865569485c2605c3304e48212b449367858299beba9384c4cf4647');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','free_account','free');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','policy_url','https://subscription-server.osu.example.com/hs20/spp.php?realm=example.com');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','remediation_url','https://subscription-server.osu.example.com/hs20/remediation.php?session_id=');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','free_remediation_url','https://subscription-server.osu.example.com/hs20/free-remediation.php?session_id=');
-INSERT INTO osu_config(realm,field,value) VALUES('example.com','signup_url','https://subscription-server.osu.example.com/hs20/signup.php?session_id=');
-
-
-INSERT INTO users(identity,realm,methods,password,phase2,shared) VALUES('free','example.com','TTLS-MSCHAPV2','free',1,1);
-
-INSERT INTO wildcards(identity,methods) VALUES('','TTLS,TLS');
diff --git a/contrib/wpa/hs20/server/sql.txt b/contrib/wpa/hs20/server/sql.txt
index 2cc6edea4063..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/sql.txt
+++ b/contrib/wpa/hs20/server/sql.txt
@@ -1,108 +0,0 @@
-CREATE TABLE eventlog(
- user TEXT,
- realm TEXT,
- sessionid TEXT COLLATE NOCASE,
- timestamp TEXT,
- notes TEXT,
- dump TEXT,
- addr TEXT
-);
-
-CREATE TABLE sessions(
- timestamp TEXT,
- id TEXT COLLATE NOCASE,
- user TEXT,
- realm TEXT,
- password TEXT,
- machine_managed BOOLEAN,
- operation INTEGER,
- type TEXT,
- pps TEXT,
- redirect_uri TEXT,
- devinfo TEXT,
- devdetail TEXT,
- cert TEXT,
- cert_pem TEXT,
- mac_addr TEXT,
- osu_user TEXT,
- osu_password TEXT,
- eap_method TEXT,
- mobile_identifier_hash TEXT,
- test TEXT
-);
-
-CREATE index sessions_id_index ON sessions(id);
-
-CREATE TABLE osu_config(
- realm TEXT,
- field TEXT,
- value TEXT
-);
-
-CREATE TABLE users(
- identity TEXT PRIMARY KEY,
- methods TEXT,
- password TEXT,
- machine_managed BOOLEAN,
- remediation TEXT,
- phase2 INTEGER,
- realm TEXT,
- policy TEXT,
- devinfo TEXT,
- devdetail TEXT,
- pps TEXT,
- fetch_pps INTEGER,
- osu_user TEXT,
- osu_password TEXT,
- shared INTEGER,
- cert TEXT,
- cert_pem TEXT,
- t_c_timestamp INTEGER,
- mac_addr TEXT,
- last_msk TEXT,
- polupd_done TEXT,
- subrem TEXT
-);
-
-CREATE TABLE wildcards(
- identity TEXT PRIMARY KEY,
- methods TEXT
-);
-
-CREATE TABLE authlog(
- timestamp TEXT,
- session TEXT,
- nas_ip TEXT,
- username TEXT,
- note TEXT
-);
-
-CREATE TABLE pending_tc(
- mac_addr TEXT PRIMARY KEY,
- identity TEXT
-);
-
-CREATE TABLE current_sessions(
- mac_addr TEXT PRIMARY KEY,
- identity TEXT,
- start_time TEXT,
- nas TEXT,
- hs20_t_c_filtering BOOLEAN,
- waiting_coa_ack BOOLEAN,
- coa_ack_received BOOLEAN
-);
-
-CREATE TABLE cert_enroll(
- mac_addr TEXT PRIMARY KEY,
- user TEXT,
- realm TEXT,
- serialnum TEXT
-);
-
-CREATE TABLE sim_provisioning(
- mobile_identifier_hash TEXT PRIMARY KEY,
- imsi TEXT,
- mac_addr TEXT,
- eap_method TEXT,
- timestamp TEXT
-);
diff --git a/contrib/wpa/hs20/server/www/add-free.php b/contrib/wpa/hs20/server/www/add-free.php
index 1efc65563274..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/www/add-free.php
+++ b/contrib/wpa/hs20/server/www/add-free.php
@@ -1,50 +0,0 @@
-query("SELECT rowid,* FROM sessions WHERE id='$id'")->fetch();
-if ($row == false) {
- die("Session not found");
-}
-
-$uri = $row['redirect_uri'];
-$rowid = $row['rowid'];
-$realm = $row['realm'];
-
-$row = $db->query("SELECT value FROM osu_config WHERE realm='$realm' AND field='free_account'")->fetch();
-if (!$row || strlen($row['value']) == 0) {
- die("Free account disabled");
-}
-
-$user = $row['value'];
-
-$row = $db->query("SELECT password FROM users WHERE identity='$user' AND realm='$realm'")->fetch();
-if (!$row)
- die("Free account not found");
-
-$pw = $row['password'];
-
-if (!$db->exec("UPDATE sessions SET user='$user', password='$pw', realm='$realm', machine_managed='1' WHERE rowid=$rowid")) {
- die("Failed to update session database");
-}
-
-$db->exec("INSERT INTO eventlog(user,realm,sessionid,timestamp,notes) " .
- "VALUES ('$user', '$realm', '$id', " .
- "strftime('%Y-%m-%d %H:%M:%f','now'), " .
- "'completed user input response for a new PPS MO')");
-
-header("Location: $uri", true, 302);
-
-?>
diff --git a/contrib/wpa/hs20/server/www/add-mo.php b/contrib/wpa/hs20/server/www/add-mo.php
index a3b4513531f8..e69de29bb2d1 100644
--- a/contrib/wpa/hs20/server/www/add-mo.php
+++ b/contrib/wpa/hs20/server/www/add-mo.php
@@ -1,56 +0,0 @@
-Invalid username
\n";
- echo "Try again \n";
- echo "