moved alg-serpent and alg-twofish scenarios to gcrypt-ikev1

40 files changed, 4 insertions, 4 deletions

diff --git a/testing/tests/ikev1/alg-serpent/description.txt b/testing/tests/gcrypt-ikev1/alg-serpent/description.txt
index 604fb45df..604fb45df 100644
--- a/testing/tests/ikev1/alg-serpent/description.txt
+++ b/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
index 2be8f675f..2be8f675f 100644
--- a/testing/tests/ikev1/alg-serpent/evaltest.dat
+++ b/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
index b050f022a..b050f022a 100755
--- a/testing/tests/ikev1/alg-serpent/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev1/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/carol/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/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
index 75830f043..75830f043 100755
--- a/testing/tests/ikev1/alg-serpent/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/ipsec.conf
diff --git a/testing/tests/ikev1/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-serpent/hosts/moon/etc/strongswan.conf
index 57bf3cc74..0c6fd2c9f 100644
--- a/testing/tests/ikev1/alg-twofish/hosts/carol/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 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-serpent/posttest.dat b/testing/tests/gcrypt-ikev1/alg-serpent/posttest.dat
index c6d6235f9..c6d6235f9 100644
--- a/testing/tests/ikev1/alg-serpent/posttest.dat
+++ b/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
index 6d2eeb5f9..6d2eeb5f9 100644
--- a/testing/tests/ikev1/alg-serpent/pretest.dat
+++ b/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
index a6c8f026c..a6c8f026c 100644
--- a/testing/tests/ikev1/alg-serpent/test.conf
+++ b/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
index b65ea7b8d..b65ea7b8d 100644
--- a/testing/tests/ikev1/alg-twofish/description.txt
+++ b/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
index 34c9d1c65..34c9d1c65 100644
--- a/testing/tests/ikev1/alg-twofish/evaltest.dat
+++ b/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
index 71ed47519..71ed47519 100755
--- a/testing/tests/ikev1/alg-twofish/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/carol/etc/ipsec.conf
diff --git a/testing/tests/ikev1/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1/alg-twofish/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-twofish/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-twofish/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1/alg-twofish/hosts/moon/etc/ipsec.conf
index ba739f887..ba739f887 100755
--- a/testing/tests/ikev1/alg-twofish/hosts/moon/etc/ipsec.conf
+++ b/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
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
index c6d6235f9..c6d6235f9 100644
--- a/testing/tests/ikev1/alg-twofish/posttest.dat
+++ b/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
index 7d077c126..7d077c126 100644
--- a/testing/tests/ikev1/alg-twofish/pretest.dat
+++ b/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
index a6c8f026c..a6c8f026c 100644
--- a/testing/tests/ikev1/alg-twofish/test.conf
+++ b/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
index f60f5b1ad..f60f5b1ad 100644
--- a/testing/tests/gcrypt/rw-cert-ikev1/description.txt
+++ b/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
index 1a9b9159f..1a9b9159f 100644
--- a/testing/tests/gcrypt/rw-cert-ikev1/evaltest.dat
+++ b/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
index 80dae3719..80dae3719 100755
--- a/testing/tests/gcrypt/rw-cert-ikev1/hosts/carol/etc/ipsec.conf
+++ b/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
index 0840260c3..0840260c3 100644
--- a/testing/tests/gcrypt/rw-cert-ikev1/hosts/carol/etc/strongswan.conf
+++ b/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
index 73167caad..73167caad 100755
--- a/testing/tests/gcrypt/rw-cert-ikev1/hosts/dave/etc/ipsec.conf
+++ b/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
index fdfb0003f..fdfb0003f 100644
--- a/testing/tests/gcrypt/rw-cert-ikev1/hosts/dave/etc/strongswan.conf
+++ b/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
index f365b07da..f365b07da 100755
--- a/testing/tests/gcrypt/rw-cert-ikev1/hosts/moon/etc/ipsec.conf
+++ b/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
index 0840260c3..0840260c3 100644
--- a/testing/tests/gcrypt/rw-cert-ikev1/hosts/moon/etc/strongswan.conf
+++ b/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
index 7cebd7f25..7cebd7f25 100644
--- a/testing/tests/gcrypt/rw-cert-ikev1/posttest.dat
+++ b/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
index 42e9d7c24..42e9d7c24 100644
--- a/testing/tests/gcrypt/rw-cert-ikev1/pretest.dat
+++ b/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
index 70416826e..70416826e 100644
--- a/testing/tests/gcrypt/rw-cert-ikev1/test.conf
+++ b/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
index f60f5b1ad..f60f5b1ad 100644
--- a/testing/tests/gcrypt/rw-cert-ikev2/description.txt
+++ b/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
index 06a0f8cda..06a0f8cda 100644
--- a/testing/tests/gcrypt/rw-cert-ikev2/evaltest.dat
+++ b/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
index 4a8baa3ae..4a8baa3ae 100755
--- a/testing/tests/gcrypt/rw-cert-ikev2/hosts/carol/etc/ipsec.conf
+++ b/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
index edb7e40d1..edb7e40d1 100644
--- a/testing/tests/gcrypt/rw-cert-ikev2/hosts/carol/etc/strongswan.conf
+++ b/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
index 42f03aab3..42f03aab3 100755
--- a/testing/tests/gcrypt/rw-cert-ikev2/hosts/dave/etc/ipsec.conf
+++ b/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
index f4b6dfdb9..f4b6dfdb9 100644
--- a/testing/tests/gcrypt/rw-cert-ikev2/hosts/dave/etc/strongswan.conf
+++ b/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
index 2e84f2e6a..2e84f2e6a 100755
--- a/testing/tests/gcrypt/rw-cert-ikev2/hosts/moon/etc/ipsec.conf
+++ b/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
index edb7e40d1..edb7e40d1 100644
--- a/testing/tests/gcrypt/rw-cert-ikev2/hosts/moon/etc/strongswan.conf
+++ b/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
index 7cebd7f25..7cebd7f25 100644
--- a/testing/tests/gcrypt/rw-cert-ikev2/posttest.dat
+++ b/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
index 42e9d7c24..42e9d7c24 100644
--- a/testing/tests/gcrypt/rw-cert-ikev2/pretest.dat
+++ b/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
index 70416826e..70416826e 100644
--- a/testing/tests/gcrypt/rw-cert-ikev2/test.conf
+++ b/testing/tests/gcrypt-ikev2/rw-cert/test.conf