testing: Distributed openssl-ikev1 scenarios

diff --git a/testing/scripts/build-certs-chroot b/testing/scripts/build-certs-chroot
index 5d4457f7ec851a5c97a9938dddb6bc4cc8fc24b0..e84e3e8a91a252ba3a6330bbd98bda2671ae4c9a 100755 (executable)
--- a/testing/scripts/build-certs-chroot
+++ b/testing/scripts/build-certs-chroot
@@ -1219,8 +1219,8 @@ mkdir -p ${TEST}/hosts/dave/${SWANCTL_DIR}/pkcs8
 openssl pkcs8 -in ${DAVE_KEY} -nocrypt -topk8  -v2 aes128 \
               -passout "pass:OJlNZBx+80dLh4wC6fw5LmBd" -out ${TEST_KEY}
 
-# Put CA and EE certificate copies in the openssl-ikev1/ecdsa-certs scenario
-TEST="${TEST_DIR}/openssl-ikev1/ecdsa-certs"
+# Put CA and EE certificate copies in the ikev1/ecdsa-certs scenario
+TEST="${TEST_DIR}/ikev1/ecdsa-certs"
 cd ${TEST}/hosts/moon/${SWANCTL_DIR}
 mkdir -p ecdsa x509 x509ca
 cp ${MOON_KEY}   ecdsa

diff --git a/testing/tests/openssl-ikev1/alg-camellia/description.txt b/testing/tests/ikev1-algs/alg-camellia/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-camellia/description.txt
rename to testing/tests/ikev1-algs/alg-camellia/description.txt

diff --git a/testing/tests/openssl-ikev1/alg-camellia/evaltest.dat b/testing/tests/ikev1-algs/alg-camellia/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-camellia/evaltest.dat
rename to testing/tests/ikev1-algs/alg-camellia/evaltest.dat

diff --git a/testing/tests/openssl-ikev1/alg-camellia/hosts/carol/etc/strongswan.conf b/testing/tests/ikev1-algs/alg-camellia/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-camellia/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev1-algs/alg-camellia/hosts/carol/etc/strongswan.conf

diff --git a/testing/tests/openssl-ikev1/alg-camellia/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev1-algs/alg-camellia/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-camellia/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1-algs/alg-camellia/hosts/carol/etc/swanctl/swanctl.conf

diff --git a/testing/tests/openssl-ikev1/alg-camellia/hosts/moon/etc/strongswan.conf b/testing/tests/ikev1-algs/alg-camellia/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-camellia/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev1-algs/alg-camellia/hosts/moon/etc/strongswan.conf

diff --git a/testing/tests/openssl-ikev1/alg-camellia/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev1-algs/alg-camellia/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-camellia/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1-algs/alg-camellia/hosts/moon/etc/swanctl/swanctl.conf

diff --git a/testing/tests/openssl-ikev1/alg-camellia/posttest.dat b/testing/tests/ikev1-algs/alg-camellia/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-camellia/posttest.dat
rename to testing/tests/ikev1-algs/alg-camellia/posttest.dat

diff --git a/testing/tests/openssl-ikev1/alg-camellia/pretest.dat b/testing/tests/ikev1-algs/alg-camellia/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-camellia/pretest.dat
rename to testing/tests/ikev1-algs/alg-camellia/pretest.dat

