From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Tue, 18 Oct 2022 17:15:08 +0000 (+0200)
Subject: testing: Distributed openssl-ikev2 scenarios
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=412d626affb445a1eb9d828ed3dc3632081a8e10;p=thirdparty%2Fstrongswan.git

testing: Distributed openssl-ikev2 scenarios
---

diff --git a/testing/scripts/build-certs-chroot b/testing/scripts/build-certs-chroot
index 81d0ed6b12..62b043f4b7 100755
--- a/testing/scripts/build-certs-chroot
+++ b/testing/scripts/build-certs-chroot
@@ -350,7 +350,7 @@ openssl pkcs12 -export -inkey ${HOST_KEY} -in ${HOST_CERT} -name "sun" \
         -certpbe aes-128-cbc -macalg sha256 -passout "pass:IxjQVCF3JGI+MoPi" > ${SUN_PKCS12}
 
 # Put a PKCS#12 copy into the botan/net2net-pkcs12 scenario
-for t in botan/net2net-pkcs12 openssl-ikev2/net2net-pkcs12
+for t in botan/net2net-pkcs12
 do
   TEST="${TEST_DIR}/${t}"
   mkdir -p ${TEST}/hosts/moon/${SWANCTL_DIR}/pkcs12
@@ -753,13 +753,6 @@ pki --issue --cakey ${CA_KEY} --cacert ${CA_CERT} --crl ${CA_CDP} --type rsa \
     --outform pem > ${TEST_CERT}
 cp ${TEST_CERT} ${CA_DIR}/certs/${SERIAL}.pem
 
-# Put a copy in the openssl-ikev2/critical extension scenario
-TEST="${TEST_DIR}/openssl-ikev2/critical-extension"
-mkdir -p ${TEST}/hosts/moon/${SWANCTL_DIR}/rsa
-mkdir -p ${TEST}/hosts/moon/${SWANCTL_DIR}/x509
-cp ${TEST_KEY} ${TEST}/hosts/moon/${SWANCTL_DIR}/rsa
-cp ${TEST_CERT} ${TEST}/hosts/moon/${SWANCTL_DIR}/x509
-
 # Generate sun certificate with an unsupported critical X.509 extension
 TEST="${TEST_DIR}/ikev2/critical-extension"
 TEST_KEY="${TEST}/hosts/sun/${SWANCTL_DIR}/rsa/sunKey.pem"
@@ -776,13 +769,6 @@ pki --issue --cakey ${CA_KEY} --cacert ${CA_CERT} --crl ${CA_CDP} --type rsa \
     --outform pem > ${TEST_CERT}
 cp ${TEST_CERT} ${CA_DIR}/certs/${SERIAL}.pem
 
-# Put a copy in the openssl-ikev2/critical extension scenario
-TEST="${TEST_DIR}/openssl-ikev2/critical-extension"
-mkdir -p ${TEST}/hosts/sun/${SWANCTL_DIR}/rsa
-mkdir -p ${TEST}/hosts/sun/${SWANCTL_DIR}/x509
-cp ${TEST_KEY} ${TEST}/hosts/sun/${SWANCTL_DIR}/rsa
-cp ${TEST_CERT} ${TEST}/hosts/sun/${SWANCTL_DIR}/x509
-
 # Generate winnetou server certificate
 HOST_KEY="${CA_DIR}/winnetouKey.pem"
 HOST_CERT="${CA_DIR}/winnetouCert.pem"
