Skip to contentSkip to conversation

test-runner: extend -S option

PATCH Superseded James Prestwood 2 participants 6 messages Aug 16, 2021 – Aug 17, 2021

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/5 test-runner: extend -S option

The -S/--sub-tests option allows the user to specify a test file from inside an autotest. Inside this file there may also be many test functions. This option is being extended to allow running a single test function inside a test file. For example:

* Runs all test functions inside connection_test.py * ./test-runner -A some_test -S connection_test

* Runs only connection_test.py test_connect_success() * ./test-runner -A some_test -S connection_test.test_connect_success

---
 tools/test-runner | 33 ++++++++++++++++++++++++++-------
 1 file changed, 26 insertions(+), 7 deletions(-)
tools/test-runner +26 -7
index dcb1ba5e..895d4299 100755
@@ -1139,6 +1139,13 @@ def start_test(ctx, subtests, rqueue):
 
 		# Iterating through each python test file
 		for test in subtest:
+			limit_funcs = []
+
+			if ctx.args.sub_tests:
+				for i in ctx.args.sub_tests:
+					if len(i.split('.')) == 2:
+						limit_funcs.append(i.split('.')[1])
+
 			# Iterating through individual test functions inside a
 			# Test() class. Due to the nature of unittest we have
 			# to jump through some hoops to set up the test class
@@ -1164,21 +1171,29 @@ def start_test(ctx, subtests, rqueue):
 				result = TestResult()
 
 				try:
+					skip = len(limit_funcs) > 0 and func not in limit_funcs
+
 					# Set up class only on first test
 					if index == 0:
-						dbg("%s\n\t%s RUNNING" % (file, str(func)), end='')
+						if not skip:
+							dbg("%s\n\t%s RUNNING" % (file, str(func)), end='')
 						t.setUpClass()
 					else:
-						dbg("\t%s RUNNING" % str(func), end='')
+						if not skip:
+							dbg("\t%s RUNNING" % str(func), end='')
 
 					sys.__stdout__.flush()
 
-					# Run test (setUp/tearDown run automatically)
-					result = t()
+					if not skip:
+						# Run test (setUp/tearDown run automatically)
+						result = t()
 
 					# Tear down class only on last test
 					if index == len(tlist) - 1:
 						t.tearDownClass()
+
+					if skip:
+						continue
 				except unittest.SkipTest as e:
 					result.skipped.append(t)
 				except Exception as e:
@@ -1256,9 +1271,13 @@ def pre_test(ctx, test, copied):
 		pruned = []
 
 		for s in subtests:
-			# Allow test name both with and without the extension
-			if s in ctx.args.sub_tests or os.path.splitext(s)[0] in ctx.args.sub_tests:
-				pruned.append(s)
+			file = s
+			# Handle <file>.<test function> format
+			if '.' in s:
+				file = s.split('.')[0] + '.py'
+
+			if file == s:
+				pruned.append(file)
 
 		subtests = pruned
 
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/5 network: destroy secrets on network_disconnect()

---
 src/network.c | 2 ++
 1 file changed, 2 insertions(+)
src/network.c +2 -0
index 20c0ee1f..2779f6be 100644
@@ -192,6 +192,8 @@ void network_disconnected(struct network *network)
 	network_settings_close(network);
 
 	l_queue_clear(network->blacklist, NULL);
+	l_queue_destroy(network->secrets, eap_secret_info_free);
+	network->secrets = NULL;
 }
 
 /* First 64 entries calculated by 1 / pow(n, 0.3) for n >= 1 */
Signature · 1 line
2.31.1
#2 lore raw

Re: [PATCH 2/5] network: destroy secrets on network_disconnect()

Hi James,

Quoted 9 lines · James Prestwood
---
  src/network.c | 2 ++
  1 file changed, 2 insertions(+)
src/network.c +0 -0
index 20c0ee1f..2779f6be 100644

src/network.c void network_disconnected(struct network *network) · line 196

Quoted 5 lines
src/network.c +2 -0
@@ -192,6 +192,8 @@ void network_disconnected(struct network *network)
  	network_settings_close(network);
 
  	l_queue_clear(network->blacklist, NULL);
+	l_queue_destroy(network->secrets, eap_secret_info_free);
+	network->secrets = NULL;

This seems to be the wrong place for this? The intent in network_connected() and network_connect_failed() seems to be to free secrets if the connection failed, and remove any non-cacheable secrets if we succeeded. But otherwise the secrets are cached for the life of the network.

Consider a case where you connect to A (grabbing secrets from the user), then switch to another network, then switch back to A. The second connection to A should work without asking for secrets again.

This commit would seem to break the above?

src/network.c void network_disconnected(struct network *network) · line 199

Quoted 4 lines
src/network.c +0 -0
  }
 
  /* First 64 entries calculated by 1 / pow(n, 0.3) for n >= 1 */

Regards,
-Denis

#3 lore raw

PATCH 3/5 auto-t: Add universal testEAP test

In reply to James Prestwood

This tests all EAP methods in their standard configuration. Any corner cases requiring changes to main.conf or other hostapd options are not included and will be left as stand alone tests.

This was done because nearly all EAP tests are identical except the IWD provisioning file and hostapd EAP users fine. The IWD provisioning file can be swapped out as needed for each individual test without actually restarting IWD. And the EAP users file can simply be written to include every possible EAP method that is supported.

---
 autotests/misc/secrets/eap-user.text          |  22 ++
 autotests/testEAP/connection_test.py          | 226 ++++++++++++++++++
 autotests/testEAP/hw.conf                     |   6 +
 .../mschapv2/ssidEAP-MSCHAPV2-hash.8021x      |   7 +
 .../mschapv2/ssidEAP-MSCHAPV2-nopass.8021x    |   6 +
 .../ssidEAP-MSCHAPV2-nouserpass.8021x         |   5 +
 .../testEAP/mschapv2/ssidEAP-MSCHAPV2.8021x   |   7 +
 autotests/testEAP/peap/ssidEAP-PEAP-GTC.8021x |  12 +
 autotests/testEAP/peap/ssidEAP-PEAP-MD5.8021x |  14 ++
 .../testEAP/peap/ssidEAP-PEAP-MSCHAPv2.8021x  |  12 +
 autotests/testEAP/peap/ssidEAP-PEAP-SIM.8021x |  10 +
 .../testEAP/peap/ssidEAP-PEAPv0-GTC.8021x     |  12 +
 .../testEAP/peap/ssidEAP-PEAPv0-MD5.8021x     |  12 +
 .../peap/ssidEAP-PEAPv0-MSCHAPv2.8021x        |  12 +
 .../testEAP/peap/ssidEAP-PEAPv0-SIM.8021x     |  10 +
 .../testEAP/peap/ssidEAP-PEAPv1-GTC.8021x     |  12 +
 .../testEAP/peap/ssidEAP-PEAPv1-MD5.8021x     |  12 +
 .../peap/ssidEAP-PEAPv1-MSCHAPv2.8021x        |  12 +
 .../testEAP/peap/ssidEAP-PEAPv1-SIM.8021x     |  10 +
 autotests/testEAP/sim/aka.db                  |   3 +
 autotests/testEAP/sim/sim.db                  |   1 +
 autotests/testEAP/sim/ssidEAP-AKA-prime.8021x |   5 +
 autotests/testEAP/sim/ssidEAP-AKA.8021x       |   2 +
 autotests/testEAP/sim/ssidEAP-SIM.8021x       |   5 +
 autotests/testEAP/ssidEAP-PWD.8021x           |   7 +
 autotests/testEAP/ssidEAP.conf                |  14 ++
 .../testEAP/tls/ssidEAP-TLS-des-ede3.8021x    |   9 +
 .../testEAP/tls/ssidEAP-TLS-embedded.8021x    |  94 ++++++++
 .../testEAP/tls/ssidEAP-TLS-keybundle.8021x   |   9 +
 .../testEAP/tls/ssidEAP-TLS-keypass.8021x     |  10 +
 .../testEAP/tls/ssidEAP-TLS-nokeypass.8021x   |   9 +
 .../testEAP/ttls/ssidEAP-TTLS-CHAP.8021x      |  12 +
 autotests/testEAP/ttls/ssidEAP-TTLS-MD5.8021x |  12 +
 .../testEAP/ttls/ssidEAP-TTLS-MSCHAPV2.8021x  |   8 +
 .../ttls/ssidEAP-TTLS-Tunneled-MSCHAP.8021x   |  12 +
 .../ttls/ssidEAP-TTLS-Tunneled-MSCHAPV2.8021x |  12 +
 .../ttls/ssidEAP-TTLS-Tunneled-PAP.8021x      |  12 +
 37 files changed, 655 insertions(+)
 create mode 100644 autotests/misc/secrets/eap-user.text
 create mode 100644 autotests/testEAP/connection_test.py
 create mode 100644 autotests/testEAP/hw.conf
 create mode 100644 autotests/testEAP/mschapv2/ssidEAP-MSCHAPV2-hash.8021x
 create mode 100644 autotests/testEAP/mschapv2/ssidEAP-MSCHAPV2-nopass.8021x
 create mode 100644 autotests/testEAP/mschapv2/ssidEAP-MSCHAPV2-nouserpass.8021x
 create mode 100644 autotests/testEAP/mschapv2/ssidEAP-MSCHAPV2.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAP-GTC.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAP-MD5.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAP-MSCHAPv2.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAP-SIM.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAPv0-GTC.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAPv0-MD5.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAPv0-MSCHAPv2.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAPv0-SIM.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAPv1-GTC.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAPv1-MD5.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAPv1-MSCHAPv2.8021x
 create mode 100644 autotests/testEAP/peap/ssidEAP-PEAPv1-SIM.8021x
 create mode 100644 autotests/testEAP/sim/aka.db
 create mode 100644 autotests/testEAP/sim/sim.db
 create mode 100644 autotests/testEAP/sim/ssidEAP-AKA-prime.8021x
 create mode 100644 autotests/testEAP/sim/ssidEAP-AKA.8021x
 create mode 100644 autotests/testEAP/sim/ssidEAP-SIM.8021x
 create mode 100644 autotests/testEAP/ssidEAP-PWD.8021x
 create mode 100644 autotests/testEAP/ssidEAP.conf
 create mode 100644 autotests/testEAP/tls/ssidEAP-TLS-des-ede3.8021x
 create mode 100644 autotests/testEAP/tls/ssidEAP-TLS-embedded.8021x
 create mode 100644 autotests/testEAP/tls/ssidEAP-TLS-keybundle.8021x
 create mode 100644 autotests/testEAP/tls/ssidEAP-TLS-keypass.8021x
 create mode 100644 autotests/testEAP/tls/ssidEAP-TLS-nokeypass.8021x
 create mode 100644 autotests/testEAP/ttls/ssidEAP-TTLS-CHAP.8021x
 create mode 100644 autotests/testEAP/ttls/ssidEAP-TTLS-MD5.8021x
 create mode 100644 autotests/testEAP/ttls/ssidEAP-TTLS-MSCHAPV2.8021x
 create mode 100644 autotests/testEAP/ttls/ssidEAP-TTLS-Tunneled-MSCHAP.8021x
 create mode 100644 autotests/testEAP/ttls/ssidEAP-TTLS-Tunneled-MSCHAPV2.8021x
 create mode 100644 autotests/testEAP/ttls/ssidEAP-TTLS-Tunneled-PAP.8021x