diff --git a/testing/tests/openssl-ikev1/alg-camellia/test.conf b/testing/tests/ikev1-algs/alg-camellia/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-camellia/test.conf
rename to testing/tests/ikev1-algs/alg-camellia/test.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/description.txt b/testing/tests/ikev1-algs/alg-ecp-high/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/description.txt
rename to testing/tests/ikev1-algs/alg-ecp-high/description.txt

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/evaltest.dat b/testing/tests/ikev1-algs/alg-ecp-high/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/evaltest.dat
rename to testing/tests/ikev1-algs/alg-ecp-high/evaltest.dat

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/strongswan.conf b/testing/tests/ikev1-algs/alg-ecp-high/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev1-algs/alg-ecp-high/hosts/carol/etc/strongswan.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev1-algs/alg-ecp-high/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1-algs/alg-ecp-high/hosts/carol/etc/swanctl/swanctl.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/strongswan.conf b/testing/tests/ikev1-algs/alg-ecp-high/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev1-algs/alg-ecp-high/hosts/dave/etc/strongswan.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/ikev1-algs/alg-ecp-high/hosts/dave/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1-algs/alg-ecp-high/hosts/dave/etc/swanctl/swanctl.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/strongswan.conf b/testing/tests/ikev1-algs/alg-ecp-high/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev1-algs/alg-ecp-high/hosts/moon/etc/strongswan.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev1-algs/alg-ecp-high/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1-algs/alg-ecp-high/hosts/moon/etc/swanctl/swanctl.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/posttest.dat b/testing/tests/ikev1-algs/alg-ecp-high/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/posttest.dat
rename to testing/tests/ikev1-algs/alg-ecp-high/posttest.dat

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/pretest.dat b/testing/tests/ikev1-algs/alg-ecp-high/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/pretest.dat
rename to testing/tests/ikev1-algs/alg-ecp-high/pretest.dat

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/test.conf b/testing/tests/ikev1-algs/alg-ecp-high/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-high/test.conf
rename to testing/tests/ikev1-algs/alg-ecp-high/test.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/description.txt b/testing/tests/ikev1-algs/alg-ecp-low/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/description.txt
rename to testing/tests/ikev1-algs/alg-ecp-low/description.txt

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/evaltest.dat b/testing/tests/ikev1-algs/alg-ecp-low/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/evaltest.dat
rename to testing/tests/ikev1-algs/alg-ecp-low/evaltest.dat

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/strongswan.conf b/testing/tests/ikev1-algs/alg-ecp-low/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev1-algs/alg-ecp-low/hosts/carol/etc/strongswan.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev1-algs/alg-ecp-low/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1-algs/alg-ecp-low/hosts/carol/etc/swanctl/swanctl.conf

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/carol/etc/strongswan.conf b/testing/tests/ikev1-algs/alg-ecp-low/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev1-algs/alg-ecp-low/hosts/dave/etc/strongswan.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/ikev1-algs/alg-ecp-low/hosts/dave/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1-algs/alg-ecp-low/hosts/dave/etc/swanctl/swanctl.conf

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf b/testing/tests/ikev1-algs/alg-ecp-low/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf
rename to testing/tests/ikev1-algs/alg-ecp-low/hosts/moon/etc/strongswan.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev1-algs/alg-ecp-low/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1-algs/alg-ecp-low/hosts/moon/etc/swanctl/swanctl.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/posttest.dat b/testing/tests/ikev1-algs/alg-ecp-low/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/posttest.dat
rename to testing/tests/ikev1-algs/alg-ecp-low/posttest.dat

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/pretest.dat b/testing/tests/ikev1-algs/alg-ecp-low/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/pretest.dat
rename to testing/tests/ikev1-algs/alg-ecp-low/pretest.dat

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/test.conf b/testing/tests/ikev1-algs/alg-ecp-low/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/alg-ecp-low/test.conf
rename to testing/tests/ikev1-algs/alg-ecp-low/test.conf

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/description.txt b/testing/tests/ikev1/ecdsa-certs/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/description.txt
rename to testing/tests/ikev1/ecdsa-certs/description.txt

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/evaltest.dat b/testing/tests/ikev1/ecdsa-certs/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/evaltest.dat
rename to testing/tests/ikev1/ecdsa-certs/evaltest.dat

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/.gitignore b/testing/tests/ikev1/ecdsa-certs/hosts/.gitignore
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/hosts/.gitignore
rename to testing/tests/ikev1/ecdsa-certs/hosts/.gitignore

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/moon/etc/strongswan.conf b/testing/tests/ikev1/ecdsa-certs/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev1/ecdsa-certs/hosts/carol/etc/strongswan.conf

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev1/ecdsa-certs/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1/ecdsa-certs/hosts/carol/etc/swanctl/swanctl.conf

diff --git a/testing/tests/ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf b/testing/tests/ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..a322670
--- /dev/null
+++ b/testing/tests/ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf
@@ -0,0 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
+}

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/ikev1/ecdsa-certs/hosts/dave/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1/ecdsa-certs/hosts/dave/etc/swanctl/swanctl.conf

diff --git a/testing/tests/ikev1/ecdsa-certs/hosts/moon/etc/strongswan.conf b/testing/tests/ikev1/ecdsa-certs/hosts/moon/etc/strongswan.conf
new file mode 100644 (file)
index 0000000..a322670
--- /dev/null
+++ b/testing/tests/ikev1/ecdsa-certs/hosts/moon/etc/strongswan.conf
@@ -0,0 +1,5 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
+}

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev1/ecdsa-certs/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev1/ecdsa-certs/hosts/moon/etc/swanctl/swanctl.conf

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/posttest.dat b/testing/tests/ikev1/ecdsa-certs/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/posttest.dat
rename to testing/tests/ikev1/ecdsa-certs/posttest.dat

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/pretest.dat b/testing/tests/ikev1/ecdsa-certs/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/pretest.dat
rename to testing/tests/ikev1/ecdsa-certs/pretest.dat

diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/test.conf b/testing/tests/ikev1/ecdsa-certs/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev1/ecdsa-certs/test.conf
rename to testing/tests/ikev1/ecdsa-certs/test.conf

diff --git a/testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/strongswan.conf
deleted file mode 100644 (file)
index 59c81a0..0000000
--- a/testing/tests/openssl-ikev1/alg-ecp-high/hosts/dave/etc/strongswan.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-charon {
-  load = random nonce aes sha1 sha2 gmp pem pkcs1 hmac kdf x509 openssl curl revocation vici kernel-netlink socket-default updown
-}

diff --git a/testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/strongswan.conf
deleted file mode 100644 (file)
index f08553b..0000000
--- a/testing/tests/openssl-ikev1/alg-ecp-low/hosts/dave/etc/strongswan.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-charon {
-  load = random nonce aes des sha1 sha2 gmp pem pkcs1 hmac kdf x509 openssl curl revocation vici kernel-netlink socket-default updown
-}