testing: Moving certificates to correct test cases

diff --git a/testing/scripts/build-certs-chroot b/testing/scripts/build-certs-chroot
index 62b043f4b72ae491d72f2060e850ca970fc8d29f..ea68dd16a88643963479af4b103e3a1fcba39bbc 100755 (executable)
--- a/testing/scripts/build-certs-chroot
+++ b/testing/scripts/build-certs-chroot
@@ -1130,10 +1130,10 @@ pki --self --type ecdsa --in ${ECDSA_KEY} \
     --dn "C=CH, O=${PROJECT}, CN=strongSwan EC Root CA" \
     --outform pem > ${ECDSA_CERT}
 
-# Put a copy in the openssl-ikev2/ecdsa-certs scenario
+# Put a copy in the ikev2/ecdsa-certs scenario
 for t in ecdsa-certs ecdsa-pkcs8
 do
-  TEST="${TEST_DIR}/openssl-ikev2/${t}"
+  TEST="${TEST_DIR}/ikev2/${t}"
   for h in moon carol dave
   do
     mkdir -p ${TEST}/hosts/${h}/${SWANCTL_DIR}/x509ca
@@ -1142,7 +1142,7 @@ do
 done
 
 # Generate a moon ECDSA 521 bit certificate
-TEST="${TEST_DIR}/openssl-ikev2/ecdsa-certs"
+TEST="${TEST_DIR}/ikev2/ecdsa-certs"
 MOON_KEY="${TEST}/hosts/moon/${SWANCTL_DIR}/ecdsa/moonKey.pem"
 MOON_CERT="${TEST}/hosts/moon/${SWANCTL_DIR}/x509/moonCert.pem"
 CN="moon.strongswan.org"
@@ -1184,8 +1184,8 @@ pki --issue --cakey ${ECDSA_KEY} --cacert ${ECDSA_CERT} --type ecdsa \
     --crl ${ECDSA_CDP} --outform pem > ${DAVE_CERT}
 cp ${DAVE_CERT} ${ECDSA_DIR}/certs/${SERIAL}.pem
 
-# Put CA and EE certificate copies in the openssl-ikev2/ecdsa-pkcs8 scenario
-TEST="${TEST_DIR}/openssl-ikev2/ecdsa-pkcs8"
+# Put CA and EE certificate copies in the ikev2/ecdsa-pkcs8 scenario
+TEST="${TEST_DIR}/ikev2/ecdsa-pkcs8"
 mkdir -p ${TEST}/hosts/moon/${SWANCTL_DIR}/x509
 mkdir -p ${TEST}/hosts/carol/${SWANCTL_DIR}/x509
 mkdir -p ${TEST}/hosts/dave/${SWANCTL_DIR}/x509
@@ -1210,8 +1210,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
@@ -1396,8 +1396,8 @@ pki --issue --cakey ${SHA3_RSA_KEY} --cacert ${SHA3_RSA_CERT} --type rsa \
     --crl ${SHA3_RSA_CDP} --digest sha3_256 --outform pem > ${MOON_CERT}
 cp ${MOON_CERT} ${SHA3_RSA_DIR}/certs/${SERIAL}.pem
 
-# Put a copy in the botan openssl-ikev2 and wolfssl net2net-sha3-rsa-cert scenarios
-for d in botan openssl-ikev2 wolfssl
+# Put a copy in the botan and wolfssl net2net-sha3-rsa-cert scenarios
+for d in botan wolfssl
 do
   TEST="${TEST_DIR}/${d}/net2net-sha3-rsa-cert"
   cd ${TEST}/hosts/moon/${SWANCTL_DIR}