autotests/misc/secrets/eap-user.text new file +22 -0
new file mode 100644
index 00000000..6f64b2f8
@@ -0,0 +1,22 @@
+"112345678(a)phonesim.org"		SIM
+"012345678(a)phonesim.org"		AKA
+"612345678(a)phonesim.org"		AKA'
+"mschapv2(a)example.com"			MSCHAPV2	"Password"
+"pwd(a)example.com"			PWD		"Password"
+
+# Phase 1 users
+"tls(a)example.com"			TLS
+"ttls(a)example.com"			TTLS
+"peap(a)example.com"			PEAP
+"peapv0(a)example.com"			PEAP [ver=0]
+"peapv1(a)example.com"			PEAP [ver=1]
+
+# Phase 2
+"md5-phase2(a)example.com"		MD5		"Password" [2]
+"gtc-phase2(a)example.com"		GTC		"Password" [2]
+"mschapv2-phase2(a)example.com"		MSCHAPV2	"Password" [2]
+"ttls-chap-phase2(a)example.com"		TTLS-CHAP	"Password" [2]
+"ttls-mschap-phase2(a)example.com"	TTLS-MSCHAP	"Password" [2]
+"ttls-mschapv2-phase2(a)example.com"	TTLS-MSCHAPV2	"Password" [2]
+"ttls-pap-phase2(a)example.com"		TTLS-PAP	"Password" [2]
+"112345678(a)phonesim.org"		SIM [2]
autotests/testEAP/connection_test.py new file +226 -0

226 lines not on this page · raw message

