From 9709520a846775b381fb2b8ee85a61931266ee8c Mon Sep 17 00:00:00 2001
From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Thu, 18 Jun 2009 07:15:51 +0200
Subject: [PATCH] moved alg-serpent and alg-twofish scenarios to gcrypt-ikev1

---
 .../tests/{ikev1 => gcrypt-ikev1}/alg-serpent/description.txt   | 0
 testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/evaltest.dat  | 0
 .../alg-serpent/hosts/carol/etc/ipsec.conf                      | 0
 .../alg-serpent/hosts/carol/etc/strongswan.conf                 | 2 +-
 .../alg-serpent/hosts/moon/etc/ipsec.conf                       | 0
 .../alg-serpent/hosts/moon/etc/strongswan.conf                  | 2 +-
 testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/posttest.dat  | 0
 testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/pretest.dat   | 0
 testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/test.conf     | 0
 .../tests/{ikev1 => gcrypt-ikev1}/alg-twofish/description.txt   | 0
 testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/evaltest.dat  | 0
 .../alg-twofish/hosts/carol/etc/ipsec.conf                      | 0
 .../alg-twofish/hosts/carol/etc/strongswan.conf                 | 2 +-
 .../alg-twofish/hosts/moon/etc/ipsec.conf                       | 0
 .../alg-twofish/hosts/moon/etc/strongswan.conf                  | 2 +-
 testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/posttest.dat  | 0
 testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/pretest.dat   | 0
 testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/test.conf     | 0
 .../rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/description.txt      | 0
 .../{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/evaltest.dat | 0
 .../rw-cert}/hosts/carol/etc/ipsec.conf                         | 0
 .../rw-cert}/hosts/carol/etc/strongswan.conf                    | 0
 .../rw-cert}/hosts/dave/etc/ipsec.conf                          | 0
 .../rw-cert}/hosts/dave/etc/strongswan.conf                     | 0
 .../rw-cert}/hosts/moon/etc/ipsec.conf                          | 0
 .../rw-cert}/hosts/moon/etc/strongswan.conf                     | 0
 .../{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/posttest.dat | 0
 .../{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/pretest.dat  | 0
 .../{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/test.conf    | 0
 .../rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/description.txt      | 0
 .../{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/evaltest.dat | 0
 .../rw-cert}/hosts/carol/etc/ipsec.conf                         | 0
 .../rw-cert}/hosts/carol/etc/strongswan.conf                    | 0
 .../rw-cert}/hosts/dave/etc/ipsec.conf                          | 0
 .../rw-cert}/hosts/dave/etc/strongswan.conf                     | 0
 .../rw-cert}/hosts/moon/etc/ipsec.conf                          | 0
 .../rw-cert}/hosts/moon/etc/strongswan.conf                     | 0
 .../{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/posttest.dat | 0
 .../{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/pretest.dat  | 0
 .../{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/test.conf    | 0
 40 files changed, 4 insertions(+), 4 deletions(-)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/description.txt (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/evaltest.dat (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/hosts/carol/etc/ipsec.conf (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/hosts/carol/etc/strongswan.conf (71%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/hosts/moon/etc/ipsec.conf (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/hosts/moon/etc/strongswan.conf (71%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/posttest.dat (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/pretest.dat (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-serpent/test.conf (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/description.txt (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/evaltest.dat (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/hosts/carol/etc/ipsec.conf (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/hosts/carol/etc/strongswan.conf (71%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/hosts/moon/etc/ipsec.conf (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/hosts/moon/etc/strongswan.conf (71%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/posttest.dat (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/pretest.dat (100%)
 rename testing/tests/{ikev1 => gcrypt-ikev1}/alg-twofish/test.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/description.txt (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/evaltest.dat (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/hosts/carol/etc/ipsec.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/hosts/carol/etc/strongswan.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/hosts/dave/etc/ipsec.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/hosts/dave/etc/strongswan.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/hosts/moon/etc/ipsec.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/hosts/moon/etc/strongswan.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/posttest.dat (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/pretest.dat (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev1 => gcrypt-ikev1/rw-cert}/test.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/description.txt (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/evaltest.dat (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/hosts/carol/etc/ipsec.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/hosts/carol/etc/strongswan.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/hosts/dave/etc/ipsec.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/hosts/dave/etc/strongswan.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/hosts/moon/etc/ipsec.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/hosts/moon/etc/strongswan.conf (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/posttest.dat (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/pretest.dat (100%)
 rename testing/tests/{gcrypt/rw-cert-ikev2 => gcrypt-ikev2/rw-cert}/test.conf (100%)

diff --git a/testing/tests/ikev1/alg-serpent/description.txt b/testing/tests/gcrypt-ikev1/alg-serpent/description.txt
similarity index 100%
rename from testing/tests/ikev1/alg-serpent/description.txt
rename to testing/tests/gcrypt-ikev1/alg-serpent/description.txt
diff --git a/testing/tests/ikev1/alg-serpent/evaltest.dat b/testing/tests/gcrypt-ikev1/alg-serpent/evaltest.dat
similarity index 100%
rename from testing/tests/ikev1/alg-serpent/evaltest.dat
rename to testing/tests/gcrypt-ikev1/alg-serpent/evaltest.dat
diff --git a/testing/tests/ikev1/alg-serpent/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev1/alg-serpent/hosts/carol/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev1/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
similarity index 71%
rename from testing/tests/ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
index 952664687..0c6fd2c9f 100644
--- a/testing/tests/ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des serpent hmac gmp pubkey random curl
+  load = gcrypt hmac pubkey curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/ikev1/alg-serpent/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev1/alg-serpent/hosts/moon/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/ikev1/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
similarity index 71%
rename from testing/tests/ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
index 952664687..0c6fd2c9f 100644
--- a/testing/tests/ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des serpent hmac gmp pubkey random curl
+  load = gcrypt hmac pubkey curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/ikev1/alg-serpent/posttest.dat b/testing/tests/gcrypt-ikev1/alg-serpent/posttest.dat
similarity index 100%
rename from testing/tests/ikev1/alg-serpent/posttest.dat
rename to testing/tests/gcrypt-ikev1/alg-serpent/posttest.dat
diff --git a/testing/tests/ikev1/alg-serpent/pretest.dat b/testing/tests/gcrypt-ikev1/alg-serpent/pretest.dat
similarity index 100%
rename from testing/tests/ikev1/alg-serpent/pretest.dat
rename to testing/tests/gcrypt-ikev1/alg-serpent/pretest.dat
diff --git a/testing/tests/ikev1/alg-serpent/test.conf b/testing/tests/gcrypt-ikev1/alg-serpent/test.conf
similarity index 100%
rename from testing/tests/ikev1/alg-serpent/test.conf
rename to testing/tests/gcrypt-ikev1/alg-serpent/test.conf
diff --git a/testing/tests/ikev1/alg-twofish/description.txt b/testing/tests/gcrypt-ikev1/alg-twofish/description.txt
similarity index 100%
rename from testing/tests/ikev1/alg-twofish/description.txt
rename to testing/tests/gcrypt-ikev1/alg-twofish/description.txt
diff --git a/testing/tests/ikev1/alg-twofish/evaltest.dat b/testing/tests/gcrypt-ikev1/alg-twofish/evaltest.dat
similarity index 100%
rename from testing/tests/ikev1/alg-twofish/evaltest.dat
rename to testing/tests/gcrypt-ikev1/alg-twofish/evaltest.dat
diff --git a/testing/tests/ikev1/alg-twofish/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev1/alg-twofish/hosts/carol/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev1/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
similarity index 71%
rename from testing/tests/ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
index 57bf3cc74..0c6fd2c9f 100644
--- a/testing/tests/ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des twofish hmac gmp pubkey random curl
+  load = gcrypt hmac pubkey curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/ikev1/alg-twofish/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/ikev1/alg-twofish/hosts/moon/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/ikev1/alg-twofish/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
similarity index 71%
rename from testing/tests/ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
index 57bf3cc74..0c6fd2c9f 100644
--- a/testing/tests/ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/strongswan.conf
@@ -1,7 +1,7 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des twofish hmac gmp pubkey random curl
+  load = gcrypt hmac pubkey curl
 }
 
 # pluto uses optimized DH exponent sizes (RFC 3526)
diff --git a/testing/tests/ikev1/alg-twofish/posttest.dat b/testing/tests/gcrypt-ikev1/alg-twofish/posttest.dat
similarity index 100%
rename from testing/tests/ikev1/alg-twofish/posttest.dat
rename to testing/tests/gcrypt-ikev1/alg-twofish/posttest.dat
diff --git a/testing/tests/ikev1/alg-twofish/pretest.dat b/testing/tests/gcrypt-ikev1/alg-twofish/pretest.dat
similarity index 100%
rename from testing/tests/ikev1/alg-twofish/pretest.dat
rename to testing/tests/gcrypt-ikev1/alg-twofish/pretest.dat
diff --git a/testing/tests/ikev1/alg-twofish/test.conf b/testing/tests/gcrypt-ikev1/alg-twofish/test.conf
similarity index 100%
rename from testing/tests/ikev1/alg-twofish/test.conf
rename to testing/tests/gcrypt-ikev1/alg-twofish/test.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/description.txt b/testing/tests/gcrypt-ikev1/rw-cert/description.txt
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/description.txt
rename to testing/tests/gcrypt-ikev1/rw-cert/description.txt
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/evaltest.dat b/testing/tests/gcrypt-ikev1/rw-cert/evaltest.dat
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/evaltest.dat
rename to testing/tests/gcrypt-ikev1/rw-cert/evaltest.dat
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev1/rw-cert/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/hosts/carol/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev1/rw-cert/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/rw-cert/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/hosts/carol/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev1/rw-cert/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/hosts/dave/etc/ipsec.conf b/testing/tests/gcrypt-ikev1/rw-cert/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/hosts/dave/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev1/rw-cert/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/hosts/dave/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/rw-cert/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/hosts/dave/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev1/rw-cert/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1/rw-cert/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/hosts/moon/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev1/rw-cert/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/rw-cert/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/hosts/moon/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev1/rw-cert/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/posttest.dat b/testing/tests/gcrypt-ikev1/rw-cert/posttest.dat
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/posttest.dat
rename to testing/tests/gcrypt-ikev1/rw-cert/posttest.dat
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/pretest.dat b/testing/tests/gcrypt-ikev1/rw-cert/pretest.dat
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/pretest.dat
rename to testing/tests/gcrypt-ikev1/rw-cert/pretest.dat
diff --git a/testing/tests/gcrypt/rw-cert-ikev1/test.conf b/testing/tests/gcrypt-ikev1/rw-cert/test.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev1/test.conf
rename to testing/tests/gcrypt-ikev1/rw-cert/test.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/description.txt b/testing/tests/gcrypt-ikev2/rw-cert/description.txt
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/description.txt
rename to testing/tests/gcrypt-ikev2/rw-cert/description.txt
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/evaltest.dat b/testing/tests/gcrypt-ikev2/rw-cert/evaltest.dat
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/evaltest.dat
rename to testing/tests/gcrypt-ikev2/rw-cert/evaltest.dat
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/ipsec.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/hosts/carol/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/hosts/carol/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev2/rw-cert/hosts/carol/etc/strongswan.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/hosts/dave/etc/ipsec.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/dave/etc/ipsec.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/hosts/dave/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev2/rw-cert/hosts/dave/etc/ipsec.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/hosts/dave/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/dave/etc/strongswan.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/hosts/dave/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev2/rw-cert/hosts/dave/etc/strongswan.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/ipsec.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/hosts/moon/etc/ipsec.conf
rename to testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/hosts/moon/etc/strongswan.conf
rename to testing/tests/gcrypt-ikev2/rw-cert/hosts/moon/etc/strongswan.conf
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/posttest.dat b/testing/tests/gcrypt-ikev2/rw-cert/posttest.dat
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/posttest.dat
rename to testing/tests/gcrypt-ikev2/rw-cert/posttest.dat
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/pretest.dat b/testing/tests/gcrypt-ikev2/rw-cert/pretest.dat
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/pretest.dat
rename to testing/tests/gcrypt-ikev2/rw-cert/pretest.dat
diff --git a/testing/tests/gcrypt/rw-cert-ikev2/test.conf b/testing/tests/gcrypt-ikev2/rw-cert/test.conf
similarity index 100%
rename from testing/tests/gcrypt/rw-cert-ikev2/test.conf
rename to testing/tests/gcrypt-ikev2/rw-cert/test.conf