reformat and normalize eapol_test configuration files

diff --git a/src/tests/eap-fast.conf b/src/tests/eap-fast.conf
index bbe5d87b544856d98d6832eeb6a9fa989909a11b..b80f2708045bc235aabf1f72a6339923c6a8b976 100644 (file)
--- 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 2d99ce1d441d8675b5efdb7b50d70da5268474ac..9e2eca6f787fdff1095b5888bdb9590c70136b05 100644 (file)
--- 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 f738bc675d97b5fdff7368f923700597a38b95b1..4afcfd0dd379533d3c2d5cb2a73331a03e83f681 100644 (file)
--- 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 2914b97d7da4fbe4272eb08c55b0fe60d15fc14a..a756cc18b917d4dd837f87513cd1d7b7eb7f7b25 100644 (file)
--- 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 e1a49e57227a49c1ce958a9519b3c1fa0ee1930c..c88a5596da7475ef135385381f20b171125f1479 100644 (file)
--- 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 2ba5ff89b8e637708b2d491bc41240f4baeaa08a..abe5d33f2cfb328ad90cb9b631a66f0d4200d468 100644 (file)
--- 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 92fe766d293c0f35819a4f28ca038ddbd117a00f..0937473d3e2c052b00965481356ccb29067ee1e2 100644 (file)
--- 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 fcaf3b60df0e5f3099e30f525f1ca5e5869e3769..2a5fa5686e031388193b00eb423ac75125a61adf 100644 (file)
--- 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 6d3602f01be3f6709bba95a835755f1cb35619a3..f75b35fb82586d8c68b2096ac6db569285d57223 100644 (file)
--- 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"
 }