From: Alan T. DeKok <aland@freeradius.org>
Date: Thu, 4 Mar 2021 22:06:36 +0000 (-0500)
Subject: reformat and normalize eapol_test configuration files
X-Git-Tag: release_3_0_22~165
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4efaaa5a6984a4955dfcb509b8934e8de5ab62e8;p=thirdparty%2Ffreeradius-server.git

reformat and normalize eapol_test configuration files
---

diff --git a/src/tests/eap-fast.conf b/src/tests/eap-fast.conf
index bbe5d87b54..b80f270804 100644
--- a/src/tests/eap-fast.conf
+++ b/src/tests/eap-fast.conf
@@ -1,10 +1,14 @@
 network={
 	key_mgmt=IEEE8021X
 	eap=FAST
-	identity="bob"
+
 	anonymous_identity="anonymous"
+
+	identity="bob"
 	password="bob"
+
 	phase1="tls_disable_session_ticket=0 fast_provisioning=2"
+
 	pac_file="blob://eap-fast-pac"
 
 	ca_cert="../../raddb/certs/ca.pem"
diff --git a/src/tests/eap-md5.conf b/src/tests/eap-md5.conf
index 2d99ce1d44..9e2eca6f78 100644
--- a/src/tests/eap-md5.conf
+++ b/src/tests/eap-md5.conf
@@ -4,6 +4,7 @@
 network={
 	key_mgmt=NONE
 	eap=MD5
+
 	identity="bob"
 	password="bob"
 }
diff --git a/src/tests/eap-mschapv2.conf b/src/tests/eap-mschapv2.conf
index f738bc675d..4afcfd0dd3 100644
--- a/src/tests/eap-mschapv2.conf
+++ b/src/tests/eap-mschapv2.conf
@@ -2,9 +2,9 @@
 #   eapol_test -c eap-mschapv2.conf -s testing123
 #
 network={
-	ssid="example"
-	key_mgmt=WPA-EAP
+	key_mgmt=IEEE8021X
 	eap=MSCHAPV2
+
 	identity="bob"
 	password="bob"
 }
diff --git a/src/tests/eap-pwd.conf b/src/tests/eap-pwd.conf
index 2914b97d7d..a756cc18b9 100644
--- a/src/tests/eap-pwd.conf
+++ b/src/tests/eap-pwd.conf
@@ -1,10 +1,11 @@
 network={
-	ssid="example"
-	key_mgmt=WPA-EAP IEEE8021X
-	pairwise=CCMP
-	group=CCMP
+	key_mgmt=IEEE8021X
 	eap=PWD
+
 	identity="bob"
-	password="hello"
+	password="bob"
+
+	pairwise=CCMP
+	group=CCMP
 	priority=1
 }
diff --git a/src/tests/eap-tls.conf b/src/tests/eap-tls.conf
index e1a49e5722..c88a5596da 100644
--- a/src/tests/eap-tls.conf
+++ b/src/tests/eap-tls.conf
@@ -5,13 +5,15 @@
 #   And make it a LOCAL realm.
 #
 network={
-	key_mgmt=WPA-EAP
+	key_mgmt=IEEE8021X
 	eap=TLS
+
 	identity="user@example.org"
+
+	phase1=""
+
 	ca_cert="../../raddb/certs/ca.pem"
 	client_cert="../../raddb/certs/client.crt"
 	private_key="../../raddb/certs/client.key"
 	private_key_passwd="whatever"
-
-	phase1=""
 }
diff --git a/src/tests/eap-ttls-eap-mschapv2.conf b/src/tests/eap-ttls-eap-mschapv2.conf
index 2ba5ff89b8..abe5d33f2c 100644
--- a/src/tests/eap-ttls-eap-mschapv2.conf
+++ b/src/tests/eap-ttls-eap-mschapv2.conf
@@ -2,12 +2,16 @@
 #   eapol_test -c eap-ttls-eap-mschapv2.conf -s testing123
 #
 network={
-	ssid="example"
-	key_mgmt=WPA-EAP
+	key_mgmt=IEEE8021X
 	eap=TTLS
-	identity="bob"
+
 	anonymous_identity="anonymous"
+
+	identity="bob"
 	password="bob"
+
 	phase1=""
 	phase2="autheap=MSCHAPV2"
+
+	ca_cert="../../raddb/certs/ca.pem"
 }
diff --git a/src/tests/eap-ttls-eap-tls.conf b/src/tests/eap-ttls-eap-tls.conf
index 92fe766d29..0937473d3e 100644
--- a/src/tests/eap-ttls-eap-tls.conf
+++ b/src/tests/eap-ttls-eap-tls.conf
@@ -2,6 +2,7 @@ network={
 	key_mgmt=IEEE8021X
 	eap=TTLS
 	identity="user@example.org"
+
 	phase1=""
 	phase2="autheap=TLS"
 
diff --git a/src/tests/eap-ttls-mschapv2.conf b/src/tests/eap-ttls-mschapv2.conf
index fcaf3b60df..2a5fa5686e 100644
--- a/src/tests/eap-ttls-mschapv2.conf
+++ b/src/tests/eap-ttls-mschapv2.conf
@@ -2,12 +2,16 @@
 #   eapol_test -c eap-ttls-mschapv2.conf -s testing123
 #
 network={
-	ssid="example"
-	key_mgmt=WPA-EAP
+	key_mgmt=IEEE8021X
 	eap=TTLS
-	identity="bob"
+
 	anonymous_identity="anonymous"
+
+	identity="bob"
 	password="bob"
+
 	phase1=""
 	phase2="auth=MSCHAPV2"
+
+	ca_cert="../../raddb/certs/ca.pem"
 }
diff --git a/src/tests/eap-ttls-pap.conf b/src/tests/eap-ttls-pap.conf
index 6d3602f01b..f75b35fb82 100644
--- a/src/tests/eap-ttls-pap.conf
+++ b/src/tests/eap-ttls-pap.conf
@@ -2,12 +2,16 @@
 #   eapol_test -c eap-ttls-pap.conf -s testing123
 #
 network={
-	key_mgmt=WPA-EAP
+	key_mgmt=IEEE8021X
 	eap=TTLS
-	identity="bob"
+
 	anonymous_identity="anonymous"
-#	ca_cert="../../raddb/certs/ca.pem"
+
+	identity="bob"
 	password="bob"
+
 	phase1=""
 	phase2="auth=PAP"
+
+	ca_cert="../../raddb/certs/ca.pem"
 }