diff --git a/testing/tests/openssl-ikev2/alg-camellia/description.txt b/testing/tests/ikev2-algs/alg-camellia/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-camellia/description.txt
rename to testing/tests/ikev2-algs/alg-camellia/description.txt
diff --git a/testing/tests/openssl-ikev2/alg-camellia/evaltest.dat b/testing/tests/ikev2-algs/alg-camellia/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-camellia/evaltest.dat
rename to testing/tests/ikev2-algs/alg-camellia/evaltest.dat
diff --git a/testing/tests/openssl-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-camellia/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-camellia/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-camellia/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-camellia/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-camellia/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-camellia/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-camellia/hosts/carol/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-camellia/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-camellia/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-camellia/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-camellia/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-camellia/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-camellia/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-camellia/hosts/moon/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-camellia/posttest.dat b/testing/tests/ikev2-algs/alg-camellia/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-camellia/posttest.dat
rename to testing/tests/ikev2-algs/alg-camellia/posttest.dat
diff --git a/testing/tests/openssl-ikev2/alg-camellia/pretest.dat b/testing/tests/ikev2-algs/alg-camellia/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-camellia/pretest.dat
rename to testing/tests/ikev2-algs/alg-camellia/pretest.dat
diff --git a/testing/tests/openssl-ikev2/alg-camellia/test.conf b/testing/tests/ikev2-algs/alg-camellia/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-camellia/test.conf
rename to testing/tests/ikev2-algs/alg-camellia/test.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/description.txt b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/description.txt
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/description.txt
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/evaltest.dat b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/evaltest.dat
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/evaltest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/carol/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/dave/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/dave/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/dave/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/hosts/moon/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/posttest.dat b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/posttest.dat
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/posttest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/pretest.dat b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/pretest.dat
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/pretest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/test.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-high/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-high/test.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-high/test.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/description.txt b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/description.txt
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/description.txt
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/evaltest.dat b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/evaltest.dat
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/evaltest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/carol/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/dave/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/dave/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/dave/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/hosts/moon/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/posttest.dat b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/posttest.dat
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/posttest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/pretest.dat b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/pretest.dat
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/pretest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/test.conf b/testing/tests/ikev2-algs/alg-ecp-brainpool-low/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-brainpool-low/test.conf
rename to testing/tests/ikev2-algs/alg-ecp-brainpool-low/test.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/description.txt b/testing/tests/ikev2-algs/alg-ecp-high/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/description.txt
rename to testing/tests/ikev2-algs/alg-ecp-high/description.txt
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/evaltest.dat b/testing/tests/ikev2-algs/alg-ecp-high/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/evaltest.dat
rename to testing/tests/ikev2-algs/alg-ecp-high/evaltest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-high/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-high/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-high/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-high/hosts/carol/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-high/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-high/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-high/hosts/dave/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/hosts/dave/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-high/hosts/dave/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-high/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-high/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-high/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-high/hosts/moon/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/posttest.dat b/testing/tests/ikev2-algs/alg-ecp-high/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/posttest.dat
rename to testing/tests/ikev2-algs/alg-ecp-high/posttest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/pretest.dat b/testing/tests/ikev2-algs/alg-ecp-high/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/pretest.dat
rename to testing/tests/ikev2-algs/alg-ecp-high/pretest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/test.conf b/testing/tests/ikev2-algs/alg-ecp-high/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-high/test.conf
rename to testing/tests/ikev2-algs/alg-ecp-high/test.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/description.txt b/testing/tests/ikev2-algs/alg-ecp-low/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/description.txt
rename to testing/tests/ikev2-algs/alg-ecp-low/description.txt
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/evaltest.dat b/testing/tests/ikev2-algs/alg-ecp-low/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/evaltest.dat
rename to testing/tests/ikev2-algs/alg-ecp-low/evaltest.dat
diff --git a/testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-low/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-low/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-low/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-low/hosts/carol/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-low/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-low/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-low/hosts/dave/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/hosts/dave/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-low/hosts/dave/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/critical-extension/hosts/sun/etc/strongswan.conf b/testing/tests/ikev2-algs/alg-ecp-low/hosts/moon/etc/strongswan.conf
similarity index 84%
rename from testing/tests/openssl-ikev2/critical-extension/hosts/sun/etc/strongswan.conf
rename to testing/tests/ikev2-algs/alg-ecp-low/hosts/moon/etc/strongswan.conf
index 77d858547f..a322670f4b 100644
--- a/testing/tests/openssl-ikev2/critical-extension/hosts/sun/etc/strongswan.conf
+++ b/testing/tests/ikev2-algs/alg-ecp-low/hosts/moon/etc/strongswan.conf
@@ -2,5 +2,4 @@
 
 charon {
   load = random nonce pem pkcs1 openssl curl revocation vici kernel-netlink socket-default updown
-  multiple_authentication = no
 }
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev2-algs/alg-ecp-low/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2-algs/alg-ecp-low/hosts/moon/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/posttest.dat b/testing/tests/ikev2-algs/alg-ecp-low/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/posttest.dat
rename to testing/tests/ikev2-algs/alg-ecp-low/posttest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/pretest.dat b/testing/tests/ikev2-algs/alg-ecp-low/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/pretest.dat
rename to testing/tests/ikev2-algs/alg-ecp-low/pretest.dat
diff --git a/testing/tests/openssl-ikev2/alg-ecp-low/test.conf b/testing/tests/ikev2-algs/alg-ecp-low/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/alg-ecp-low/test.conf
rename to testing/tests/ikev2-algs/alg-ecp-low/test.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-certs/description.txt b/testing/tests/ikev2/ecdsa-certs/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/description.txt
rename to testing/tests/ikev2/ecdsa-certs/description.txt
diff --git a/testing/tests/openssl-ikev2/ecdsa-certs/evaltest.dat b/testing/tests/ikev2/ecdsa-certs/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/evaltest.dat
rename to testing/tests/ikev2/ecdsa-certs/evaltest.dat
diff --git a/testing/tests/ikev2/ecdsa-certs/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/ecdsa-certs/hosts/carol/etc/strongswan.conf
new file mode 100644
index 0000000000..a322670f4b
--- /dev/null
+++ b/testing/tests/ikev2/ecdsa-certs/hosts/carol/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-ikev2/ecdsa-certs/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev2/ecdsa-certs/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2/ecdsa-certs/hosts/carol/etc/swanctl/swanctl.conf
diff --git a/testing/tests/ikev2/ecdsa-certs/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/ecdsa-certs/hosts/dave/etc/strongswan.conf
new file mode 100644
index 0000000000..a322670f4b
--- /dev/null
+++ b/testing/tests/ikev2/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-ikev2/ecdsa-certs/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/ikev2/ecdsa-certs/hosts/dave/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/hosts/dave/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2/ecdsa-certs/hosts/dave/etc/swanctl/swanctl.conf
diff --git a/testing/tests/ikev2/ecdsa-certs/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/ecdsa-certs/hosts/moon/etc/strongswan.conf
new file mode 100644
index 0000000000..a322670f4b
--- /dev/null
+++ b/testing/tests/ikev2/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-ikev2/ecdsa-certs/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev2/ecdsa-certs/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2/ecdsa-certs/hosts/moon/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-certs/posttest.dat b/testing/tests/ikev2/ecdsa-certs/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/posttest.dat
rename to testing/tests/ikev2/ecdsa-certs/posttest.dat
diff --git a/testing/tests/openssl-ikev2/ecdsa-certs/pretest.dat b/testing/tests/ikev2/ecdsa-certs/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/pretest.dat
rename to testing/tests/ikev2/ecdsa-certs/pretest.dat
diff --git a/testing/tests/openssl-ikev2/ecdsa-certs/test.conf b/testing/tests/ikev2/ecdsa-certs/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-certs/test.conf
rename to testing/tests/ikev2/ecdsa-certs/test.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/description.txt b/testing/tests/ikev2/ecdsa-pkcs8/description.txt
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/description.txt
rename to testing/tests/ikev2/ecdsa-pkcs8/description.txt
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/evaltest.dat b/testing/tests/ikev2/ecdsa-pkcs8/evaltest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/evaltest.dat
rename to testing/tests/ikev2/ecdsa-pkcs8/evaltest.dat
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/carol/etc/strongswan.conf b/testing/tests/ikev2/ecdsa-pkcs8/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/carol/etc/strongswan.conf
rename to testing/tests/ikev2/ecdsa-pkcs8/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/ikev2/ecdsa-pkcs8/hosts/carol/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/carol/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2/ecdsa-pkcs8/hosts/carol/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/dave/etc/strongswan.conf b/testing/tests/ikev2/ecdsa-pkcs8/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/dave/etc/strongswan.conf
rename to testing/tests/ikev2/ecdsa-pkcs8/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/ikev2/ecdsa-pkcs8/hosts/dave/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/dave/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2/ecdsa-pkcs8/hosts/dave/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/moon/etc/strongswan.conf b/testing/tests/ikev2/ecdsa-pkcs8/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/moon/etc/strongswan.conf
rename to testing/tests/ikev2/ecdsa-pkcs8/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/ikev2/ecdsa-pkcs8/hosts/moon/etc/swanctl/swanctl.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/hosts/moon/etc/swanctl/swanctl.conf
rename to testing/tests/ikev2/ecdsa-pkcs8/hosts/moon/etc/swanctl/swanctl.conf
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/posttest.dat b/testing/tests/ikev2/ecdsa-pkcs8/posttest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/posttest.dat
rename to testing/tests/ikev2/ecdsa-pkcs8/posttest.dat
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/pretest.dat b/testing/tests/ikev2/ecdsa-pkcs8/pretest.dat
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/pretest.dat
rename to testing/tests/ikev2/ecdsa-pkcs8/pretest.dat
diff --git a/testing/tests/openssl-ikev2/ecdsa-pkcs8/test.conf b/testing/tests/ikev2/ecdsa-pkcs8/test.conf
similarity index 100%
rename from testing/tests/openssl-ikev2/ecdsa-pkcs8/test.conf
rename to testing/tests/ikev2/ecdsa-pkcs8/test.conf
diff --git a/testing/tests/openssl-ikev2/.gitignore b/testing/tests/openssl-ikev2/.gitignore
deleted file mode 100644
index c67f9a2786..0000000000
--- a/testing/tests/openssl-ikev2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.pem
-*.p12
diff --git a/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-brainpool-high/hosts/dave/etc/strongswan.conf
deleted file mode 100644
index 59c81a0f9c..0000000000
--- a/testing/tests/openssl-ikev2/alg-ecp-brainpool-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-ikev2/alg-ecp-brainpool-low/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-brainpool-low/hosts/dave/etc/strongswan.conf
deleted file mode 100644
index f08553bf55..0000000000
--- a/testing/tests/openssl-ikev2/alg-ecp-brainpool-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
-}
diff --git a/testing/tests/openssl-ikev2/alg-ecp-high/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-high/hosts/dave/etc/strongswan.conf
deleted file mode 100644
index 59c81a0f9c..0000000000
--- a/testing/tests/openssl-ikev2/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-ikev2/alg-ecp-low/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/alg-ecp-low/hosts/dave/etc/strongswan.conf
deleted file mode 100644
index f08553bf55..0000000000
--- a/testing/tests/openssl-ikev2/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
-}
diff --git a/testing/tests/openssl-ikev2/critical-extension/description.txt b/testing/tests/openssl-ikev2/critical-extension/description.txt
deleted file mode 100644
index 4f472b83b6..0000000000
--- a/testing/tests/openssl-ikev2/critical-extension/description.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-A connection between the subnets behind the gateways <b>moon</b> and <b>sun</b> is set up.
-The authentication is based on <b>X.509 certificates</b> which contain a <b>critical</b> but
-unsupported 'strongSwan' extension. Whereas <b>moon</b> ignores unsupported critical
-extensions by setting <b>libstrongswan.x509.enforce_critical = no</b> in strongswan.conf,
-<b>sun</b> discards such certificates and aborts the connection setup.
diff --git a/testing/tests/openssl-ikev2/critical-extension/evaltest.dat b/testing/tests/openssl-ikev2/critical-extension/evaltest.dat
deleted file mode 100644
index e91ba2b825..0000000000
--- a/testing/tests/openssl-ikev2/critical-extension/evaltest.dat
+++ /dev/null
@@ -1,4 +0,0 @@
-moon::cat /var/log/daemon.log::sending end entity cert::YES
-moon::cat /var/log/daemon.log::received AUTHENTICATION_FAILED notify error::YES
-sun:: cat /var/log/daemon.log::found unsupported critical X.509 extension::YES
-sun:: cat /var/log/daemon.log::building CRED_CERTIFICATE - X509 failed::YES
diff --git a/testing/tests/openssl-ikev2/critical-extension/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/critical-extension/hosts/moon/etc/strongswan.conf
deleted file mode 100644
index f2104c5f89..0000000000
--- a/testing/tests/openssl-ikev2/critical-extension/hosts/moon/etc/strongswan.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-charon {
-  load = random nonce pem pkcs1 openssl revocation curl vici kernel-netlink socket-default updown
-  multiple_authentication = no
-}
-
-libstrongswan {
-  x509 {
-    enforce_critical = no
-  }
-}
diff --git a/testing/tests/openssl-ikev2/critical-extension/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/openssl-ikev2/critical-extension/hosts/moon/etc/swanctl/swanctl.conf
deleted file mode 100755
index 0b0aa32a5f..0000000000
--- a/testing/tests/openssl-ikev2/critical-extension/hosts/moon/etc/swanctl/swanctl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-connections {
-
-   gw-gw {
-      local_addrs  = 192.168.0.1
-      remote_addrs = 192.168.0.2
-
-      local {
-         auth = pubkey
-         id = moon.strongswan.org
-      }
-      remote {
-         auth = pubkey
-         id = sun.strongswan.org
-      }
-      children {
-         net-net {
-            local_ts  = 10.1.0.0/16
-            remote_ts = 10.2.0.0/16
-            esp_proposals = aes128gcm128-ecp256
-         }
-      }
-      version = 2
-      mobike = no
-      proposals = aes128-sha256-ecp256
-   }
-}
diff --git a/testing/tests/openssl-ikev2/critical-extension/hosts/sun/etc/swanctl/swanctl.conf b/testing/tests/openssl-ikev2/critical-extension/hosts/sun/etc/swanctl/swanctl.conf
deleted file mode 100755
index bb068bdbe3..0000000000
--- a/testing/tests/openssl-ikev2/critical-extension/hosts/sun/etc/swanctl/swanctl.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-connections {
-
-   gw-gw {
-      local_addrs  = 192.168.0.2
-      remote_addrs = 192.168.0.1
-
-      local {
-         auth = pubkey
-         id = sun.strongswan.org
-      }
-      remote {
-         auth = pubkey
-         id = moon.strongswan.org
-      }
-      children {
-         net-net {
-            local_ts  = 10.2.0.0/16
-            remote_ts = 10.1.0.0/16
-             esp_proposals = aes128gcm128-ecp256
-         }
-      }
-      version = 2
-      mobike = no
-      proposals = aes128-sha256-ecp256
-   }
-}
diff --git a/testing/tests/openssl-ikev2/critical-extension/posttest.dat b/testing/tests/openssl-ikev2/critical-extension/posttest.dat
deleted file mode 100644
index 4ee2ed6719..0000000000
--- a/testing/tests/openssl-ikev2/critical-extension/posttest.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-moon::systemctl stop strongswan
-sun::systemctl stop strongswan
diff --git a/testing/tests/openssl-ikev2/critical-extension/pretest.dat b/testing/tests/openssl-ikev2/critical-extension/pretest.dat
deleted file mode 100644
index bcc06dbccb..0000000000
--- a/testing/tests/openssl-ikev2/critical-extension/pretest.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-moon::systemctl start strongswan
-sun::systemctl start strongswan
-moon::expect-connection gw-gw
-sun::expect-connection gw-gw
-moon::swanctl --initiate --child net-net 2> /dev/null
diff --git a/testing/tests/openssl-ikev2/critical-extension/test.conf b/testing/tests/openssl-ikev2/critical-extension/test.conf
deleted file mode 100644
index d3016a886c..0000000000
--- a/testing/tests/openssl-ikev2/critical-extension/test.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This configuration file provides information on the
-# guest instances used for this test
-
-# All guest instances that are required for this test
-#
-VIRTHOSTS="alice moon winnetou sun bob"
-
-# Corresponding block diagram
-#
-DIAGRAM="a-m-w-s-b.png"
-
-# Guest instances on which tcpdump is to be started
-#
-TCPDUMPHOSTS=""
-
-# Guest instances on which IPsec is started
-# Used for IPsec logging purposes
-#
-IPSECHOSTS="moon sun"
-
-# charon controlled by swanctl
-#
-SWANCTL=1
diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/description.txt b/testing/tests/openssl-ikev2/net2net-pkcs12/description.txt
deleted file mode 100644
index 1d40e30f0c..0000000000
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/description.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-A connection between the subnets behind the gateways <b>moon</b> and <b>sun</b> is set up.
-The authentication is based on <b>X.509 certificates</b> and an RSA private key stored in
-<b>PKCS12</b> format.
-<p/>
-Upon the successful establishment of the IPsec tunnels, <b>leftfirewall=yes</b>
-automatically inserts iptables-based firewall rules that let pass the tunneled traffic.
-In order to test both tunnel and firewall, client <b>alice</b> behind gateway <b>moon</b>
-pings client <b>bob</b> located behind gateway <b>sun</b>.
diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/evaltest.dat b/testing/tests/openssl-ikev2/net2net-pkcs12/evaltest.dat
deleted file mode 100644
index bfc7e76f11..0000000000
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/evaltest.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-alice::ping -c 1 PH_IP_BOB::64 bytes from PH_IP_BOB: icmp_.eq=1::YES
-moon::swanctl --list-sas --raw 2> /dev/null::gw-gw.*version=2 state=ESTABLISHED local-host=192.168.0.1 local-port=500 local-id=moon.strongswan.org remote-host=192.168.0.2 remote-port=500 remote-id=sun.strongswan.org initiator=yes.*encr-alg=AES_CBC encr-keysize=128 integ-alg=HMAC_SHA2_256_128 prf-alg=PRF_HMAC_SHA2_256 dh-group=MODP_3072.*child-sas.*net-net.*state=INSTALLED mode=TUNNEL.*ESP.*encr-alg=AES_GCM_16 encr-keysize=128.*local-ts=\[10.1.0.0/16] remote-ts=\[10.2.0.0/16]::YES
-sun:: swanctl --list-sas --raw 2> /dev/null::gw-gw.*version=2 state=ESTABLISHED local-host=192.168.0.2 local-port=500 local-id=sun.strongswan.org remote-host=192.168.0.1 remote-port=500 remote-id=moon.strongswan.org.*encr-alg=AES_CBC encr-keysize=128 integ-alg=HMAC_SHA2_256_128 prf-alg=PRF_HMAC_SHA2_256 dh-group=MODP_3072.*child-sas.*net-net.*state=INSTALLED mode=TUNNEL.*ESP.*encr-alg=AES_GCM_16 encr-keysize=128.*local-ts=\[10.2.0.0/16] remote-ts=\[10.1.0.0/16]::YES
-sun::tcpdump::IP moon.strongswan.org > sun.strongswan.org: ESP::YES
-sun::tcpdump::IP sun.strongswan.org > moon.strongswan.org: ESP::YES
diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf
deleted file mode 100644
index 9232c58ad1..0000000000
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/strongswan.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-swanctl {
-  load = pem openssl
-}
-
-charon-systemd {
-  load = pem nonce openssl curl vici kernel-netlink socket-default updown
-}
diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/swanctl/swanctl.conf
deleted file mode 100755
index b11cf0f3e5..0000000000
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/swanctl/swanctl.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-connections {
-
-   gw-gw {
-      local_addrs  = 192.168.0.1
-      remote_addrs = 192.168.0.2
-
-      local {
-         auth = pubkey
-         id = moon.strongswan.org
-      }
-      remote {
-         auth = pubkey
-         id = sun.strongswan.org
-      }
-      children {
-         net-net {
-            local_ts  = 10.1.0.0/16
-            remote_ts = 10.2.0.0/16
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            esp_proposals = aes128gcm128-modp3072
-         }
-      }
-      version = 2
-      mobike = no
-      proposals = aes128-sha256-modp3072
-   }
-}
-
-secrets {
-
-   pkcs12-moon {
-      file = moonCert.p12
-      secret = "kUqd8O7mzbjXNJKQ"
-   }
-}
diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/strongswan.conf b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/strongswan.conf
deleted file mode 100644
index 9232c58ad1..0000000000
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/strongswan.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-swanctl {
-  load = pem openssl
-}
-
-charon-systemd {
-  load = pem nonce openssl curl vici kernel-netlink socket-default updown
-}
diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/swanctl/swanctl.conf b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/swanctl/swanctl.conf
deleted file mode 100755
index 28c0e87a43..0000000000
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/swanctl/swanctl.conf
+++ /dev/null
@@ -1,36 +0,0 @@
-connections {
-
-   gw-gw {
-      local_addrs  = 192.168.0.2
-      remote_addrs = 192.168.0.1
-
-      local {
-         auth = pubkey
-         id = sun.strongswan.org
-      }
-      remote {
-         auth = pubkey
-         id = moon.strongswan.org
-      }
-      children {
-         net-net {
-            local_ts  = 10.2.0.0/16
-            remote_ts = 10.1.0.0/16
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            esp_proposals = aes128gcm128-modp3072
-         }
-      }
-      version = 2
-      mobike = no
-      proposals = aes128-sha256-modp3072
-   }
-}
-
-secrets {
-
-   pkcs12-sun {
-      file = sunCert.p12
-      secret = "IxjQVCF3JGI+MoPi"
-   }
-}
diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/posttest.dat b/testing/tests/openssl-ikev2/net2net-pkcs12/posttest.dat
deleted file mode 100644
index 61d173e74e..0000000000
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/posttest.dat
+++ /dev/null
@@ -1,6 +0,0 @@
-moon::systemctl stop strongswan
-sun::systemctl stop strongswan
-moon::iptables-restore < /etc/iptables.flush
-sun::iptables-restore < /etc/iptables.flush
-moon::rm /etc/swanctl/pkcs12/moonCert.p12
-sun::rm /etc/swanctl/pkcs12/sunCert.p12
diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat b/testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat
deleted file mode 100644
index a65c397a68..0000000000
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat
+++ /dev/null
@@ -1,9 +0,0 @@
-moon::cd /etc/swanctl; rm rsa/moonKey.pem x509/moonCert.pem x509ca/strongswanCert.pem
-sun::cd /etc/swanctl; rm rsa/sunKey.pem x509/sunCert.pem x509ca/strongswanCert.pem
-moon::iptables-restore < /etc/iptables.rules
-sun::iptables-restore < /etc/iptables.rules
-moon::systemctl start strongswan
-sun::systemctl start strongswan
-moon::expect-connection gw-gw
-sun::expect-connection gw-gw
-moon::swanctl --initiate --child net-net 2> /dev/null
diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/test.conf b/testing/tests/openssl-ikev2/net2net-pkcs12/test.conf
deleted file mode 100644
index 87abc763b9..0000000000
--- a/testing/tests/openssl-ikev2/net2net-pkcs12/test.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This configuration file provides information on the
-# guest instances used for this test
-
-# All guest instances that are required for this test
-#
-VIRTHOSTS="alice moon winnetou sun bob"
-
-# Corresponding block diagram
-#
-DIAGRAM="a-m-w-s-b.png"
-
-# Guest instances on which tcpdump is to be started
-#
-TCPDUMPHOSTS="sun"
-
-# Guest instances on which IPsec is started
-# Used for IPsec logging purposes
-#
-IPSECHOSTS="moon sun"
-
-# charon controlled by swanctl
-#
-SWANCTL=1
diff --git a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/description.txt b/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/description.txt
deleted file mode 100755
index 2db82a9413..0000000000
--- a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/description.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-A connection between the subnets behind the gateways <b>moon</b> and <b>sun</b> is set up.
-The authentication is based on <b>X.509 certificates</b> with signatures consisting of
-<b>RSA-encrypted SHA-3 hashes</b>.
-<p/>
-Upon the successful establishment of the IPsec tunnel, the updown script automatically
-inserts iptables-based firewall rules that let pass the tunneled traffic.
-In order to test both tunnel and firewall, client <b>alice</b> behind gateway <b>moon</b>
-pings client <b>bob</b> located behind gateway <b>sun</b>.
diff --git a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/evaltest.dat b/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/evaltest.dat
deleted file mode 100755
index 4c56d5299b..0000000000
--- a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/evaltest.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-moon::swanctl --list-sas --raw 2> /dev/null::gw-gw.*version=2 state=ESTABLISHED local-host=192.168.0.1 local-port=500 local-id=moon.strongswan.org remote-host=192.168.0.2 remote-port=500 remote-id=sun.strongswan.org initiator=yes.*encr-alg=AES_CBC encr-keysize=128 integ-alg=HMAC_SHA2_256_128 prf-alg=PRF_HMAC_SHA2_256 dh-group=CURVE_25519.*child-sas.*net-net.*state=INSTALLED mode=TUNNEL.*ESP.*encr-alg=AES_GCM_16 encr-keysize=128.*local-ts=\[10.1.0.0/16] remote-ts=\[10.2.0.0/16]::YES
-sun:: swanctl --list-sas --raw 2> /dev/null::gw-gw.*version=2 state=ESTABLISHED local-host=192.168.0.2 local-port=500 local-id=sun.strongswan.org remote-host=192.168.0.1 remote-port=500 remote-id=moon.strongswan.org.*encr-alg=AES_CBC encr-keysize=128 integ-alg=HMAC_SHA2_256_128 prf-alg=PRF_HMAC_SHA2_256 dh-group=CURVE_25519.*child-sas.*net-net.*state=INSTALLED mode=TUNNEL.*ESP.*encr-alg=AES_GCM_16 encr-keysize=128.*local-ts=\[10.2.0.0/16] remote-ts=\[10.1.0.0/16]::YES
-alice::ping -c 1 PH_IP_BOB::64 bytes from PH_IP_BOB: icmp_.eq=1::YES
-sun::tcpdump::IP moon.strongswan.org > sun.strongswan.org: ESP::YES
-sun::tcpdump::IP sun.strongswan.org > moon.strongswan.org: ESP::YES
diff --git a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/moon/etc/strongswan.conf
deleted file mode 100755
index 50d8bcce90..0000000000
--- a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/moon/etc/strongswan.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-swanctl {
-  load = pem x509 revocation constraints pubkey openssl random
-}
-
-charon-systemd {
-  load = random nonce pem x509 revocation constraints pubkey openssl curl kernel-netlink socket-default updown vici
-}
diff --git a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/moon/etc/swanctl/swanctl.conf
deleted file mode 100755
index bcc2742f78..0000000000
--- a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/moon/etc/swanctl/swanctl.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-connections {
-
-   gw-gw {
-      local_addrs  = 192.168.0.1
-      remote_addrs = 192.168.0.2 
-
-      local {
-         auth = pubkey
-         certs = moonCert.pem
-         id = moon.strongswan.org
-      }
-      remote {
-         auth = pubkey
-         id = sun.strongswan.org 
-      }
-      children {
-         net-net {
-            local_ts  = 10.1.0.0/16 
-            remote_ts = 10.2.0.0/16 
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            rekey_time = 5400
-            rekey_bytes = 500000000
-            rekey_packets = 1000000
-            esp_proposals = aes128gcm128-x25519
-         }
-      }
-      version = 2
-      mobike = no
-      reauth_time = 10800
-      proposals = aes128-sha256-x25519
-   }
-}
diff --git a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/sun/etc/strongswan.conf b/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/sun/etc/strongswan.conf
deleted file mode 100755
index 50d8bcce90..0000000000
--- a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/sun/etc/strongswan.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-swanctl {
-  load = pem x509 revocation constraints pubkey openssl random
-}
-
-charon-systemd {
-  load = random nonce pem x509 revocation constraints pubkey openssl curl kernel-netlink socket-default updown vici
-}
diff --git a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/sun/etc/swanctl/swanctl.conf b/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/sun/etc/swanctl/swanctl.conf
deleted file mode 100755
index 12cee0fc6d..0000000000
--- a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/hosts/sun/etc/swanctl/swanctl.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-connections {
-
-   gw-gw {
-      local_addrs  = 192.168.0.2
-      remote_addrs = 192.168.0.1 
-
-      local {
-         auth = pubkey
-         certs = sunCert.pem
-         id = sun.strongswan.org
-      }
-      remote {
-         auth = pubkey
-         id = moon.strongswan.org 
-      }
-      children {
-         net-net {
-            local_ts  = 10.2.0.0/16 
-            remote_ts = 10.1.0.0/16 
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            rekey_time = 5400
-            rekey_bytes = 500000000
-            rekey_packets = 1000000
-            esp_proposals = aes128gcm128-x25519
-         }
-      }
-      version = 2
-      mobike = no
-      reauth_time = 10800
-      proposals = aes128-sha256-x25519
-   }
-}
diff --git a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/posttest.dat b/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/posttest.dat
deleted file mode 100755
index cc6a5bff73..0000000000
--- a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/posttest.dat
+++ /dev/null
@@ -1,5 +0,0 @@
-moon::swanctl --terminate --ike gw-gw 2> /dev/null
-moon::systemctl stop strongswan
-sun::systemctl stop strongswan
-moon::iptables-restore < /etc/iptables.flush
-sun::iptables-restore < /etc/iptables.flush
diff --git a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/pretest.dat b/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/pretest.dat
deleted file mode 100755
index 2d3c8c1e20..0000000000
--- a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/pretest.dat
+++ /dev/null
@@ -1,7 +0,0 @@
-moon::iptables-restore < /etc/iptables.rules
-sun::iptables-restore < /etc/iptables.rules
-moon::systemctl start strongswan
-sun::systemctl start strongswan
-moon::expect-connection gw-gw
-sun::expect-connection gw-gw
-moon::swanctl --initiate --child net-net 2> /dev/null
diff --git a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/test.conf b/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/test.conf
deleted file mode 100755
index 07a3b247a1..0000000000
--- a/testing/tests/openssl-ikev2/net2net-sha3-rsa-cert/test.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This configuration file provides information on the
-# guest instances used for this test
-
-# All guest instances that are required for this test
-#
-VIRTHOSTS="alice moon winnetou sun bob"
-
-# Corresponding block diagram
-#
-DIAGRAM="a-m-w-s-b.png"
- 
-# Guest instances on which tcpdump is to be started
-#
-TCPDUMPHOSTS="sun"
-
-# Guest instances on which IPsec is started
-# Used for IPsec logging purposes
-#
-IPSECHOSTS="moon sun"
-
-# charon controlled by swanctl
-#
-SWANCTL=1
diff --git a/testing/tests/openssl-ikev2/rw-cert/description.txt b/testing/tests/openssl-ikev2/rw-cert/description.txt
deleted file mode 100644
index ca738a1d4e..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/description.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-The roadwarrior <b>carol</b> and the gateway <b>moon</b> use the <b>openssl</b>
-plugin based on the <b>OpenSSL</b> library for all cryptographical and X.509 certificate
-functions whereas roadwarrior <b>dave</b> uses the default <b>strongSwan</b> cryptographical
-plugins <b>aes des sha1 sha2 hmac gmp</b> and <b>x509</b>.
-<p/>
-The roadwarriors <b>carol</b> and <b>dave</b> set up a connection each
-to gateway <b>moon</b>. The authentication is based on <b>X.509 certificates</b>.
-<p/>
-Upon the successful establishment of the IPsec tunnels, the updown script
-automatically inserts iptables-based firewall rules that let pass the tunneled traffic.
-In order to test both tunnel and firewall, both <b>carol</b> and <b>dave</b> ping
-the client <b>alice</b> behind the gateway <b>moon</b>.
-
diff --git a/testing/tests/openssl-ikev2/rw-cert/evaltest.dat b/testing/tests/openssl-ikev2/rw-cert/evaltest.dat
deleted file mode 100644
index 572a138a6d..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/evaltest.dat
+++ /dev/null
@@ -1,10 +0,0 @@
-carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_.eq=1::YES
-dave:: ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_.eq=1::YES
-carol::swanctl --list-sas --raw 2> /dev/null::home.*version=2 state=ESTABLISHED local-host=192.168.0.100 local-port=4500 local-id=carol@strongswan.org remote-host=192.168.0.1 remote-port=4500 remote-id=moon.strongswan.org initiator=yes.*encr-alg=3DES_CBC integ-alg=HMAC_SHA1_96 prf-alg=PRF_HMAC_SHA1 dh-group=MODP_2048.*child-sas.*home.*state=INSTALLED mode=TUNNEL.*ESP.*encr-alg=3DES_CBC.*local-ts=\[192.168.0.100/32] remote-ts=\[10.1.0.0/16]::YES
-dave:: swanctl --list-sas --raw 2> /dev/null::home.*version=2 state=ESTABLISHED local-host=192.168.0.200 local-port=4500 local-id=dave@strongswan.org remote-host=192.168.0.1 remote-port=4500 remote-id=moon.strongswan.org initiator=yes.*encr-alg=AES_CBC encr-keysize=128 integ-alg=HMAC_SHA2_256_128 prf-alg=PRF_HMAC_SHA2_256 dh-group=MODP_3072.*child-sas.*home.*state=INSTALLED mode=TUNNEL.*ESP.*encr-alg=AES_GCM_16 encr-keysize=128.*local-ts=\[192.168.0.200/32] remote-ts=\[10.1.0.0/16]::YES
-moon:: swanctl --list-sas --ike-id 1 --raw 2> /dev/null::rw.*version=2 state=ESTABLISHED local-host=192.168.0.1 local-port=4500 local-id=moon.strongswan.org remote-host=192.168.0.100 remote-port=4500 remote-id=carol@strongswan.org.*encr-alg=3DES_CBC integ-alg=HMAC_SHA1_96 prf-alg=PRF_HMAC_SHA1 dh-group=MODP_2048.*child-sas.*net.*reqid=1 state=INSTALLED mode=TUNNEL.*ESP.*encr-alg=3DES_CBC.*local-ts=\[10.1.0.0/16] remote-ts=\[192.168.0.100/32]::YES
-moon:: swanctl --list-sas --ike-id 2 --raw 2> /dev/null::rw.*version=2 state=ESTABLISHED local-host=192.168.0.1 local-port=4500 local-id=moon.strongswan.org remote-host=192.168.0.200 remote-port=4500 remote-id=dave@strongswan.org.*encr-alg=AES_CBC encr-keysize=128 integ-alg=HMAC_SHA2_256_128 prf-alg=PRF_HMAC_SHA2_256 dh-group=MODP_3072.*child-sas.*net.*reqid=2 state=INSTALLED mode=TUNNEL.*ESP.*encr-alg=AES_GCM_16 encr-keysize=128.*local-ts=\[10.1.0.0/16] remote-ts=\[192.168.0.200/32]::YES
-moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP::YES
-moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP::YES
-moon::tcpdump::IP dave.strongswan.org > moon.strongswan.org: ESP::YES
-moon::tcpdump::IP moon.strongswan.org > dave.strongswan.org: ESP::YES
diff --git a/testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
deleted file mode 100644
index 996be95f53..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-charon {
-  load = test-vectors pem pkcs1 openssl curl revocation nonce xcbc cmac ctr ccm vici kernel-netlink socket-default updown
-
-  integrity_test = yes
-  crypto_test {
-    on_add = yes
-  }
-}
diff --git a/testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/swanctl/swanctl.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/swanctl/swanctl.conf
deleted file mode 100755
index e8504addbb..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/hosts/carol/etc/swanctl/swanctl.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-connections {
-
-   home {
-      local_addrs  = 192.168.0.100
-      remote_addrs = 192.168.0.1
-
-      local {
-         auth = pubkey
-         certs = carolCert.pem
-         id = carol@strongswan.org
-      }
-      remote {
-         auth = pubkey
-         id = moon.strongswan.org
-      }
-      children {
-         home {
-            remote_ts = 10.1.0.0/16
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            esp_proposals = 3des-sha1-modp2048
-         }
-      }
-      version = 2
-      proposals = 3des-sha1-modp2048
-   }
-}
diff --git a/testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/strongswan.conf
deleted file mode 100644
index f78a0fb91e..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/strongswan.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-charon {
-  load = test-vectors aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 curl revocation hmac kdf xcbc cmac ctr ccm gcm vici kernel-netlink socket-default updown
-
-  integrity_test = yes
-  crypto_test {
-    required = yes
-    on_add = yes
-  }
-}
diff --git a/testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/swanctl/swanctl.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/swanctl/swanctl.conf
deleted file mode 100755
index 27c6f12ba8..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/hosts/dave/etc/swanctl/swanctl.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-connections {
-
-   home {
-      local_addrs  = 192.168.0.200
-      remote_addrs = 192.168.0.1
-
-      local {
-         auth = pubkey
-         certs = daveCert.pem
-         id = dave@strongswan.org
-      }
-      remote {
-         auth = pubkey
-         id = moon.strongswan.org
-      }
-      children {
-         home {
-            remote_ts = 10.1.0.0/16
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            esp_proposals = aes128gcm128-modp3072
-         }
-      }
-      version = 2
-      proposals = aes128-sha256-modp3072
-   }
-}
diff --git a/testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
deleted file mode 100644
index 996be95f53..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-# /etc/strongswan.conf - strongSwan configuration file
-
-charon {
-  load = test-vectors pem pkcs1 openssl curl revocation nonce xcbc cmac ctr ccm vici kernel-netlink socket-default updown
-
-  integrity_test = yes
-  crypto_test {
-    on_add = yes
-  }
-}
diff --git a/testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/swanctl/swanctl.conf b/testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/swanctl/swanctl.conf
deleted file mode 100755
index aa8d6167af..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/hosts/moon/etc/swanctl/swanctl.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-connections {
-
-   rw {
-      local_addrs  = 192.168.0.1
-
-      local {
-         auth = pubkey
-         certs = moonCert.pem
-         id = moon.strongswan.org
-      }
-      remote {
-         auth = pubkey
-      }
-      children {
-         net {
-            local_ts  = 10.1.0.0/16
-
-            updown = /usr/local/libexec/ipsec/_updown iptables
-            esp_proposals = aes128gcm128-modp3072,3des-sha1-modp2048
-         }
-      }
-      version = 2
-      proposals = aes128-sha256-modp3072,3des-sha1-modp2048
-   }
-}
diff --git a/testing/tests/openssl-ikev2/rw-cert/posttest.dat b/testing/tests/openssl-ikev2/rw-cert/posttest.dat
deleted file mode 100644
index eb21008563..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/posttest.dat
+++ /dev/null
@@ -1,8 +0,0 @@
-carol::swanctl --terminate --ike home
-dave::swanctl --terminate --ike home
-carol::systemctl stop strongswan
-dave::systemctl stop strongswan
-moon::systemctl stop strongswan
-moon::iptables-restore < /etc/iptables.flush
-carol::iptables-restore < /etc/iptables.flush
-dave::iptables-restore < /etc/iptables.flush
diff --git a/testing/tests/openssl-ikev2/rw-cert/pretest.dat b/testing/tests/openssl-ikev2/rw-cert/pretest.dat
deleted file mode 100644
index 6a1f10c7bc..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/pretest.dat
+++ /dev/null
@@ -1,11 +0,0 @@
-mmoon::iptables-restore < /etc/iptables.rules
-carol::iptables-restore < /etc/iptables.rules
-dave::iptables-restore < /etc/iptables.rules
-moon::systemctl start strongswan
-carol::systemctl start strongswan
-dave::systemctl start strongswan
-moon::expect-connection rw
-carol::expect-connection home
-carol::swanctl --initiate --child home 2> /dev/null
-dave::expect-connection home
-dave::swanctl --initiate --child home 2> /dev/null
diff --git a/testing/tests/openssl-ikev2/rw-cert/test.conf b/testing/tests/openssl-ikev2/rw-cert/test.conf
deleted file mode 100644
index 1227b9d1c0..0000000000
--- a/testing/tests/openssl-ikev2/rw-cert/test.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# This configuration file provides information on the
-# guest instances used for this test
-
-# All guest instances that are required for this test
-#
-VIRTHOSTS="alice moon carol winnetou dave"
-
-# Corresponding block diagram
-#
-DIAGRAM="a-m-c-w-d.png"
-
-# Guest instances on which tcpdump is to be started
-#
-TCPDUMPHOSTS="moon"
-
-# Guest instances on which IPsec is started
-# Used for IPsec logging purposes
-#
-IPSECHOSTS="moon carol dave"
-
-# charon controlled by swanctl
-#
-SWANCTL=1