autotests/testEAP/hw.conf new file +6 -0
new file mode 100644
index 00000000..8a84c611
@@ -0,0 +1,6 @@
+[SETUP]
+num_radios=2
+sim_keys=ofono
+
+[HOSTAPD]
+rad0=ssidEAP.conf
autotests/testEAP/mschapv2/ssidEAP-MSCHAPV2-hash.8021x new file +7 -0
new file mode 100644
index 00000000..2bb134d1
@@ -0,0 +1,7 @@
+[Security]
+EAP-Method=MSCHAPV2
+EAP-Identity=mschapv2(a)example.com
+EAP-Password-Hash=a4f49c406510bdcab6824ee7c30fd852
+
+[Settings]
+AutoConnect=false
autotests/testEAP/mschapv2/ssidEAP-MSCHAPV2-nopass.8021x new file +6 -0
new file mode 100644
index 00000000..e682cf5b
@@ -0,0 +1,6 @@
+[Security]
+EAP-Method=MSCHAPV2
+EAP-Identity=mschapv2(a)example.com
+
+[Settings]
+AutoConnect=false
autotests/testEAP/mschapv2/ssidEAP-MSCHAPV2-nouserpass.8021x new file +5 -0
new file mode 100644
index 00000000..d7528b38
@@ -0,0 +1,5 @@
+[Security]
+EAP-Method=MSCHAPV2
+
+[Settings]
+AutoConnect=false
autotests/testEAP/mschapv2/ssidEAP-MSCHAPV2.8021x new file +7 -0
new file mode 100644
index 00000000..3aba560c
@@ -0,0 +1,7 @@
+[Security]
+EAP-Method=MSCHAPV2
+EAP-Identity=mschapv2(a)example.com
+EAP-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAP-GTC.8021x new file +12 -0
new file mode 100644
index 00000000..2a1ad713
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peap(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=GTC
+EAP-PEAP-Phase2-Identity=gtc-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAP-MD5.8021x new file +14 -0
new file mode 100644
index 00000000..a13bbaaa
@@ -0,0 +1,14 @@
+[Security]
+EAP-Method=PEAP
+
+EAP-Identity=peap(a)example.com
+
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=MD5
+EAP-PEAP-Phase2-Identity=md5-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAP-MSCHAPv2.8021x new file +12 -0
new file mode 100644
index 00000000..3cacdfbe
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peap(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=MSCHAPV2
+EAP-PEAP-Phase2-Identity=mschapv2-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAP-SIM.8021x new file +10 -0
new file mode 100644
index 00000000..54311990
@@ -0,0 +1,10 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peap(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=SIM
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAPv0-GTC.8021x new file +12 -0
new file mode 100644
index 00000000..b0c02d6b
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peapv0(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=GTC
+EAP-PEAP-Phase2-Identity=gtc-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAPv0-MD5.8021x new file +12 -0
new file mode 100644
index 00000000..a34faca6
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peapv0(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=MD5
+EAP-PEAP-Phase2-Identity=md5-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAPv0-MSCHAPv2.8021x new file +12 -0
new file mode 100644
index 00000000..988661c7
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peapv0(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=MSCHAPV2
+EAP-PEAP-Phase2-Identity=mschapv2-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAPv0-SIM.8021x new file +10 -0
new file mode 100644
index 00000000..612bc9e9
@@ -0,0 +1,10 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peapv0(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=SIM
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAPv1-GTC.8021x new file +12 -0
new file mode 100644
index 00000000..775f547c
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peapv1(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=GTC
+EAP-PEAP-Phase2-Identity=gtc-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAPv1-MD5.8021x new file +12 -0
new file mode 100644
index 00000000..35a1329a
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peapv1(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=MD5
+EAP-PEAP-Phase2-Identity=md5-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAPv1-MSCHAPv2.8021x new file +12 -0
new file mode 100644
index 00000000..02290920
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peapv1(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=MSCHAPV2
+EAP-PEAP-Phase2-Identity=mschapv2-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/peap/ssidEAP-PEAPv1-SIM.8021x new file +10 -0
new file mode 100644
index 00000000..2f0f6688
@@ -0,0 +1,10 @@
+[Security]
+EAP-Method=PEAP
+EAP-Identity=peapv1(a)example.com
+EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
+EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
+EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-PEAP-Phase2-Method=SIM
+
+[Settings]
+AutoConnect=false
autotests/testEAP/sim/aka.db new file +3 -0
new file mode 100644
index 00000000..c4461ae1
@@ -0,0 +1,3 @@
+# IMSI K OPC AMF SQN
+
+12345678:90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:61df:000000000021
\ No newline at end of file
autotests/testEAP/sim/sim.db new file +1 -0
new file mode 100644
index 00000000..fbf79786
@@ -0,0 +1 @@
+12345678:673fb8cd35f98800:1fb1e3b5:DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
autotests/testEAP/sim/ssidEAP-AKA-prime.8021x new file +5 -0
new file mode 100644
index 00000000..6e88da6b
@@ -0,0 +1,5 @@
+[Security]
+EAP-Method=AKA'
+
+[Settings]
+AutoConnect=false
autotests/testEAP/sim/ssidEAP-AKA.8021x new file +2 -0
new file mode 100644
index 00000000..1d55e17c
@@ -0,0 +1,2 @@
+[Security]
+EAP-Method=AKA
autotests/testEAP/sim/ssidEAP-SIM.8021x new file +5 -0
new file mode 100644
index 00000000..1dcdbcb6
@@ -0,0 +1,5 @@
+[Security]
+EAP-Method=SIM
+
+[Settings]
+AutoConnect=false
autotests/testEAP/ssidEAP-PWD.8021x new file +7 -0
new file mode 100644
index 00000000..03fd9926
@@ -0,0 +1,7 @@
+[Security]
+EAP-Method=PWD
+EAP-Identity=pwd(a)example.com
+EAP-Password=Password
+
+[Settings]
+AutoConnect=false
autotests/testEAP/ssidEAP.conf new file +14 -0
new file mode 100644
index 00000000..d2536a4d
@@ -0,0 +1,14 @@
+hw_mode=g
+channel=1
+ssid=ssidEAP
+wpa=3
+wpa_key_mgmt=WPA-EAP
+ieee8021x=1
+eap_server=1
+eap_user_file=/tmp/secrets/eap-user.text
+ca_cert=/tmp/certs/cert-ca.pem
+server_cert=/tmp/certs/cert-server.pem
+private_key=/tmp/certs/cert-server-key.pem
+
+eap_sim_db=unix:/tmp/hlrauc.sock
+eap_sim_aka_result_ind=1
autotests/testEAP/tls/ssidEAP-TLS-des-ede3.8021x new file +9 -0
new file mode 100644
index 00000000..5b4a7df8
@@ -0,0 +1,9 @@
+[Security]
+EAP-Method=TLS
+EAP-TLS-CACert=/tmp/certs/cert-ca.pem
+EAP-TLS-ClientCert=/tmp/certs/cert-client.crt
+EAP-TLS-ClientKey=/tmp/certs/cert-client-key-v2-des-ede3.pem
+EAP-Identity=tls(a)example.com
+
+[Settings]
+AutoConnect=False
autotests/testEAP/tls/ssidEAP-TLS-embedded.8021x new file +94 -0

94 lines not on this page · raw message

autotests/testEAP/tls/ssidEAP-TLS-keybundle.8021x new file +9 -0
new file mode 100644
index 00000000..30470388
@@ -0,0 +1,9 @@
+[Security]
+EAP-Method=TLS
+EAP-TLS-CACert=/tmp/certs/cert-ca.pem
+EAP-TLS-ClientKeyBundle=/tmp/certs/cert-client.p12
+EAP-TLS-ClientKeyPassphrase=abc
+EAP-Identity=tls(a)example.com
+
+[Settings]
+AutoConnect=False
autotests/testEAP/tls/ssidEAP-TLS-keypass.8021x new file +10 -0
new file mode 100644
index 00000000..538d2dda
@@ -0,0 +1,10 @@
+[Security]
+EAP-Method=TLS
+EAP-TLS-CACert=/tmp/certs/cert-ca.pem
+EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
+EAP-TLS-ClientKey=/tmp/certs/cert-client-key-md5-des.pem
+EAP-TLS-ClientKeyPassphrase=abc
+EAP-Identity=tls(a)example.com
+
+[Settings]
+AutoConnect=False
autotests/testEAP/tls/ssidEAP-TLS-nokeypass.8021x new file +9 -0
new file mode 100644
index 00000000..88c622ad
@@ -0,0 +1,9 @@
+[Security]
+EAP-Method=TLS
+EAP-TLS-CACert=/tmp/certs/cert-ca.pem
+EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
+EAP-TLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-Identity=tls(a)example.com
+
+[Settings]
+AutoConnect=False
autotests/testEAP/ttls/ssidEAP-TTLS-CHAP.8021x new file +12 -0
new file mode 100644
index 00000000..4f67f540
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=TTLS
+EAP-Identity=ttls(a)example.com
+EAP-TTLS-Phase2-Method=Tunneled-CHAP
+
+# If CHAP Identity and Password are left out, they will be requested through
+# the agent.
+#EAP-TTLS-Phase2-Identity=ttls-chap-phase2(a)example.com
+#EAP-TTLS-Phase2-Password=Password
+
+[Settings]
+AutoConnect=False
autotests/testEAP/ttls/ssidEAP-TTLS-MD5.8021x new file +12 -0
new file mode 100644
index 00000000..f789fe42
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=TTLS
+EAP-Identity=ttls(a)example.com
+EAP-TTLS-CACert=/tmp/certs/cert-ca.pem
+EAP-TTLS-ClientCert=/tmp/certs/cert-client.pem
+EAP-TTLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
+EAP-TTLS-Phase2-Method=MD5
+EAP-TTLS-Phase2-Identity=md5-phase2(a)example.com
+EAP-TTLS-Phase2-Password=Password
+
+[Settings]
+AutoConnect=False
autotests/testEAP/ttls/ssidEAP-TTLS-MSCHAPV2.8021x new file +8 -0
new file mode 100644
index 00000000..a3733635
@@ -0,0 +1,8 @@
+[Security]
+EAP-Method=TTLS
+EAP-Identity=ttls(a)example.com
+EAP-TTLS-CACert=/tmp/certs/cert-ca.pem
+EAP-TTLS-ClientCert=/tmp/certs/cert-client.pem
+EAP-TTLS-ClientKey=/tmp/certs/cert-client-key-v2-des-ede3.pem
+EAP-TTLS-Phase2-Method=MSCHAPV2
+EAP-TTLS-Phase2-Identity=mschapv2-phase2(a)example.com
autotests/testEAP/ttls/ssidEAP-TTLS-Tunneled-MSCHAP.8021x new file +12 -0
new file mode 100644
index 00000000..3d9e523b
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=TTLS
+EAP-Identity=ttls(a)example.com
+EAP-TTLS-Phase2-Method=Tunneled-MSCHAP
+
+# If MSCHAP Identity and Password are left out, they will be requested through
+# the agent.
+#EAP-TTLS-Phase2-Identity=ttls-mschap-phase2(a)example.com
+#EAP-TTLS-Phase2-Password=Password
+
+[Settings]
+AutoConnect=False
autotests/testEAP/ttls/ssidEAP-TTLS-Tunneled-MSCHAPV2.8021x new file +12 -0
new file mode 100644
index 00000000..2a33d0d0
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=TTLS
+EAP-Identity=ttls(a)example.com
+EAP-TTLS-Phase2-Method=Tunneled-MSCHAPv2
+
+# If MSCHAP Identity and Password are left out, they will be requested through
+# the agent.
+#EAP-TTLS-Phase2-Identity=ttls-mschapv2-phase2(a)example.com
+#EAP-TTLS-Phase2-Password=Password
+
+[Settings]
+AutoConnect=False
autotests/testEAP/ttls/ssidEAP-TTLS-Tunneled-PAP.8021x new file +12 -0
new file mode 100644
index 00000000..eecb4a23
@@ -0,0 +1,12 @@
+[Security]
+EAP-Method=TTLS
+EAP-Identity=ttls(a)example.com
+EAP-TTLS-Phase2-Method=Tunneled-PAP
+
+# If PAP Identity and Password are left out, they will be requested through
+# the agent.
+#EAP-TTLS-Phase2-Identity=ttls-pap(a)example.com
+#EAP-TTLS-Phase2-Password=Password
+
+[Settings]
+AutoConnect=False
Signature · 1 line
2.31.1
#4 lore raw

PATCH 4/5 auto-t: remove duplicate EAP tests

In reply to James Prestwood

This removes any EAP test which was combined into testEAP as well as modifies any special EAP test to use the now global eap-users file.

---
 autotests/misc/certs/eap-user-tls.text        |  4 -
 .../misc/certs/eap-user-ttls-mschapv2.text    |  4 -
 autotests/misc/certs/eap-user-ttls.text       |  4 -
 autotests/misc/secrets/eap-user-mschapv2.text |  1 -
 .../misc/secrets/eap-user-peap-mschapv2.text  |  4 -
 autotests/misc/secrets/eap-user-peap-sim.text |  4 -
 .../secrets/eap-user-peap-v0-mschapv2.text    |  4 -
 autotests/misc/secrets/eap-user-peap-v0.text  |  4 -
 autotests/misc/secrets/eap-user-peap-v1.text  |  4 -
 .../testConnectAutoconnect/ssidEAP-Other.conf |  2 +-
 .../testConnectAutoconnect/ssidEAP-TLS.8021x  |  2 +-
 .../testConnectAutoconnect/ssidEAP-TLS.conf   |  2 +-
 autotests/testEAD/default.8021x               |  2 +-
 autotests/testEAD/wired.conf                  |  2 +-
 .../testEAP-AKA-ofono/connection_test.py      | 59 ------------
 autotests/testEAP-AKA-ofono/hw.conf           |  6 --
 autotests/testEAP-AKA-ofono/sim.db            |  3 -
 autotests/testEAP-AKA-ofono/sim.eap_user      |  1 -
 autotests/testEAP-AKA-ofono/ssidEAP-AKA.8021x |  5 -
 autotests/testEAP-AKA-ofono/ssidEAP-AKA.conf  | 16 ----
 .../connection_test.py                        | 58 ------------
 autotests/testEAP-AKA-prime-ofono/hw.conf     |  6 --
 autotests/testEAP-AKA-prime-ofono/sim.db      |  3 -
 .../testEAP-AKA-prime-ofono/sim.eap_user      |  1 -
 .../testEAP-AKA-prime-ofono/ssidEAP-AKA.8021x |  5 -
 .../testEAP-AKA-prime-ofono/ssidEAP-AKA.conf  | 16 ----
 autotests/testEAP-MSCHAPV2/connection_test.py | 76 ---------------
 autotests/testEAP-MSCHAPV2/hw.conf            |  5 -
 .../testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-1.8021x |  7 --
 .../testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-2.8021x |  7 --
 .../testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-3.8021x |  6 --
 .../testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-4.8021x |  5 -
 .../testEAP-MSCHAPV2/ssidEAP-MSCHAPV2.conf    |  9 --
 .../testEAP-PEAP-GTC/eap-user-peap-gtc.text   |  4 -
 autotests/testEAP-PEAP-GTC/hw.conf            |  7 --
 .../peap_gtc_nosecret_test.py                 | 59 ------------
 autotests/testEAP-PEAP-GTC/peap_gtc_test.py   | 51 ----------
 .../ssidEAP-PEAPv1-GTC-nosecret.8021x         | 11 ---
 .../ssidEAP-PEAPv1-GTC-nosecret.conf          | 12 ---
 .../testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC.8021x | 12 ---
 .../testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC.conf  | 12 ---
 .../testEAP-PEAP-MSCHAPv2/connection_test.py  | 52 ----------
 autotests/testEAP-PEAP-MSCHAPv2/hw.conf       |  6 --
 .../ssidEAP-PEAP-MSCHAPv2.8021x               | 12 ---
 .../ssidEAP-PEAP-MSCHAPv2.conf                | 12 ---
 autotests/testEAP-PEAP-SIM/connection_test.py | 65 -------------
 autotests/testEAP-PEAP-SIM/hw.conf            |  7 --
 autotests/testEAP-PEAP-SIM/sim.db             |  1 -
 autotests/testEAP-PEAP-SIM/sim.eap_user       |  1 -
 .../testEAP-PEAP-SIM/ssidEAP-PEAP-SIM.8021x   | 10 --
 .../testEAP-PEAP-SIM/ssidEAP-PEAP-SIM.conf    | 15 ---
 autotests/testEAP-PEAP/IWD-Frag/main.conf     |  2 -
 autotests/testEAP-PEAP/hw.conf                |  8 --
 autotests/testEAP-PEAP/peap_frag_test.py      | 50 ----------
 autotests/testEAP-PEAP/peap_v0_test.py        | 50 ----------
 autotests/testEAP-PEAP/peap_v1_test.py        | 50 ----------
 .../testEAP-PEAP/ssidEAP-PEAP-frag.8021x      | 12 ---
 autotests/testEAP-PEAP/ssidEAP-PEAP-frag.conf | 14 ---
 autotests/testEAP-PEAP/ssidEAP-PEAPv0.8021x   | 12 ---
 autotests/testEAP-PEAP/ssidEAP-PEAPv0.conf    | 12 ---
 autotests/testEAP-PEAP/ssidEAP-PEAPv1.8021x   | 12 ---
 autotests/testEAP-PEAP/ssidEAP-PEAPv1.conf    | 12 ---
 .../ssidEAP-PEAPv0-ISK.8021x                  |  6 +-
 .../ssidEAP-PEAPv0-ISK.conf                   |  2 +-
 .../ssidEAP-PEAPv0-NoISK.8021x                |  6 +-
 .../ssidEAP-PEAPv0-NoISK.conf                 |  2 +-
 autotests/testEAP-PWD/IWD-Frag/main.conf      |  2 -
 autotests/testEAP-PWD/connection_test.py      | 70 --------------
 autotests/testEAP-PWD/frag_test.py            | 49 ----------
 autotests/testEAP-PWD/hw.conf                 |  7 --
 autotests/testEAP-PWD/pwd.eap_user            |  1 -
 autotests/testEAP-PWD/ssidEAP-PWD-frag.8021x  |  7 --
 autotests/testEAP-PWD/ssidEAP-PWD-frag.conf   | 16 ----
 autotests/testEAP-PWD/ssidEAP-PWD.8021x       |  6 --
 autotests/testEAP-PWD/ssidEAP-PWD.conf        | 15 ---
 .../testEAP-SIM-ofono/connection_test.py      | 60 ------------
 autotests/testEAP-SIM-ofono/hw.conf           |  6 --
 autotests/testEAP-SIM-ofono/sim.db            |  1 -
 autotests/testEAP-SIM-ofono/sim.eap_user      |  1 -
 autotests/testEAP-SIM-ofono/ssidEAP-SIM.8021x |  5 -
 autotests/testEAP-SIM-ofono/ssidEAP-SIM.conf  | 16 ----
 autotests/testEAP-TLS-Frag/ssidEAP-TLS.8021x  |  2 +-
 autotests/testEAP-TLS-Frag/ssidEAP-TLS.conf   |  2 +-
 .../connection_test.py                        | 62 ------------
 autotests/testEAP-TLS-embedded-pems/hw.conf   |  5 -
 .../ssidEAP-TLS.8021x                         | 94 -------------------
 .../ssidEAP-TLS.conf                          | 12 ---
 autotests/testEAP-TLS/connection_test.py      | 74 ---------------
 autotests/testEAP-TLS/hw.conf                 |  8 --
 autotests/testEAP-TLS/ssidEAP-TLS.8021x       |  9 --
 autotests/testEAP-TLS/ssidEAP-TLS.conf        | 13 ---
 autotests/testEAP-TLS/ssidEAP-TLS2.8021x      | 10 --
 autotests/testEAP-TLS/ssidEAP-TLS2.conf       | 13 ---
 autotests/testEAP-TLS/ssidEAP-TLS3.8021x      |  9 --
 autotests/testEAP-TLS/ssidEAP-TLS3.conf       | 13 ---
 autotests/testEAP-TLS/ssidEAP-TLS4.8021x      |  9 --
 autotests/testEAP-TLS/ssidEAP-TLS4.conf       | 13 ---
 .../testEAP-TLSwithMFPC/ssidEAP-TLS.8021x     |  2 +-
 .../testEAP-TLSwithMFPC/ssidEAP-TLS.conf      |  2 +-
 .../testEAP-TLSwithMFPR/ssidEAP-TLS.8021x     |  2 +-
 .../testEAP-TLSwithMFPR/ssidEAP-TLS.conf      |  2 +-
 .../testEAP-TTLS-CHAP/connection_test.py      | 68 --------------
 .../testEAP-TTLS-CHAP/eap-user-ttls-chap.text |  4 -
 autotests/testEAP-TTLS-CHAP/hw.conf           |  5 -
 .../testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.8021x | 12 ---
 .../testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.conf  | 12 ---
 .../connection_test.py                        | 55 -----------
 autotests/testEAP-TTLS-EAP-MSCHAPV2/hw.conf   |  5 -
 .../ssidEAP-TTLS.8021x                        |  8 --
 .../ssidEAP-TTLS.conf                         | 12 ---
 .../testEAP-TTLS-Frag/ssidEAP-TTLS.8021x      |  6 +-
 autotests/testEAP-TTLS-Frag/ssidEAP-TTLS.conf |  2 +-
 .../testEAP-TTLS-MSCHAP/connection_test.py    | 68 --------------
 .../eap-user-ttls-mschap.text                 |  4 -
 autotests/testEAP-TTLS-MSCHAP/hw.conf         |  5 -
 .../ssidEAP-TTLS-MSCHAP.8021x                 | 12 ---
 .../ssidEAP-TTLS-MSCHAP.conf                  | 12 ---
 .../testEAP-TTLS-MSCHAPv2/connection_test.py  | 72 --------------
 .../eap-user-ttls-mschapv2.text               |  4 -
 .../testEAP-TTLS-MSCHAPv2/failure_test.py     | 57 -----------
 autotests/testEAP-TTLS-MSCHAPv2/hw.conf       |  6 --
 .../ssidEAP-TTLS-MSCHAPv2.8021x               | 12 ---
 .../ssidEAP-TTLS-MSCHAPv2.conf                | 12 ---
 autotests/testEAP-TTLS-PAP/connection_test.py | 68 --------------
 .../testEAP-TTLS-PAP/eap-user-ttls-pap.text   |  4 -
 autotests/testEAP-TTLS-PAP/hw.conf            |  5 -
 .../testEAP-TTLS-PAP/ssidEAP-TTLS-PAP.8021x   | 12 ---
 .../testEAP-TTLS-PAP/ssidEAP-TTLS-PAP.conf    | 12 ---
 autotests/testEAP-TTLS/connection_test.py     | 49 ----------
 autotests/testEAP-TTLS/hw.conf                |  5 -
 autotests/testEAP-TTLS/ssidEAP-TTLS.8021x     | 12 ---
 autotests/testEAP-TTLS/ssidEAP-TTLS.conf      | 12 ---
 autotests/testFILS/fils_256_test.py           |  7 --
 autotests/testFILS/fils_384_test.py           |  7 --
 autotests/testFILS/pwd.eap_user               |  1 -
 autotests/testFILS/radius.conf                |  2 +-
 autotests/testFILS/ssidFILS-256.8021x         |  2 +
 autotests/testFILS/ssidFILS-384.8021x         |  2 +
 autotests/testFT-8021x-roam/TestFT.8021x      |  2 +-
 .../testFT-8021x-roam/ft-eap-ccmp-1.conf      |  2 +-
 .../testFT-8021x-roam/ft-eap-ccmp-2.conf      |  2 +-
 autotests/testFT-FILS/TestFT.8021x            |  4 +-
 autotests/testFT-FILS/pwd.eap_user            |  1 -
 autotests/testFT-FILS/radius.conf             |  2 +-
 autotests/testPreauth-roam/TestPreauth.8021x  |  2 +-
 .../testPreauth-roam/eaptls-preauth-1.conf    |  2 +-
 autotests/testScan/ssid_8021x.conf            |  2 +-
 147 files changed, 37 insertions(+), 2189 deletions(-)
 delete mode 100644 autotests/misc/certs/eap-user-tls.text
 delete mode 100644 autotests/misc/certs/eap-user-ttls-mschapv2.text
 delete mode 100644 autotests/misc/certs/eap-user-ttls.text
 delete mode 100644 autotests/misc/secrets/eap-user-mschapv2.text
 delete mode 100644 autotests/misc/secrets/eap-user-peap-mschapv2.text
 delete mode 100644 autotests/misc/secrets/eap-user-peap-sim.text
 delete mode 100644 autotests/misc/secrets/eap-user-peap-v0-mschapv2.text
 delete mode 100644 autotests/misc/secrets/eap-user-peap-v0.text
 delete mode 100644 autotests/misc/secrets/eap-user-peap-v1.text
 delete mode 100644 autotests/testEAP-AKA-ofono/connection_test.py
 delete mode 100644 autotests/testEAP-AKA-ofono/hw.conf
 delete mode 100644 autotests/testEAP-AKA-ofono/sim.db
 delete mode 100644 autotests/testEAP-AKA-ofono/sim.eap_user
 delete mode 100644 autotests/testEAP-AKA-ofono/ssidEAP-AKA.8021x
 delete mode 100644 autotests/testEAP-AKA-ofono/ssidEAP-AKA.conf
 delete mode 100644 autotests/testEAP-AKA-prime-ofono/connection_test.py
 delete mode 100644 autotests/testEAP-AKA-prime-ofono/hw.conf
 delete mode 100644 autotests/testEAP-AKA-prime-ofono/sim.db
 delete mode 100644 autotests/testEAP-AKA-prime-ofono/sim.eap_user
 delete mode 100644 autotests/testEAP-AKA-prime-ofono/ssidEAP-AKA.8021x
 delete mode 100644 autotests/testEAP-AKA-prime-ofono/ssidEAP-AKA.conf
 delete mode 100644 autotests/testEAP-MSCHAPV2/connection_test.py
 delete mode 100644 autotests/testEAP-MSCHAPV2/hw.conf
 delete mode 100644 autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-1.8021x
 delete mode 100644 autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-2.8021x
 delete mode 100644 autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-3.8021x
 delete mode 100644 autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-4.8021x
 delete mode 100644 autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2.conf
 delete mode 100644 autotests/testEAP-PEAP-GTC/eap-user-peap-gtc.text
 delete mode 100644 autotests/testEAP-PEAP-GTC/hw.conf
 delete mode 100644 autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py
 delete mode 100644 autotests/testEAP-PEAP-GTC/peap_gtc_test.py
 delete mode 100644 autotests/testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC-nosecret.8021x
 delete mode 100644 autotests/testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC-nosecret.conf
 delete mode 100644 autotests/testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC.8021x
 delete mode 100644 autotests/testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC.conf
 delete mode 100644 autotests/testEAP-PEAP-MSCHAPv2/connection_test.py
 delete mode 100644 autotests/testEAP-PEAP-MSCHAPv2/hw.conf
 delete mode 100644 autotests/testEAP-PEAP-MSCHAPv2/ssidEAP-PEAP-MSCHAPv2.8021x
 delete mode 100644 autotests/testEAP-PEAP-MSCHAPv2/ssidEAP-PEAP-MSCHAPv2.conf
 delete mode 100644 autotests/testEAP-PEAP-SIM/connection_test.py
 delete mode 100644 autotests/testEAP-PEAP-SIM/hw.conf
 delete mode 100644 autotests/testEAP-PEAP-SIM/sim.db
 delete mode 100644 autotests/testEAP-PEAP-SIM/sim.eap_user
 delete mode 100644 autotests/testEAP-PEAP-SIM/ssidEAP-PEAP-SIM.8021x
 delete mode 100644 autotests/testEAP-PEAP-SIM/ssidEAP-PEAP-SIM.conf
 delete mode 100644 autotests/testEAP-PEAP/IWD-Frag/main.conf
 delete mode 100644 autotests/testEAP-PEAP/hw.conf
 delete mode 100644 autotests/testEAP-PEAP/peap_frag_test.py
 delete mode 100644 autotests/testEAP-PEAP/peap_v0_test.py
 delete mode 100644 autotests/testEAP-PEAP/peap_v1_test.py
 delete mode 100644 autotests/testEAP-PEAP/ssidEAP-PEAP-frag.8021x
 delete mode 100644 autotests/testEAP-PEAP/ssidEAP-PEAP-frag.conf
 delete mode 100644 autotests/testEAP-PEAP/ssidEAP-PEAPv0.8021x
 delete mode 100644 autotests/testEAP-PEAP/ssidEAP-PEAPv0.conf
 delete mode 100644 autotests/testEAP-PEAP/ssidEAP-PEAPv1.8021x
 delete mode 100644 autotests/testEAP-PEAP/ssidEAP-PEAPv1.conf
 delete mode 100644 autotests/testEAP-PWD/IWD-Frag/main.conf
 delete mode 100644 autotests/testEAP-PWD/connection_test.py
 delete mode 100644 autotests/testEAP-PWD/frag_test.py
 delete mode 100644 autotests/testEAP-PWD/hw.conf
 delete mode 100644 autotests/testEAP-PWD/pwd.eap_user
 delete mode 100644 autotests/testEAP-PWD/ssidEAP-PWD-frag.8021x
 delete mode 100644 autotests/testEAP-PWD/ssidEAP-PWD-frag.conf
 delete mode 100644 autotests/testEAP-PWD/ssidEAP-PWD.8021x
 delete mode 100644 autotests/testEAP-PWD/ssidEAP-PWD.conf
 delete mode 100644 autotests/testEAP-SIM-ofono/connection_test.py
 delete mode 100644 autotests/testEAP-SIM-ofono/hw.conf
 delete mode 100644 autotests/testEAP-SIM-ofono/sim.db
 delete mode 100644 autotests/testEAP-SIM-ofono/sim.eap_user
 delete mode 100644 autotests/testEAP-SIM-ofono/ssidEAP-SIM.8021x
 delete mode 100644 autotests/testEAP-SIM-ofono/ssidEAP-SIM.conf
 delete mode 100644 autotests/testEAP-TLS-embedded-pems/connection_test.py
 delete mode 100644 autotests/testEAP-TLS-embedded-pems/hw.conf
 delete mode 100644 autotests/testEAP-TLS-embedded-pems/ssidEAP-TLS.8021x
 delete mode 100644 autotests/testEAP-TLS-embedded-pems/ssidEAP-TLS.conf
 delete mode 100644 autotests/testEAP-TLS/connection_test.py
 delete mode 100644 autotests/testEAP-TLS/hw.conf
 delete mode 100644 autotests/testEAP-TLS/ssidEAP-TLS.8021x
 delete mode 100644 autotests/testEAP-TLS/ssidEAP-TLS.conf
 delete mode 100644 autotests/testEAP-TLS/ssidEAP-TLS2.8021x
 delete mode 100644 autotests/testEAP-TLS/ssidEAP-TLS2.conf
 delete mode 100644 autotests/testEAP-TLS/ssidEAP-TLS3.8021x
 delete mode 100644 autotests/testEAP-TLS/ssidEAP-TLS3.conf
 delete mode 100644 autotests/testEAP-TLS/ssidEAP-TLS4.8021x
 delete mode 100644 autotests/testEAP-TLS/ssidEAP-TLS4.conf
 delete mode 100644 autotests/testEAP-TTLS-CHAP/connection_test.py
 delete mode 100644 autotests/testEAP-TTLS-CHAP/eap-user-ttls-chap.text
 delete mode 100644 autotests/testEAP-TTLS-CHAP/hw.conf
 delete mode 100644 autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.8021x
 delete mode 100644 autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.conf
 delete mode 100644 autotests/testEAP-TTLS-EAP-MSCHAPV2/connection_test.py
 delete mode 100644 autotests/testEAP-TTLS-EAP-MSCHAPV2/hw.conf
 delete mode 100644 autotests/testEAP-TTLS-EAP-MSCHAPV2/ssidEAP-TTLS.8021x
 delete mode 100644 autotests/testEAP-TTLS-EAP-MSCHAPV2/ssidEAP-TTLS.conf
 delete mode 100644 autotests/testEAP-TTLS-MSCHAP/connection_test.py
 delete mode 100644 autotests/testEAP-TTLS-MSCHAP/eap-user-ttls-mschap.text
 delete mode 100644 autotests/testEAP-TTLS-MSCHAP/hw.conf
 delete mode 100644 autotests/testEAP-TTLS-MSCHAP/ssidEAP-TTLS-MSCHAP.8021x
 delete mode 100644 autotests/testEAP-TTLS-MSCHAP/ssidEAP-TTLS-MSCHAP.conf
 delete mode 100644 autotests/testEAP-TTLS-MSCHAPv2/connection_test.py
 delete mode 100644 autotests/testEAP-TTLS-MSCHAPv2/eap-user-ttls-mschapv2.text
 delete mode 100644 autotests/testEAP-TTLS-MSCHAPv2/failure_test.py
 delete mode 100644 autotests/testEAP-TTLS-MSCHAPv2/hw.conf
 delete mode 100644 autotests/testEAP-TTLS-MSCHAPv2/ssidEAP-TTLS-MSCHAPv2.8021x
 delete mode 100644 autotests/testEAP-TTLS-MSCHAPv2/ssidEAP-TTLS-MSCHAPv2.conf
 delete mode 100644 autotests/testEAP-TTLS-PAP/connection_test.py
 delete mode 100644 autotests/testEAP-TTLS-PAP/eap-user-ttls-pap.text
 delete mode 100644 autotests/testEAP-TTLS-PAP/hw.conf
 delete mode 100644 autotests/testEAP-TTLS-PAP/ssidEAP-TTLS-PAP.8021x
 delete mode 100644 autotests/testEAP-TTLS-PAP/ssidEAP-TTLS-PAP.conf
 delete mode 100644 autotests/testEAP-TTLS/connection_test.py
 delete mode 100644 autotests/testEAP-TTLS/hw.conf
 delete mode 100644 autotests/testEAP-TTLS/ssidEAP-TTLS.8021x
 delete mode 100644 autotests/testEAP-TTLS/ssidEAP-TTLS.conf
 delete mode 100644 autotests/testFILS/pwd.eap_user
 delete mode 100644 autotests/testFT-FILS/pwd.eap_user
autotests/misc/certs/eap-user-tls.text deleted +0 -4
deleted file mode 100644
index b8b1e8d4..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* TLS
-# Phase 2
-"abc(a)example.com" MD5 "testpasswd" [2]
autotests/misc/certs/eap-user-ttls-mschapv2.text deleted +0 -4
deleted file mode 100644
index df210e49..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* TTLS
-# Phase 2
-"user" MSCHAPV2 "testpasswd" [2]
autotests/misc/certs/eap-user-ttls.text deleted +0 -4
deleted file mode 100644
index b26becf2..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* TTLS
-# Phase 2
-"abc(a)example.com" MD5 "testpasswd" [2]
autotests/misc/secrets/eap-user-mschapv2.text deleted +0 -1
deleted file mode 100644
index b18410d3..00000000
@@ -1 +0,0 @@
-"domain\User" MSCHAPV2 "Password"
autotests/misc/secrets/eap-user-peap-mschapv2.text deleted +0 -4
deleted file mode 100644
index 892670d8..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* PEAP
-# Phase 2
-"domain\User" MSCHAPV2 "Password" [2]
autotests/misc/secrets/eap-user-peap-sim.text deleted +0 -4
deleted file mode 100644
index 76820116..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-*	PEAP
-# Phase 2
-"112345678(a)phonesim.org"	SIM	[2]
autotests/misc/secrets/eap-user-peap-v0-mschapv2.text deleted +0 -4
deleted file mode 100644
index c91693c4..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* PEAP [ver=0]
-# Phase 2
-"secure(a)identity.com" MSCHAPV2 "testpasswd" [2]
autotests/misc/secrets/eap-user-peap-v0.text deleted +0 -4
deleted file mode 100644
index 339373c3..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* PEAP [ver=0]
-# Phase 2
-"secure(a)identity.com" MD5 "testpasswd" [2]
autotests/misc/secrets/eap-user-peap-v1.text deleted +0 -4
deleted file mode 100644
index 9b349530..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* PEAP [ver=1]
-# Phase 2
-"secure(a)identity.com" MD5 "testpasswd" [2]
autotests/testConnectAutoconnect/ssidEAP-Other.conf +1 -1
index 5e327911..5ccb61d1 100644
@@ -6,7 +6,7 @@ wpa=3
 wpa_key_mgmt=WPA-EAP
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-ttls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testConnectAutoconnect/ssidEAP-TLS.8021x +1 -1
index fe8a2e46..a64b883c 100644
@@ -3,4 +3,4 @@ EAP-Method=TLS
 EAP-TLS-CACert=/tmp/certs/cert-ca.pem
 EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
 EAP-TLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-Identity=abc(a)example.com
+EAP-Identity=tls(a)example.com
autotests/testConnectAutoconnect/ssidEAP-TLS.conf +1 -1
index e1d7c6b4..f6363dfa 100644
@@ -6,7 +6,7 @@ wpa=3
 wpa_key_mgmt=WPA-EAP
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testEAD/default.8021x +1 -1
index 55eb431d..3aba560c 100644
@@ -1,6 +1,6 @@
 [Security]
 EAP-Method=MSCHAPV2
-EAP-Identity=domain\\User
+EAP-Identity=mschapv2(a)example.com
 EAP-Password=Password
 
 [Settings]
autotests/testEAD/wired.conf +1 -1
index 9e6ef638..6b44d190 100644
@@ -13,5 +13,5 @@ nas_identifier=ap.example.com
 radius_server_clients=/tmp/certs/radius-clients.text
 radius_server_auth_port=1812
 
-eap_user_file=/tmp/secrets/eap-user-mschapv2.text
+eap_user_file=/tmp/secrets/eap-user.text
 eap_server=1
autotests/testEAP-AKA-ofono/connection_test.py deleted +0 -59

59 lines not on this page · raw message

autotests/testEAP-AKA-ofono/hw.conf deleted +0 -6
deleted file mode 100644
index a4555c6f..00000000
@@ -1,6 +0,0 @@
-[SETUP]
-num_radios=2
-sim_keys=ofono
-
-[HOSTAPD]
-rad0=ssidEAP-AKA.conf
autotests/testEAP-AKA-ofono/sim.db deleted +0 -3
deleted file mode 100644
index c4461ae1..00000000
@@ -1,3 +0,0 @@
-# IMSI K OPC AMF SQN
-
-12345678:90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:61df:000000000021
\ No newline at end of file
autotests/testEAP-AKA-ofono/sim.eap_user deleted +0 -1
deleted file mode 100644
index 123d8c9c..00000000
@@ -1 +0,0 @@
-"012345678(a)phonesim.org"	AKA
autotests/testEAP-AKA-ofono/ssidEAP-AKA.8021x deleted +0 -5
deleted file mode 100644
index 304eb276..00000000
@@ -1,5 +0,0 @@
-[Security]
-EAP-Method=AKA
-
-[Settings]
-AutoConnect=false
autotests/testEAP-AKA-ofono/ssidEAP-AKA.conf deleted +0 -16
deleted file mode 100644
index 01f01f45..00000000
@@ -1,16 +0,0 @@
-hw_mode=g
-channel=1
-
-driver=nl80211
-ieee8021x=1
-eap_server=1
-ssid=ssidEAP-AKA
-eap_user_file=/tmp/sim.eap_user
-eap_sim_db=unix:/tmp/hlrauc.sock
-wpa=2
-wpa_key_mgmt=WPA-EAP
-wpa_pairwise=TKIP CCMP
-rsn_pairwise=CCMP TKIP
-wpa_passphrase=secret123
-channel=1
-eap_sim_aka_result_ind=1
autotests/testEAP-AKA-prime-ofono/connection_test.py deleted +0 -58

58 lines not on this page · raw message

autotests/testEAP-AKA-prime-ofono/hw.conf deleted +0 -6
deleted file mode 100644
index a4555c6f..00000000
@@ -1,6 +0,0 @@
-[SETUP]
-num_radios=2
-sim_keys=ofono
-
-[HOSTAPD]
-rad0=ssidEAP-AKA.conf
autotests/testEAP-AKA-prime-ofono/sim.db deleted +0 -3
deleted file mode 100644
index c4461ae1..00000000
@@ -1,3 +0,0 @@
-# IMSI K OPC AMF SQN
-
-12345678:90dca4eda45b53cf0f12d7c9c3bc6a89:cb9cccc4b9258e6dca4760379fb82581:61df:000000000021
\ No newline at end of file
autotests/testEAP-AKA-prime-ofono/sim.eap_user deleted +0 -1
deleted file mode 100644
index 746c8b25..00000000
@@ -1 +0,0 @@
-"612345678(a)phonesim.org"	AKA'
\ No newline at end of file
autotests/testEAP-AKA-prime-ofono/ssidEAP-AKA.8021x deleted +0 -5
deleted file mode 100644
index 6e88da6b..00000000
@@ -1,5 +0,0 @@
-[Security]
-EAP-Method=AKA'
-
-[Settings]
-AutoConnect=false
autotests/testEAP-AKA-prime-ofono/ssidEAP-AKA.conf deleted +0 -16
deleted file mode 100644
index 01f01f45..00000000
@@ -1,16 +0,0 @@
-hw_mode=g
-channel=1
-
-driver=nl80211
-ieee8021x=1
-eap_server=1
-ssid=ssidEAP-AKA
-eap_user_file=/tmp/sim.eap_user
-eap_sim_db=unix:/tmp/hlrauc.sock
-wpa=2
-wpa_key_mgmt=WPA-EAP
-wpa_pairwise=TKIP CCMP
-rsn_pairwise=CCMP TKIP
-wpa_passphrase=secret123
-channel=1
-eap_sim_aka_result_ind=1
autotests/testEAP-MSCHAPV2/connection_test.py deleted +0 -76

76 lines not on this page · raw message

autotests/testEAP-MSCHAPV2/hw.conf deleted +0 -5
deleted file mode 100644
index b22a2c9f..00000000
@@ -1,5 +0,0 @@
-[SETUP]
-num_radios=2
-
-[HOSTAPD]
-rad0=ssidEAP-MSCHAPV2.conf
autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-1.8021x deleted +0 -7
deleted file mode 100644
index 55eb431d..00000000
@@ -1,7 +0,0 @@
-[Security]
-EAP-Method=MSCHAPV2
-EAP-Identity=domain\\User
-EAP-Password=Password
-
-[Settings]
-AutoConnect=false
autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-2.8021x deleted +0 -7
deleted file mode 100644
index a2c58b33..00000000
@@ -1,7 +0,0 @@
-[Security]
-EAP-Method=MSCHAPV2
-EAP-Identity=domain\\User
-EAP-Password-Hash=a4f49c406510bdcab6824ee7c30fd852
-
-[Settings]
-AutoConnect=false
autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-3.8021x deleted +0 -6
deleted file mode 100644
index 2c18c8fd..00000000
@@ -1,6 +0,0 @@
-[Security]
-EAP-Method=MSCHAPV2
-EAP-Identity=domain\\User
-
-[Settings]
-AutoConnect=false
autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2-4.8021x deleted +0 -5
deleted file mode 100644
index d7528b38..00000000
@@ -1,5 +0,0 @@
-[Security]
-EAP-Method=MSCHAPV2
-
-[Settings]
-AutoConnect=false
autotests/testEAP-MSCHAPV2/ssidEAP-MSCHAPV2.conf deleted +0 -9
deleted file mode 100644
index 3f33e99d..00000000
@@ -1,9 +0,0 @@
-ssid=ssidEAP-MSCHAPV2
-interface=wln0
-hw_mode=g
-channel=1
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/secrets/eap-user-mschapv2.text
autotests/testEAP-PEAP-GTC/eap-user-peap-gtc.text deleted +0 -4
deleted file mode 100644
index 5ec5328e..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* PEAP [ver=1]
-# Phase 2
-"secure(a)identity.com" GTC "testpasswd" [2]
autotests/testEAP-PEAP-GTC/hw.conf deleted +0 -7
deleted file mode 100644
index acca16b0..00000000
@@ -1,7 +0,0 @@
-[SETUP]
-num_radios=3
-start_iwd=0
-
-[HOSTAPD]
-rad0=ssidEAP-PEAPv1-GTC.conf
-rad1=ssidEAP-PEAPv1-GTC-nosecret.conf
autotests/testEAP-PEAP-GTC/peap_gtc_nosecret_test.py deleted +0 -59

59 lines not on this page · raw message

autotests/testEAP-PEAP-GTC/peap_gtc_test.py deleted +0 -51

51 lines not on this page · raw message

autotests/testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC-nosecret.8021x deleted +0 -11
deleted file mode 100644
index 93fff8d6..00000000
@@ -1,11 +0,0 @@
-[Security]
-EAP-Method=PEAP
-EAP-Identity=open(a)identity.com
-EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
-EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
-EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-PEAP-Phase2-Method=GTC
-EAP-PEAP-Phase2-Identity=secure(a)identity.com
-
-[Settings]
-AutoConnect=false
autotests/testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC-nosecret.conf deleted +0 -12
deleted file mode 100644
index a6c36f42..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-PEAPv1-GTC-nosecret
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/eap-user-peap-gtc.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC.8021x deleted +0 -12
deleted file mode 100644
index 42deabac..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=PEAP
-EAP-Identity=open(a)identity.com
-EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
-EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
-EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-PEAP-Phase2-Method=GTC
-EAP-PEAP-Phase2-Identity=secure(a)identity.com
-EAP-PEAP-Phase2-Password=testpasswd
-
-[Settings]
-AutoConnect=false
autotests/testEAP-PEAP-GTC/ssidEAP-PEAPv1-GTC.conf deleted +0 -12
deleted file mode 100644
index ecd498bd..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-PEAPv1-GTC
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/eap-user-peap-gtc.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-PEAP-MSCHAPv2/connection_test.py deleted +0 -52

52 lines not on this page · raw message

autotests/testEAP-PEAP-MSCHAPv2/hw.conf deleted +0 -6
deleted file mode 100644
index 12e11211..00000000
@@ -1,6 +0,0 @@
-[SETUP]
-num_radios=2
-start_iwd=0
-
-[HOSTAPD]
-rad0=ssidEAP-PEAP-MSCHAPv2.conf
autotests/testEAP-PEAP-MSCHAPv2/ssidEAP-PEAP-MSCHAPv2.8021x deleted +0 -12
deleted file mode 100644
index f000ff9a..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=PEAP
-EAP-Identity=open(a)identity.com
-EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
-EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
-EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-PEAP-Phase2-Method=MSCHAPV2
-EAP-PEAP-Phase2-Identity=domain\\User
-EAP-PEAP-Phase2-Password=Password
-
-[Settings]
-AutoConnect=false
autotests/testEAP-PEAP-MSCHAPv2/ssidEAP-PEAP-MSCHAPv2.conf deleted +0 -12
deleted file mode 100644
index e5c5516b..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-PEAP-MSCHAPv2
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/secrets/eap-user-peap-mschapv2.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-PEAP-SIM/connection_test.py deleted +0 -65

65 lines not on this page · raw message

autotests/testEAP-PEAP-SIM/hw.conf deleted +0 -7
deleted file mode 100644
index 659ba0e0..00000000
@@ -1,7 +0,0 @@
-[SETUP]
-num_radios=2
-start_iwd=0
-sim_keys=ofono
-
-[HOSTAPD]
-rad0=ssidEAP-PEAP-SIM.conf
autotests/testEAP-PEAP-SIM/sim.db deleted +0 -1
deleted file mode 100644
index fbf79786..00000000
@@ -1 +0,0 @@
-12345678:673fb8cd35f98800:1fb1e3b5:DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
autotests/testEAP-PEAP-SIM/sim.eap_user deleted +0 -1
deleted file mode 100644
index dabb81a8..00000000
@@ -1 +0,0 @@
-"112345678(a)phonesim.org"	SIM
autotests/testEAP-PEAP-SIM/ssidEAP-PEAP-SIM.8021x deleted +0 -10
deleted file mode 100644
index 6decd1bf..00000000
@@ -1,10 +0,0 @@
-[Security]
-EAP-Method=PEAP
-EAP-Identity=open(a)example.com
-EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
-EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
-EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-PEAP-Phase2-Method=SIM
-
-[Settings]
-AutoConnect=false
autotests/testEAP-PEAP-SIM/ssidEAP-PEAP-SIM.conf deleted +0 -15
deleted file mode 100644
index d0e66bca..00000000
@@ -1,15 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-PEAP-SIM
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/secrets/eap-user-peap-sim.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
-
-eap_sim_db=unix:/tmp/hlrauc.sock
-eap_sim_aka_result_ind=1
autotests/testEAP-PEAP/IWD-Frag/main.conf deleted +0 -2
deleted file mode 100644
index e583733c..00000000
@@ -1,2 +0,0 @@
-[EAP]
-MTU=100
autotests/testEAP-PEAP/hw.conf deleted +0 -8
deleted file mode 100644
index 0dcda0a2..00000000
@@ -1,8 +0,0 @@
-[SETUP]
-num_radios=4
-start_iwd=0
-
-[HOSTAPD]
-rad0=ssidEAP-PEAPv1.conf
-rad1=ssidEAP-PEAPv0.conf
-rad2=ssidEAP-PEAP-frag.conf
autotests/testEAP-PEAP/peap_frag_test.py deleted +0 -50

50 lines not on this page · raw message

autotests/testEAP-PEAP/peap_v0_test.py deleted +0 -50

50 lines not on this page · raw message

autotests/testEAP-PEAP/peap_v1_test.py deleted +0 -50

50 lines not on this page · raw message

autotests/testEAP-PEAP/ssidEAP-PEAP-frag.8021x deleted +0 -12
deleted file mode 100644
index 382f86d0..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=PEAP
-EAP-Identity=open(a)identity.com
-EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
-EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
-EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-PEAP-Phase2-Method=MD5
-EAP-PEAP-Phase2-Identity=secure(a)identity.com
-EAP-PEAP-Phase2-Password=testpasswd
-
-[Settings]
-AutoConnect=false
autotests/testEAP-PEAP/ssidEAP-PEAP-frag.conf deleted +0 -14
deleted file mode 100644
index 28eb36f0..00000000
@@ -1,14 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-PEAP-frag
-
-fragment_size=256
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/secrets/eap-user-peap-v1.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-PEAP/ssidEAP-PEAPv0.8021x deleted +0 -12
deleted file mode 100644
index 382f86d0..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=PEAP
-EAP-Identity=open(a)identity.com
-EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
-EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
-EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-PEAP-Phase2-Method=MD5
-EAP-PEAP-Phase2-Identity=secure(a)identity.com
-EAP-PEAP-Phase2-Password=testpasswd
-
-[Settings]
-AutoConnect=false
autotests/testEAP-PEAP/ssidEAP-PEAPv0.conf deleted +0 -12
deleted file mode 100644
index 5b63e047..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-PEAPv0
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/secrets/eap-user-peap-v0.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-PEAP/ssidEAP-PEAPv1.8021x deleted +0 -12
deleted file mode 100644
index 382f86d0..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=PEAP
-EAP-Identity=open(a)identity.com
-EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
-EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
-EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-PEAP-Phase2-Method=MD5
-EAP-PEAP-Phase2-Identity=secure(a)identity.com
-EAP-PEAP-Phase2-Password=testpasswd
-
-[Settings]
-AutoConnect=false
autotests/testEAP-PEAP/ssidEAP-PEAPv1.conf deleted +0 -12
deleted file mode 100644
index 1c8b2d9b..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-PEAPv1
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/secrets/eap-user-peap-v1.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-PEAPv0-CryptoBinding/ssidEAP-PEAPv0-ISK.8021x +3 -3
index 56eed087..988661c7 100644
@@ -1,12 +1,12 @@
 [Security]
 EAP-Method=PEAP
-EAP-Identity=open(a)identity.com
+EAP-Identity=peapv0(a)example.com
 EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
 EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
 EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
 EAP-PEAP-Phase2-Method=MSCHAPV2
-EAP-PEAP-Phase2-Identity=secure(a)identity.com
-EAP-PEAP-Phase2-Password=testpasswd
+EAP-PEAP-Phase2-Identity=mschapv2-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
 
 [Settings]
 AutoConnect=false
autotests/testEAP-PEAPv0-CryptoBinding/ssidEAP-PEAPv0-ISK.conf +1 -1
index c9980bd9..38ccf1cf 100644
@@ -6,7 +6,7 @@ wpa=3
 wpa_key_mgmt=WPA-EAP
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/secrets/eap-user-peap-v0-mschapv2.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-PEAPv0-CryptoBinding/ssidEAP-PEAPv0-NoISK.8021x +3 -3
index 382f86d0..a34faca6 100644
@@ -1,12 +1,12 @@
 [Security]
 EAP-Method=PEAP
-EAP-Identity=open(a)identity.com
+EAP-Identity=peapv0(a)example.com
 EAP-PEAP-CACert=/tmp/certs/cert-ca.pem
 EAP-PEAP-ClientCert=/tmp/certs/cert-client.pem
 EAP-PEAP-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
 EAP-PEAP-Phase2-Method=MD5
-EAP-PEAP-Phase2-Identity=secure(a)identity.com
-EAP-PEAP-Phase2-Password=testpasswd
+EAP-PEAP-Phase2-Identity=md5-phase2(a)example.com
+EAP-PEAP-Phase2-Password=Password
 
 [Settings]
 AutoConnect=false
autotests/testEAP-PEAPv0-CryptoBinding/ssidEAP-PEAPv0-NoISK.conf +1 -1
index b92bb1ae..878602a9 100644
@@ -6,7 +6,7 @@ wpa=3
 wpa_key_mgmt=WPA-EAP
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/secrets/eap-user-peap-v0.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-PWD/IWD-Frag/main.conf deleted +0 -2
deleted file mode 100644
index 161764bf..00000000
@@ -1,2 +0,0 @@
-[EAP]
-MTU=40
autotests/testEAP-PWD/connection_test.py deleted +0 -70

70 lines not on this page · raw message

autotests/testEAP-PWD/frag_test.py deleted +0 -49

49 lines not on this page · raw message

autotests/testEAP-PWD/hw.conf deleted +0 -7
deleted file mode 100644
index 40427c13..00000000
@@ -1,7 +0,0 @@
-[SETUP]
-num_radios=3
-start_iwd=0
-
-[HOSTAPD]
-rad0=ssidEAP-PWD.conf
-rad1=ssidEAP-PWD-frag.conf
autotests/testEAP-PWD/pwd.eap_user deleted +0 -1
deleted file mode 100644
index 4ce84c87..00000000
@@ -1 +0,0 @@
-"eap-pwd-identity"	PWD     "secret123"
autotests/testEAP-PWD/ssidEAP-PWD-frag.8021x deleted +0 -7
deleted file mode 100644
index e5c3fedb..00000000
@@ -1,7 +0,0 @@
-[Security]
-EAP-Method=PWD
-EAP-Identity=eap-pwd-identity
-EAP-Password=secret123
-
-[Settings]
-AutoConnect=false
autotests/testEAP-PWD/ssidEAP-PWD-frag.conf deleted +0 -16
deleted file mode 100644
index f07375dc..00000000
@@ -1,16 +0,0 @@
-hw_mode=g
-channel=1
-
-driver=nl80211
-ieee8021x=1
-eap_server=1
-ssid=ssidEAP-PWD-frag
-eap_user_file=/tmp/pwd.eap_user
-wpa=2
-wpa_key_mgmt=WPA-EAP
-wpa_pairwise=TKIP CCMP
-rsn_pairwise=CCMP TKIP
-wpa_passphrase=secret123
-channel=1
-pwd_group=19
-fragment_size=80
autotests/testEAP-PWD/ssidEAP-PWD.8021x deleted +0 -6
deleted file mode 100644
index d325acea..00000000
@@ -1,6 +0,0 @@
-[Security]
-EAP-Method=PWD
-EAP-Identity=eap-pwd-identity
-
-[Settings]
-AutoConnect=false
autotests/testEAP-PWD/ssidEAP-PWD.conf deleted +0 -15
deleted file mode 100644
index 54b1d834..00000000
@@ -1,15 +0,0 @@
-hw_mode=g
-channel=1
-
-driver=nl80211
-ieee8021x=1
-eap_server=1
-ssid=ssidEAP-PWD
-eap_user_file=/tmp/pwd.eap_user
-wpa=2
-wpa_key_mgmt=WPA-EAP
-wpa_pairwise=TKIP CCMP
-rsn_pairwise=CCMP TKIP
-wpa_passphrase=secret123
-
-pwd_group=20
autotests/testEAP-SIM-ofono/connection_test.py deleted +0 -60

60 lines not on this page · raw message

autotests/testEAP-SIM-ofono/hw.conf deleted +0 -6
deleted file mode 100644
index 0255b153..00000000
@@ -1,6 +0,0 @@
-[SETUP]
-num_radios=2
-sim_keys=ofono
-
-[HOSTAPD]
-rad0=ssidEAP-SIM.conf
autotests/testEAP-SIM-ofono/sim.db deleted +0 -1
deleted file mode 100644
index d1aaff15..00000000
@@ -1 +0,0 @@
-12345678:673fb8cd35f98800:1fb1e3b5:DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
\ No newline at end of file
autotests/testEAP-SIM-ofono/sim.eap_user deleted +0 -1
deleted file mode 100644
index 46d8bd8e..00000000
@@ -1 +0,0 @@
-"112345678(a)phonesim.org"	SIM
\ No newline at end of file
autotests/testEAP-SIM-ofono/ssidEAP-SIM.8021x deleted +0 -5
deleted file mode 100644
index 1dcdbcb6..00000000
@@ -1,5 +0,0 @@
-[Security]
-EAP-Method=SIM
-
-[Settings]
-AutoConnect=false
autotests/testEAP-SIM-ofono/ssidEAP-SIM.conf deleted +0 -16
deleted file mode 100644
index 6071e301..00000000
@@ -1,16 +0,0 @@
-hw_mode=g
-channel=1
-
-driver=nl80211
-ieee8021x=1
-eap_server=1
-ssid=ssidEAP-SIM
-eap_user_file=/tmp/sim.eap_user
-eap_sim_db=unix:/tmp/hlrauc.sock
-wpa=2
-wpa_key_mgmt=WPA-EAP
-wpa_pairwise=TKIP CCMP
-rsn_pairwise=CCMP TKIP
-wpa_passphrase=secret123
-channel=1
-eap_sim_aka_result_ind=1
autotests/testEAP-TLS-Frag/ssidEAP-TLS.8021x +1 -1
index 7908545f..88c622ad 100644
@@ -3,7 +3,7 @@ EAP-Method=TLS
 EAP-TLS-CACert=/tmp/certs/cert-ca.pem
 EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
 EAP-TLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-Identity=abc(a)example.com
+EAP-Identity=tls(a)example.com
 
 [Settings]
 AutoConnect=False
autotests/testEAP-TLS-Frag/ssidEAP-TLS.conf +1 -1
index 445e4d80..64ab9677 100644
@@ -8,7 +8,7 @@ wpa=3
 wpa_key_mgmt=WPA-EAP
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TLS-embedded-pems/connection_test.py deleted +0 -62

62 lines not on this page · raw message

autotests/testEAP-TLS-embedded-pems/hw.conf deleted +0 -5
deleted file mode 100644
index fba8466c..00000000
@@ -1,5 +0,0 @@
-[SETUP]
-num_radios=2
-
-[HOSTAPD]
-rad0=ssidEAP-TLS.conf
autotests/testEAP-TLS-embedded-pems/ssidEAP-TLS.8021x deleted +0 -94

94 lines not on this page · raw message

autotests/testEAP-TLS-embedded-pems/ssidEAP-TLS.conf deleted +0 -12
deleted file mode 100644
index e1d7c6b4..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-TLS
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TLS/connection_test.py deleted +0 -74

74 lines not on this page · raw message

autotests/testEAP-TLS/hw.conf deleted +0 -8
deleted file mode 100644
index 03ded83a..00000000
@@ -1,8 +0,0 @@
-[SETUP]
-num_radios=5
-
-[HOSTAPD]
-rad0=ssidEAP-TLS.conf
-rad1=ssidEAP-TLS2.conf
-rad2=ssidEAP-TLS3.conf
-rad3=ssidEAP-TLS4.conf
autotests/testEAP-TLS/ssidEAP-TLS.8021x deleted +0 -9
deleted file mode 100644
index 7908545f..00000000
@@ -1,9 +0,0 @@
-[Security]
-EAP-Method=TLS
-EAP-TLS-CACert=/tmp/certs/cert-ca.pem
-EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
-EAP-TLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-Identity=abc(a)example.com
-
-[Settings]
-AutoConnect=False
autotests/testEAP-TLS/ssidEAP-TLS.conf deleted +0 -13
deleted file mode 100644
index b14ea423..00000000
@@ -1,13 +0,0 @@
-ctrl_interface=/var/run/hostapd
-hw_mode=g
-channel=1
-ssid=ssidEAP-TLS
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TLS/ssidEAP-TLS2.8021x deleted +0 -10
deleted file mode 100644
index 3f5b0012..00000000
@@ -1,10 +0,0 @@
-[Security]
-EAP-Method=TLS
-EAP-TLS-CACert=/tmp/certs/cert-ca.pem
-EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
-EAP-TLS-ClientKey=/tmp/certs/cert-client-key-md5-des.pem
-EAP-TLS-ClientKeyPassphrase=abc
-EAP-Identity=abc(a)example.com
-
-[Settings]
-AutoConnect=False
autotests/testEAP-TLS/ssidEAP-TLS2.conf deleted +0 -13
deleted file mode 100644
index 6a811deb..00000000
@@ -1,13 +0,0 @@
-ctrl_interface=/var/run/hostapd
-hw_mode=g
-channel=2
-ssid=ssidEAP-TLS2
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TLS/ssidEAP-TLS3.8021x deleted +0 -9
deleted file mode 100644
index 03d571e9..00000000
@@ -1,9 +0,0 @@
-[Security]
-EAP-Method=TLS
-EAP-TLS-CACert=/tmp/certs/cert-ca.pem
-EAP-TLS-ClientCert=/tmp/certs/cert-client.crt
-EAP-TLS-ClientKey=/tmp/certs/cert-client-key-v2-des-ede3.pem
-EAP-Identity=abc(a)example.com
-
-[Settings]
-AutoConnect=False
autotests/testEAP-TLS/ssidEAP-TLS3.conf deleted +0 -13
deleted file mode 100644
index 3a5f70bf..00000000
@@ -1,13 +0,0 @@
-ctrl_interface=/var/run/hostapd
-hw_mode=g
-channel=3
-ssid=ssidEAP-TLS3
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TLS/ssidEAP-TLS4.8021x deleted +0 -9
deleted file mode 100644
index 61523310..00000000
@@ -1,9 +0,0 @@
-[Security]
-EAP-Method=TLS
-EAP-TLS-CACert=/tmp/certs/cert-ca.pem
-EAP-TLS-ClientKeyBundle=/tmp/certs/cert-client.p12
-EAP-TLS-ClientKeyPassphrase=abc
-EAP-Identity=abc(a)example.com
-
-[Settings]
-AutoConnect=False
autotests/testEAP-TLS/ssidEAP-TLS4.conf deleted +0 -13
deleted file mode 100644
index 41c63c95..00000000
@@ -1,13 +0,0 @@
-ctrl_interface=/var/run/hostapd
-hw_mode=g
-channel=4
-ssid=ssidEAP-TLS4
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TLSwithMFPC/ssidEAP-TLS.8021x +1 -1
index 7908545f..88c622ad 100644
@@ -3,7 +3,7 @@ EAP-Method=TLS
 EAP-TLS-CACert=/tmp/certs/cert-ca.pem
 EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
 EAP-TLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-Identity=abc(a)example.com
+EAP-Identity=tls(a)example.com
 
 [Settings]
 AutoConnect=False
autotests/testEAP-TLSwithMFPC/ssidEAP-TLS.conf +1 -1
index f97a7294..2ffd41be 100644
@@ -5,7 +5,7 @@ ssid=ssidEAP-TLS
 wpa=2
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TLSwithMFPR/ssidEAP-TLS.8021x +1 -1
index 7908545f..88c622ad 100644
@@ -3,7 +3,7 @@ EAP-Method=TLS
 EAP-TLS-CACert=/tmp/certs/cert-ca.pem
 EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
 EAP-TLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-Identity=abc(a)example.com
+EAP-Identity=tls(a)example.com
 
 [Settings]
 AutoConnect=False
autotests/testEAP-TLSwithMFPR/ssidEAP-TLS.conf +1 -1
index 28d5d5eb..7653dbe6 100644
@@ -5,7 +5,7 @@ ssid=ssidEAP-TLS
 wpa=2
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TTLS-CHAP/connection_test.py deleted +0 -68

68 lines not on this page · raw message

autotests/testEAP-TTLS-CHAP/eap-user-ttls-chap.text deleted +0 -4
deleted file mode 100644
index b10868ad..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* TTLS
-# Phase 2
-"user" TTLS-CHAP "testpasswd" [2]
autotests/testEAP-TTLS-CHAP/hw.conf deleted +0 -5
deleted file mode 100644
index c209fa4e..00000000
@@ -1,5 +0,0 @@
-[SETUP]
-num_radios=2
-
-[HOSTAPD]
-rad0=ssidEAP-TTLS-CHAP.conf
autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.8021x deleted +0 -12
deleted file mode 100644
index 5c44947a..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=TTLS
-EAP-Identity=anonymous
-EAP-TTLS-Phase2-Method=Tunneled-CHAP
-
-# If CHAP Identity and Password are left out, they will be requested through
-# the agent.
-#EAP-TTLS-Phase2-Identity=user
-#EAP-TTLS-Phase2-Password=testpasswd
-
-[Settings]
-AutoConnect=False
autotests/testEAP-TTLS-CHAP/ssidEAP-TTLS-CHAP.conf deleted +0 -12
deleted file mode 100644
index babf6dbd..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-TTLS-CHAP
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/eap-user-ttls-chap.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TTLS-EAP-MSCHAPV2/connection_test.py deleted +0 -55

55 lines not on this page · raw message

autotests/testEAP-TTLS-EAP-MSCHAPV2/hw.conf deleted +0 -5
deleted file mode 100644
index 8cef6a61..00000000
@@ -1,5 +0,0 @@
-[SETUP]
-num_radios=2
-
-[HOSTAPD]
-rad0=ssidEAP-TTLS.conf
autotests/testEAP-TTLS-EAP-MSCHAPV2/ssidEAP-TTLS.8021x deleted +0 -8
deleted file mode 100644
index b89a2671..00000000
@@ -1,8 +0,0 @@
-[Security]
-EAP-Method=TTLS
-EAP-Identity=abc(a)example.com
-EAP-TTLS-CACert=/tmp/certs/cert-ca.pem
-EAP-TTLS-ClientCert=/tmp/certs/cert-client.pem
-EAP-TTLS-ClientKey=/tmp/certs/cert-client-key-v2-des-ede3.pem
-EAP-TTLS-Phase2-Method=MSCHAPV2
-EAP-TTLS-Phase2-Identity=user
autotests/testEAP-TTLS-EAP-MSCHAPV2/ssidEAP-TTLS.conf deleted +0 -12
deleted file mode 100644
index 0803bc1e..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-TTLS
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/certs/eap-user-ttls-mschapv2.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TTLS-Frag/ssidEAP-TTLS.8021x +3 -3
index 911490b5..f789fe42 100644
@@ -1,12 +1,12 @@
 [Security]
 EAP-Method=TTLS
-EAP-Identity=abc(a)example.com
+EAP-Identity=ttls(a)example.com
 EAP-TTLS-CACert=/tmp/certs/cert-ca.pem
 EAP-TTLS-ClientCert=/tmp/certs/cert-client.pem
 EAP-TTLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
 EAP-TTLS-Phase2-Method=MD5
-EAP-TTLS-Phase2-Identity=abc(a)example.com
-EAP-TTLS-Phase2-Password=testpasswd
+EAP-TTLS-Phase2-Identity=md5-phase2(a)example.com
+EAP-TTLS-Phase2-Password=Password
 
 [Settings]
 AutoConnect=False
autotests/testEAP-TTLS-Frag/ssidEAP-TTLS.conf +1 -1
index 8ca33599..fb177c57 100644
@@ -8,7 +8,7 @@ wpa=3
 wpa_key_mgmt=WPA-EAP
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-ttls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TTLS-MSCHAP/connection_test.py deleted +0 -68

68 lines not on this page · raw message

autotests/testEAP-TTLS-MSCHAP/eap-user-ttls-mschap.text deleted +0 -4
deleted file mode 100644
index ddb14b93..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* TTLS
-# Phase 2
-"user" TTLS-MSCHAP "testpasswd" [2]
autotests/testEAP-TTLS-MSCHAP/hw.conf deleted +0 -5
deleted file mode 100644
index cffb804b..00000000
@@ -1,5 +0,0 @@
-[SETUP]
-num_radios=2
-
-[HOSTAPD]
-rad0=ssidEAP-TTLS-MSCHAP.conf
autotests/testEAP-TTLS-MSCHAP/ssidEAP-TTLS-MSCHAP.8021x deleted +0 -12
deleted file mode 100644
index 4eaa9a60..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=TTLS
-EAP-Identity=anonymous
-EAP-TTLS-Phase2-Method=Tunneled-MSCHAP
-
-# If MSCHAP Identity and Password are left out, they will be requested through
-# the agent.
-#EAP-TTLS-Phase2-Identity=user
-#EAP-TTLS-Phase2-Password=testpasswd
-
-[Settings]
-AutoConnect=False
autotests/testEAP-TTLS-MSCHAP/ssidEAP-TTLS-MSCHAP.conf deleted +0 -12
deleted file mode 100644
index 1aef9fbe..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-TTLS-MSCHAP
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/eap-user-ttls-mschap.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TTLS-MSCHAPv2/connection_test.py deleted +0 -72

72 lines not on this page · raw message

autotests/testEAP-TTLS-MSCHAPv2/eap-user-ttls-mschapv2.text deleted +0 -4
deleted file mode 100644
index 6acbdede..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* TTLS
-# Phase 2
-"domain\user" TTLS-MSCHAPV2 "testpasswd" [2]
autotests/testEAP-TTLS-MSCHAPv2/failure_test.py deleted +0 -57

57 lines not on this page · raw message

autotests/testEAP-TTLS-MSCHAPv2/hw.conf deleted +0 -6
deleted file mode 100644
index 856678b6..00000000
@@ -1,6 +0,0 @@
-[SETUP]
-num_radios=2
-start_iwd=False
-
-[HOSTAPD]
-rad0=ssidEAP-TTLS-MSCHAPv2.conf
autotests/testEAP-TTLS-MSCHAPv2/ssidEAP-TTLS-MSCHAPv2.8021x deleted +0 -12
deleted file mode 100644
index cafc4b5f..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=TTLS
-EAP-Identity=anonymous
-EAP-TTLS-Phase2-Method=Tunneled-MSCHAPv2
-
-# If MSCHAP Identity and Password are left out, they will be requested through
-# the agent.
-#EAP-TTLS-Phase2-Identity=user
-#EAP-TTLS-Phase2-Password=testpasswd
-
-[Settings]
-AutoConnect=False
autotests/testEAP-TTLS-MSCHAPv2/ssidEAP-TTLS-MSCHAPv2.conf deleted +0 -12
deleted file mode 100644
index 968589e4..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-TTLS-MSCHAPv2
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/eap-user-ttls-mschapv2.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TTLS-PAP/connection_test.py deleted +0 -68

68 lines not on this page · raw message

autotests/testEAP-TTLS-PAP/eap-user-ttls-pap.text deleted +0 -4
deleted file mode 100644
index 76b39b59..00000000
@@ -1,4 +0,0 @@
-# Phase 1 users
-* TTLS
-# Phase 2
-"user" TTLS-PAP "testpasswd" [2]
autotests/testEAP-TTLS-PAP/hw.conf deleted +0 -5
deleted file mode 100644
index dccfb229..00000000
@@ -1,5 +0,0 @@
-[SETUP]
-num_radios=2
-
-[HOSTAPD]
-rad0=ssidEAP-TTLS-PAP.conf
autotests/testEAP-TTLS-PAP/ssidEAP-TTLS-PAP.8021x deleted +0 -12
deleted file mode 100644
index 8ff686ed..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=TTLS
-EAP-Identity=anonymous
-EAP-TTLS-Phase2-Method=Tunneled-PAP
-
-# If PAP Identity and Password are left out, they will be requested through
-# the agent.
-#EAP-TTLS-Phase2-Identity=user
-#EAP-TTLS-Phase2-Password=testpasswd
-
-[Settings]
-AutoConnect=False
autotests/testEAP-TTLS-PAP/ssidEAP-TTLS-PAP.conf deleted +0 -12
deleted file mode 100644
index 0f5103a7..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-TTLS-PAP
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/eap-user-ttls-pap.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testEAP-TTLS/connection_test.py deleted +0 -49

49 lines not on this page · raw message

autotests/testEAP-TTLS/hw.conf deleted +0 -5
deleted file mode 100644
index 8cef6a61..00000000
@@ -1,5 +0,0 @@
-[SETUP]
-num_radios=2
-
-[HOSTAPD]
-rad0=ssidEAP-TTLS.conf
autotests/testEAP-TTLS/ssidEAP-TTLS.8021x deleted +0 -12
deleted file mode 100644
index 911490b5..00000000
@@ -1,12 +0,0 @@
-[Security]
-EAP-Method=TTLS
-EAP-Identity=abc(a)example.com
-EAP-TTLS-CACert=/tmp/certs/cert-ca.pem
-EAP-TTLS-ClientCert=/tmp/certs/cert-client.pem
-EAP-TTLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-TTLS-Phase2-Method=MD5
-EAP-TTLS-Phase2-Identity=abc(a)example.com
-EAP-TTLS-Phase2-Password=testpasswd
-
-[Settings]
-AutoConnect=False
autotests/testEAP-TTLS/ssidEAP-TTLS.conf deleted +0 -12
deleted file mode 100644
index 296e9c1a..00000000
@@ -1,12 +0,0 @@
-hw_mode=g
-channel=1
-ssid=ssidEAP-TTLS
-
-wpa=3
-wpa_key_mgmt=WPA-EAP
-ieee8021x=1
-eap_server=1
-eap_user_file=/tmp/certs/eap-user-ttls.text
-ca_cert=/tmp/certs/cert-ca.pem
-server_cert=/tmp/certs/cert-server.pem
-private_key=/tmp/certs/cert-server-key.pem
autotests/testFILS/fils_256_test.py +0 -7
index a9ef3663..62de581b 100644
@@ -7,7 +7,6 @@ import os
 sys.path.append('../util')
 import iwd
 from iwd import IWD
-from iwd import PSKAgent
 from iwd import NetworkType
 from hostapd import HostapdCLI
 import testutil
@@ -18,10 +17,6 @@ class Test(unittest.TestCase):
 
         wd = IWD(True)
 
-        psk_agent = PSKAgent('user(a)example.com', ('user(a)example.com',
-                                                                  'secret123'))
-        wd.register_psk_agent(psk_agent)
-
         devices = wd.list_devices(1)
         device = devices[0]
 
@@ -62,8 +57,6 @@ class Test(unittest.TestCase):
 
         device.disconnect()
 
-        wd.unregister_psk_agent(psk_agent)
-
     @classmethod
     def setUpClass(cls):
         IWD.copy_to_storage('ssidFILS-256.8021x')
autotests/testFILS/fils_384_test.py +0 -7
index b1f0e1c5..8df5554c 100644
@@ -7,7 +7,6 @@ import os
 sys.path.append('../util')
 import iwd
 from iwd import IWD
-from iwd import PSKAgent
 from iwd import NetworkType
 from hostapd import HostapdCLI
 import testutil
@@ -18,10 +17,6 @@ class Test(unittest.TestCase):
 
         wd = IWD(True)
 
-        psk_agent = PSKAgent('user(a)example.com', ('user(a)example.com',
-                                                                  'secret123'))
-        wd.register_psk_agent(psk_agent)
-
         devices = wd.list_devices(1)
         device = devices[0]
 
@@ -62,8 +57,6 @@ class Test(unittest.TestCase):
 
         device.disconnect()
 
-        wd.unregister_psk_agent(psk_agent)
-
     @classmethod
     def setUpClass(cls):
         IWD.copy_to_storage('ssidFILS-384.8021x')
autotests/testFILS/pwd.eap_user deleted +0 -1
deleted file mode 100644
index 69079c24..00000000
@@ -1 +0,0 @@
-"user(a)example.com"	PWD     "secret123"
autotests/testFILS/radius.conf +1 -1
index 4fcfdfff..1ec52e46 100644
@@ -1,7 +1,7 @@
 driver=none
 radius_server_clients=/tmp/certs/radius-clients.text
 radius_server_auth_port=1812
-eap_user_file=/tmp/pwd.eap_user
+eap_user_file=/tmp/secrets/eap-user.text
 eap_server=0
 eap_server_erp=1
 
autotests/testFILS/ssidFILS-256.8021x +2 -0
index db9a053d..8136230e 100644
@@ -1,2 +1,4 @@
 [Security]
 EAP-Method=PWD
+EAP-Identity=pwd(a)example.com
+EAP-Password=Password
autotests/testFILS/ssidFILS-384.8021x +2 -0
index db9a053d..8136230e 100644
@@ -1,2 +1,4 @@
 [Security]
 EAP-Method=PWD
+EAP-Identity=pwd(a)example.com
+EAP-Password=Password
autotests/testFT-8021x-roam/TestFT.8021x +1 -1
index 7908545f..88c622ad 100644
@@ -3,7 +3,7 @@ EAP-Method=TLS
 EAP-TLS-CACert=/tmp/certs/cert-ca.pem
 EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
 EAP-TLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-Identity=abc(a)example.com
+EAP-Identity=tls(a)example.com
 
 [Settings]
 AutoConnect=False
autotests/testFT-8021x-roam/ft-eap-ccmp-1.conf +1 -1
index 936ef22b..a7f220d9 100644
@@ -13,7 +13,7 @@ wpa_key_mgmt=FT-EAP
 wpa_pairwise=CCMP
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testFT-8021x-roam/ft-eap-ccmp-2.conf +1 -1
index 29750ae3..289d7a17 100644
@@ -13,7 +13,7 @@ wpa_key_mgmt=FT-EAP
 wpa_pairwise=CCMP
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testFT-FILS/TestFT.8021x +2 -2
index 3b16769b..22737434 100644
@@ -1,7 +1,7 @@
 [Security]
 EAP-Method=PWD
-EAP-Identity=user(a)example.com
-EAP-Password=secret123
+EAP-Identity=pwd(a)example.com
+EAP-Password=Password
 
 [Settings]
 AutoConnect=False
autotests/testFT-FILS/pwd.eap_user deleted +0 -1
deleted file mode 100644
index 69079c24..00000000
@@ -1 +0,0 @@
-"user(a)example.com"	PWD     "secret123"
autotests/testFT-FILS/radius.conf +1 -1
index 4fcfdfff..1ec52e46 100644
@@ -1,7 +1,7 @@
 driver=none
 radius_server_clients=/tmp/certs/radius-clients.text
 radius_server_auth_port=1812
-eap_user_file=/tmp/pwd.eap_user
+eap_user_file=/tmp/secrets/eap-user.text
 eap_server=0
 eap_server_erp=1
 
autotests/testPreauth-roam/TestPreauth.8021x +1 -1
index 83d48784..584171ff 100644
@@ -3,7 +3,7 @@ EAP-Method=TLS
 EAP-TLS-CACert=/tmp/certs/cert-ca.pem
 EAP-TLS-ClientCert=/tmp/certs/cert-client.pem
 EAP-TLS-ClientKey=/tmp/certs/cert-client-key-pkcs8.pem
-EAP-Identity=abc(a)example.com
+EAP-Identity=tls(a)example.com
 
 [Settings]
 AutoConnect=false
autotests/testPreauth-roam/eaptls-preauth-1.conf +1 -1
index bc808ed7..dac086e6 100644
@@ -13,7 +13,7 @@ ieee80211w=1
 
 # Run the RADIUS server in the BSS 0 hostapd only, listen for BSS 1 connections
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
autotests/testScan/ssid_8021x.conf +1 -1
index 2cb208d4..19b988dd 100644
@@ -6,7 +6,7 @@ wpa=3
 wpa_key_mgmt=WPA-EAP
 ieee8021x=1
 eap_server=1
-eap_user_file=/tmp/certs/eap-user-tls.text
+eap_user_file=/tmp/secrets/eap-user.text
 ca_cert=/tmp/certs/cert-ca.pem
 server_cert=/tmp/certs/cert-server.pem
 private_key=/tmp/certs/cert-server-key.pem
Signature · 1 line
2.31.1
#5 lore raw

PATCH 5/5 test-runner: fix exception in Hostapd __del__

In reply to James Prestwood

If Hostapd did not start there was no CLI instance created and that member should be be accessed.

---
 tools/test-runner | 3 +++
 1 file changed, 3 insertions(+)
tools/test-runner +3 -0
index 895d4299..dc65cca4 100755
@@ -546,6 +546,9 @@ class Hostapd:
 			print("Failed to remove %s" % self.global_ctrl_iface)
 
 		for hapd in self.instances:
+			if not hapd.cli:
+				continue
+
 			hapd.cli._instances[hapd.config] = None
 			hapd.cli = None
 
Signature · 1 line
2.31.1