added gcrypt-ikev1 pluto interoperability tests

54 files changed, 696 insertions, 0 deletions

diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/description.txt b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/description.txt
new file mode 100644
index 000000000..982efa5ea
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/description.txt
@@ -0,0 +1,4 @@
+Roadwarrior <b>carol</b> proposes  to gateway <b>moon</b> the strong cipher suite
+<b>SERPENT_CBC_256 / HMAC_SHA2_512 / MODP_4096</b> for the IKE protocol and 
+<b>SERPENT_CBC_256 / HMAC_SHA2_512_256 </b> for ESP packets. A ping from <b>carol</b> to
+<b>alice</b> successfully checks the established tunnel.
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/evaltest.dat b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/evaltest.dat
new file mode 100644
index 000000000..6db972905
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/evaltest.dat
@@ -0,0 +1,13 @@
+carol::ipsec status 2> /dev/null::home.*ESTABLISHED.*carol@strongswan.org.*moon.strongswan.org::YES
+moon:: ipsec status 2> /dev/null::rw.*STATE_MAIN_R3.*sent MR3, ISAKMP SA established::YES
+carol::ipsec status 2> /dev/null::home.*INSTALLED, TUNNEL::YES
+moon:: ipsec status 2> /dev/null::rw.*STATE_QUICK_R2.*IPsec SA established::YES
+carol::ipsec statusall 2> /dev/null::IKE proposal: SERPENT_CBC_256/HMAC_SHA2_512_256::YES
+moon:: ipsec statusall 2> /dev/null::IKE proposal: SERPENT_CBC_256/HMAC_SHA2_512/MODP_4096::YES
+carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_seq=1::YES
+carol::ipsec statusall 2> /dev/null::SERPENT_CBC_256/HMAC_SHA2_512_256,::YES
+moon:: ipsec statusall 2> /dev/null::ESP proposal: SERPENT_CBC_256/HMAC_SHA2_512::YES
+carol::ip xfrm state::enc cbc(serpent)::YES
+moon:: ip xfrm state::enc cbc(serpent)::YES
+moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 216::YES
+moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP.*length 216::YES
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/ipsec.conf
new file mode 100755
index 000000000..123d7d87c
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/ipsec.conf
@@ -0,0 +1,22 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutostart=no
+
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=serpent256-sha512-modp4096!
+	esp=serpent256-sha512!
+
+conn home
+	left=PH_IP_CAROL
+	leftcert=carolCert.pem
+	leftid=carol@strongswan.org
+	right=PH_IP_MOON
+	rightsubnet=10.1.0.0/16
+	rightid=@moon.strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/strongswan.conf
new file mode 100644
index 000000000..33591562a
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/carol/etc/strongswan.conf
@@ -0,0 +1,10 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  send_vendor_id = yes
+}
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/ipsec.conf
new file mode 100755
index 000000000..03c606b7c
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/ipsec.conf
@@ -0,0 +1,26 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutodebug="control"
+	crlcheckinterval=180
+	strictcrlpolicy=no
+	charonstart=no
+       
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=serpent256-sha2_512-modp4096!
+	esp=serpent256-sha2_512!
+	pfs=no
+
+conn rw
+	left=PH_IP_MOON
+	leftcert=moonCert.pem
+	leftid=@moon.strongswan.org
+	leftsubnet=10.1.0.0/16
+	right=%any
+	rightid=carol@strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/strongswan.conf
new file mode 100644
index 000000000..5e09a3a1d
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/hosts/moon/etc/strongswan.conf
@@ -0,0 +1,11 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/posttest.dat b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/posttest.dat
new file mode 100644
index 000000000..c6d6235f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/posttest.dat
@@ -0,0 +1,2 @@
+moon::ipsec stop
+carol::ipsec stop
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/pretest.dat b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/pretest.dat
new file mode 100644
index 000000000..6d2eeb5f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/pretest.dat
@@ -0,0 +1,5 @@
+moon::echo 1 > /proc/sys/net/ipv4/ip_forward
+carol::ipsec start
+moon::ipsec start
+carol::sleep 2 
+carol::ipsec up home
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-serpent/test.conf b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/test.conf
new file mode 100644
index 000000000..6abbb89a9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-serpent/test.conf
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# This configuration file provides information on the
+# UML instances used for this test
+
+# All UML instances that are required for this test
+#
+UMLHOSTS="alice moon carol winnetou"
+
+# Corresponding block diagram
+#
+DIAGRAM="a-m-c-w.png"
+
+# UML instances on which tcpdump is to be started
+#
+TCPDUMPHOSTS="moon"
+
+# UML instances on which IPsec is started
+# Used for IPsec logging purposes
+#
+IPSECHOSTS="moon carol"
+
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/description.txt b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/description.txt
new file mode 100644
index 000000000..e1a7403e3
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/description.txt
@@ -0,0 +1,4 @@
+Roadwarrior <b>carol</b> proposes  to gateway <b>moon</b> the strong cipher suite
+<b>TWOFISH_CBC_256 / HMAC_SHA2_512 / MODP_4096</b> for the IKE protocol and 
+<b>TWOFISH_CBC_256 / HMAC_SHA2_512_256 </b> for ESP packets. A ping from <b>carol</b> to
+<b>alice</b> successfully checks the established tunnel.
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/evaltest.dat b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/evaltest.dat
new file mode 100644
index 000000000..e032e824a
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/evaltest.dat
@@ -0,0 +1,13 @@
+carol::ipsec status 2> /dev/null::home.*ESTABLISHED.*carol@strongswan.org.*moon.strongswan.org::YES
+moon:: ipsec status 2> /dev/null::rw.*STATE_MAIN_R3.*sent MR3, ISAKMP SA established::YES
+carol::ipsec status 2> /dev/null::home.*INSTALLED, TUNNEL::YES
+moon:: ipsec status 2> /dev/null::rw.*STATE_QUICK_R2.*IPsec SA established::YES
+carol::ipsec statusall 2> /dev/null::IKE proposal: TWOFISH_CBC_256/HMAC_SHA2_512_256::YES
+moon:: ipsec statusall 2> /dev/null::IKE proposal: TWOFISH_CBC_256/HMAC_SHA2_512/MODP_4096::YES
+carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_seq=1::YES
+carol::ipsec statusall 2> /dev/null::TWOFISH_CBC_256/HMAC_SHA2_512_256,::YES
+moon:: ipsec statusall 2> /dev/null::ESP proposal: TWOFISH_CBC_256/HMAC_SHA2_512::YES
+carol::ip xfrm state::enc cbc(twofish)::YES
+moon:: ip xfrm state::enc cbc(twofish)::YES
+moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 216::YES
+moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP.*length 216::YES
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/ipsec.conf
new file mode 100755
index 000000000..2498329d6
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/ipsec.conf
@@ -0,0 +1,22 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutostart=no
+
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=twofish256-sha512-modp4096!
+	esp=twofish256-sha512!
+
+conn home
+	left=PH_IP_CAROL
+	leftcert=carolCert.pem
+	leftid=carol@strongswan.org
+	right=PH_IP_MOON
+	rightsubnet=10.1.0.0/16
+	rightid=@moon.strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/strongswan.conf
new file mode 100644
index 000000000..33591562a
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/carol/etc/strongswan.conf
@@ -0,0 +1,10 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  send_vendor_id = yes
+}
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/ipsec.conf
new file mode 100755
index 000000000..e8d350160
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/ipsec.conf
@@ -0,0 +1,26 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutodebug="control"
+	crlcheckinterval=180
+	strictcrlpolicy=no
+	charonstart=no
+       
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=twofish256-sha2_512-modp4096!
+	esp=twofish256-sha2_512!
+	pfs=no
+
+conn rw
+	left=PH_IP_MOON
+	leftcert=moonCert.pem
+	leftid=@moon.strongswan.org
+	leftsubnet=10.1.0.0/16
+	right=%any
+	rightid=carol@strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/strongswan.conf
new file mode 100644
index 000000000..5e09a3a1d
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/hosts/moon/etc/strongswan.conf
@@ -0,0 +1,11 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/posttest.dat b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/posttest.dat
new file mode 100644
index 000000000..c6d6235f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/posttest.dat
@@ -0,0 +1,2 @@
+moon::ipsec stop
+carol::ipsec stop
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/pretest.dat b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/pretest.dat
new file mode 100644
index 000000000..6d2eeb5f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/pretest.dat
@@ -0,0 +1,5 @@
+moon::echo 1 > /proc/sys/net/ipv4/ip_forward
+carol::ipsec start
+moon::ipsec start
+carol::sleep 2 
+carol::ipsec up home
diff --git a/testing/tests/gcrypt-ikev1-c-p/alg-twofish/test.conf b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/test.conf
new file mode 100644
index 000000000..6abbb89a9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-c-p/alg-twofish/test.conf
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# This configuration file provides information on the
+# UML instances used for this test
+
+# All UML instances that are required for this test
+#
+UMLHOSTS="alice moon carol winnetou"
+
+# Corresponding block diagram
+#
+DIAGRAM="a-m-c-w.png"
+
+# UML instances on which tcpdump is to be started
+#
+TCPDUMPHOSTS="moon"
+
+# UML instances on which IPsec is started
+# Used for IPsec logging purposes
+#
+IPSECHOSTS="moon carol"
+
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/description.txt b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/description.txt
new file mode 100644
index 000000000..982efa5ea
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/description.txt
@@ -0,0 +1,4 @@
+Roadwarrior <b>carol</b> proposes  to gateway <b>moon</b> the strong cipher suite
+<b>SERPENT_CBC_256 / HMAC_SHA2_512 / MODP_4096</b> for the IKE protocol and 
+<b>SERPENT_CBC_256 / HMAC_SHA2_512_256 </b> for ESP packets. A ping from <b>carol</b> to
+<b>alice</b> successfully checks the established tunnel.
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/evaltest.dat b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/evaltest.dat
new file mode 100644
index 000000000..d5e00e285
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/evaltest.dat
@@ -0,0 +1,13 @@
+carol::ipsec status 2> /dev/null::home.*STATE_MAIN_I4.*ISAKMP SA established::YES
+moon:: ipsec status 2> /dev/null::rw.*ESTABLISHED.*moon.strongswan.org.*carol@strongswan.org::YES
+carol::ipsec status 2> /dev/null::home.*STATE_QUICK_I2.*IPsec SA established::YES
+moon:: ipsec status 2> /dev/null::rw.*INSTALLED, TUNNEL::YES
+carol::ipsec statusall 2> /dev/null::IKE proposal: SERPENT_CBC_256/HMAC_SHA2_512/MODP_4096::YES
+moon:: ipsec statusall 2> /dev/null::IKE proposal: SERPENT_CBC_256/HMAC_SHA2_512_256::YES
+carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_seq=1::YES
+carol::ipsec statusall 2> /dev/null::ESP proposal: SERPENT_CBC_256/HMAC_SHA2_512::YES
+moon:: ipsec statusall 2> /dev/null::SERPENT_CBC_256/HMAC_SHA2_512_256,::YES
+carol::ip xfrm state::enc cbc(serpent)::YES
+moon:: ip xfrm state::enc cbc(serpent)::YES
+moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 216::YES
+moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP.*length 216::YES
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/ipsec.conf
new file mode 100755
index 000000000..3e9c89c49
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/ipsec.conf
@@ -0,0 +1,26 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutodebug="control"
+	crlcheckinterval=180
+	strictcrlpolicy=no
+	charonstart=no
+
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=serpent256-sha2_512-modp4096!
+	esp=serpent256-sha2_512!
+	pfs=no
+
+conn home
+	left=PH_IP_CAROL
+	leftcert=carolCert.pem
+	leftid=carol@strongswan.org
+	right=PH_IP_MOON
+	rightsubnet=10.1.0.0/16
+	rightid=@moon.strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/strongswan.conf
new file mode 100644
index 000000000..5e09a3a1d
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/carol/etc/strongswan.conf
@@ -0,0 +1,11 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/ipsec.conf
new file mode 100755
index 000000000..fa6c0360d
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/ipsec.conf
@@ -0,0 +1,22 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutostart=no
+       
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=serpent256-sha512-modp4096!
+	esp=serpent256-sha512!
+
+conn rw
+	left=PH_IP_MOON
+	leftcert=moonCert.pem
+	leftid=@moon.strongswan.org
+	leftsubnet=10.1.0.0/16
+	right=%any
+	rightid=carol@strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/strongswan.conf
new file mode 100644
index 000000000..33591562a
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/hosts/moon/etc/strongswan.conf
@@ -0,0 +1,10 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  send_vendor_id = yes
+}
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/posttest.dat b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/posttest.dat
new file mode 100644
index 000000000..c6d6235f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/posttest.dat
@@ -0,0 +1,2 @@
+moon::ipsec stop
+carol::ipsec stop
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/pretest.dat b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/pretest.dat
new file mode 100644
index 000000000..6d2eeb5f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/pretest.dat
@@ -0,0 +1,5 @@
+moon::echo 1 > /proc/sys/net/ipv4/ip_forward
+carol::ipsec start
+moon::ipsec start
+carol::sleep 2 
+carol::ipsec up home
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-serpent/test.conf b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/test.conf
new file mode 100644
index 000000000..6abbb89a9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-serpent/test.conf
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# This configuration file provides information on the
+# UML instances used for this test
+
+# All UML instances that are required for this test
+#
+UMLHOSTS="alice moon carol winnetou"
+
+# Corresponding block diagram
+#
+DIAGRAM="a-m-c-w.png"
+
+# UML instances on which tcpdump is to be started
+#
+TCPDUMPHOSTS="moon"
+
+# UML instances on which IPsec is started
+# Used for IPsec logging purposes
+#
+IPSECHOSTS="moon carol"
+
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/description.txt b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/description.txt
new file mode 100644
index 000000000..e1a7403e3
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/description.txt
@@ -0,0 +1,4 @@
+Roadwarrior <b>carol</b> proposes  to gateway <b>moon</b> the strong cipher suite
+<b>TWOFISH_CBC_256 / HMAC_SHA2_512 / MODP_4096</b> for the IKE protocol and 
+<b>TWOFISH_CBC_256 / HMAC_SHA2_512_256 </b> for ESP packets. A ping from <b>carol</b> to
+<b>alice</b> successfully checks the established tunnel.
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/evaltest.dat b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/evaltest.dat
new file mode 100644
index 000000000..37dca7402
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/evaltest.dat
@@ -0,0 +1,13 @@
+carol::ipsec status 2> /dev/null::home.*STATE_MAIN_I4.*ISAKMP SA established::YES
+moon:: ipsec status 2> /dev/null::rw.*ESTABLISHED.*moon.strongswan.org.*carol@strongswan.org::YES
+carol::ipsec status 2> /dev/null::home.*STATE_QUICK_I2.*IPsec SA established::YES
+moon:: ipsec status 2> /dev/null::rw.*INSTALLED, TUNNEL::YES
+carol::ipsec statusall 2> /dev/null::IKE proposal: TWOFISH_CBC_256/HMAC_SHA2_512/MODP_4096::YES
+moon:: ipsec statusall 2> /dev/null::IKE proposal: TWOFISH_CBC_256/HMAC_SHA2_512_256::YES
+carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_seq=1::YES
+carol::ipsec statusall 2> /dev/null::ESP proposal: TWOFISH_CBC_256/HMAC_SHA2_512::YES
+moon:: ipsec statusall 2> /dev/null::TWOFISH_CBC_256/HMAC_SHA2_512_256,::YES
+carol::ip xfrm state::enc cbc(twofish)::YES
+moon:: ip xfrm state::enc cbc(twofish)::YES
+moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 216::YES
+moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP.*length 216::YES
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/ipsec.conf
new file mode 100755
index 000000000..f10c79f33
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/ipsec.conf
@@ -0,0 +1,26 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutodebug="control"
+	crlcheckinterval=180
+	strictcrlpolicy=no
+	charonstart=no
+
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=twofish256-sha2_512-modp4096!
+	esp=twofish256-sha2_512!
+	pfs=no
+
+conn home
+	left=PH_IP_CAROL
+	leftcert=carolCert.pem
+	leftid=carol@strongswan.org
+	right=PH_IP_MOON
+	rightsubnet=10.1.0.0/16
+	rightid=@moon.strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/strongswan.conf
new file mode 100644
index 000000000..5e09a3a1d
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/carol/etc/strongswan.conf
@@ -0,0 +1,11 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/ipsec.conf
new file mode 100755
index 000000000..7f9d51d61
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/ipsec.conf
@@ -0,0 +1,22 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutostart=no
+       
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=twofish256-sha512-modp4096!
+	esp=twofish256-sha512!
+
+conn rw
+	left=PH_IP_MOON
+	leftcert=moonCert.pem
+	leftid=@moon.strongswan.org
+	leftsubnet=10.1.0.0/16
+	right=%any
+	rightid=carol@strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/strongswan.conf
new file mode 100644
index 000000000..33591562a
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/hosts/moon/etc/strongswan.conf
@@ -0,0 +1,10 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+charon {
+  load = curl pem pkcs1 gcrypt x509 revocation hmac xcbc stroke kernel-netlink socket-default updown
+  send_vendor_id = yes
+}
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/posttest.dat b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/posttest.dat
new file mode 100644
index 000000000..c6d6235f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/posttest.dat
@@ -0,0 +1,2 @@
+moon::ipsec stop
+carol::ipsec stop
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/pretest.dat b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/pretest.dat
new file mode 100644
index 000000000..6d2eeb5f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/pretest.dat
@@ -0,0 +1,5 @@
+moon::echo 1 > /proc/sys/net/ipv4/ip_forward
+carol::ipsec start
+moon::ipsec start
+carol::sleep 2 
+carol::ipsec up home
diff --git a/testing/tests/gcrypt-ikev1-p-c/alg-twofish/test.conf b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/test.conf
new file mode 100644
index 000000000..6abbb89a9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-c/alg-twofish/test.conf
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# This configuration file provides information on the
+# UML instances used for this test
+
+# All UML instances that are required for this test
+#
+UMLHOSTS="alice moon carol winnetou"
+
+# Corresponding block diagram
+#
+DIAGRAM="a-m-c-w.png"
+
+# UML instances on which tcpdump is to be started
+#
+TCPDUMPHOSTS="moon"
+
+# UML instances on which IPsec is started
+# Used for IPsec logging purposes
+#
+IPSECHOSTS="moon carol"
+
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/description.txt b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/description.txt
new file mode 100644
index 000000000..982efa5ea
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/description.txt
@@ -0,0 +1,4 @@
+Roadwarrior <b>carol</b> proposes  to gateway <b>moon</b> the strong cipher suite
+<b>SERPENT_CBC_256 / HMAC_SHA2_512 / MODP_4096</b> for the IKE protocol and 
+<b>SERPENT_CBC_256 / HMAC_SHA2_512_256 </b> for ESP packets. A ping from <b>carol</b> to
+<b>alice</b> successfully checks the established tunnel.
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/evaltest.dat b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/evaltest.dat
new file mode 100644
index 000000000..67f00c2e7
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/evaltest.dat
@@ -0,0 +1,13 @@
+carol::ipsec status 2> /dev/null::home.*STATE_MAIN_I4.*ISAKMP SA established::YES
+moon:: ipsec status 2> /dev/null::rw.*STATE_MAIN_R3.*sent MR3, ISAKMP SA established::YES
+carol::ipsec status 2> /dev/null::home.*STATE_QUICK_I2.*IPsec SA established::YES
+moon:: ipsec status 2> /dev/null::rw.*STATE_QUICK_R2.*IPsec SA established::YES
+carol::ipsec statusall 2> /dev/null::IKE proposal: SERPENT_CBC_256/HMAC_SHA2_512/MODP_4096::YES
+moon:: ipsec statusall 2> /dev/null::IKE proposal: SERPENT_CBC_256/HMAC_SHA2_512/MODP_4096::YES
+carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_seq=1::YES
+carol::ipsec statusall 2> /dev/null::ESP proposal: SERPENT_CBC_256/HMAC_SHA2_512::YES
+moon:: ipsec statusall 2> /dev/null::ESP proposal: SERPENT_CBC_256/HMAC_SHA2_512::YES
+carol::ip xfrm state::enc cbc(serpent)::YES
+moon:: ip xfrm state::enc cbc(serpent)::YES
+moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 216::YES
+moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP.*length 216::YES
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/ipsec.conf
new file mode 100755
index 000000000..e1eff9dfd
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/ipsec.conf
@@ -0,0 +1,25 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutodebug="control"
+	crlcheckinterval=180
+	strictcrlpolicy=no
+	charonstart=no
+
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=serpent256-sha2_512-modp4096!
+	esp=serpent256-sha2_512!
+
+conn home
+	left=PH_IP_CAROL
+	leftcert=carolCert.pem
+	leftid=carol@strongswan.org
+	right=PH_IP_MOON
+	rightsubnet=10.1.0.0/16
+	rightid=@moon.strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/strongswan.conf
new file mode 100644
index 000000000..5e09a3a1d
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/carol/etc/strongswan.conf
@@ -0,0 +1,11 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/ipsec.conf
new file mode 100755
index 000000000..0509e2496
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/ipsec.conf
@@ -0,0 +1,25 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutodebug="control"
+	crlcheckinterval=180
+	strictcrlpolicy=no
+	charonstart=no
+       
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=serpent256-sha2_512-modp4096!
+	esp=serpent256-sha2_512!
+
+conn rw
+	left=PH_IP_MOON
+	leftcert=moonCert.pem
+	leftid=@moon.strongswan.org
+	leftsubnet=10.1.0.0/16
+	right=%any
+	rightid=carol@strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/strongswan.conf
new file mode 100644
index 000000000..5e09a3a1d
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/hosts/moon/etc/strongswan.conf
@@ -0,0 +1,11 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/posttest.dat b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/posttest.dat
new file mode 100644
index 000000000..c6d6235f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/posttest.dat
@@ -0,0 +1,2 @@
+moon::ipsec stop
+carol::ipsec stop
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/pretest.dat b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/pretest.dat
new file mode 100644
index 000000000..6d2eeb5f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/pretest.dat
@@ -0,0 +1,5 @@
+moon::echo 1 > /proc/sys/net/ipv4/ip_forward
+carol::ipsec start
+moon::ipsec start
+carol::sleep 2 
+carol::ipsec up home
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-serpent/test.conf b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/test.conf
new file mode 100644
index 000000000..6abbb89a9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-serpent/test.conf
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# This configuration file provides information on the
+# UML instances used for this test
+
+# All UML instances that are required for this test
+#
+UMLHOSTS="alice moon carol winnetou"
+
+# Corresponding block diagram
+#
+DIAGRAM="a-m-c-w.png"
+
+# UML instances on which tcpdump is to be started
+#
+TCPDUMPHOSTS="moon"
+
+# UML instances on which IPsec is started
+# Used for IPsec logging purposes
+#
+IPSECHOSTS="moon carol"
+
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/description.txt b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/description.txt
new file mode 100644
index 000000000..e1a7403e3
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/description.txt
@@ -0,0 +1,4 @@
+Roadwarrior <b>carol</b> proposes  to gateway <b>moon</b> the strong cipher suite
+<b>TWOFISH_CBC_256 / HMAC_SHA2_512 / MODP_4096</b> for the IKE protocol and 
+<b>TWOFISH_CBC_256 / HMAC_SHA2_512_256 </b> for ESP packets. A ping from <b>carol</b> to
+<b>alice</b> successfully checks the established tunnel.
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/evaltest.dat b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/evaltest.dat
new file mode 100644
index 000000000..c46acd7fa
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/evaltest.dat
@@ -0,0 +1,13 @@
+carol::ipsec status 2> /dev/null::home.*STATE_MAIN_I4.*ISAKMP SA established::YES
+moon:: ipsec status 2> /dev/null::rw.*STATE_MAIN_R3.*sent MR3, ISAKMP SA established::YES
+carol::ipsec status 2> /dev/null::home.*STATE_QUICK_I2.*IPsec SA established::YES
+moon:: ipsec status 2> /dev/null::rw.*STATE_QUICK_R2.*IPsec SA established::YES
+carol::ipsec statusall 2> /dev/null::IKE proposal: TWOFISH_CBC_256/HMAC_SHA2_512/MODP_4096::YES
+moon:: ipsec statusall 2> /dev/null::IKE proposal: TWOFISH_CBC_256/HMAC_SHA2_512/MODP_4096::YES
+carol::ping -c 1 -s 120 -p deadbeef PH_IP_ALICE::128 bytes from PH_IP_ALICE: icmp_seq=1::YES
+carol::ipsec statusall 2> /dev/null::ESP proposal: TWOFISH_CBC_256/HMAC_SHA2_512::YES
+moon:: ipsec statusall 2> /dev/null::ESP proposal: TWOFISH_CBC_256/HMAC_SHA2_512::YES
+carol::ip xfrm state::enc cbc(twofish)::YES
+moon:: ip xfrm state::enc cbc(twofish)::YES
+moon::tcpdump::IP carol.strongswan.org > moon.strongswan.org: ESP.*length 216::YES
+moon::tcpdump::IP moon.strongswan.org > carol.strongswan.org: ESP.*length 216::YES
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/ipsec.conf
new file mode 100755
index 000000000..c5c80692e
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/ipsec.conf
@@ -0,0 +1,25 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutodebug="control"
+	crlcheckinterval=180
+	strictcrlpolicy=no
+	charonstart=no
+
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=twofish256-sha2_512-modp4096!
+	esp=twofish256-sha2_512!
+
+conn home
+	left=PH_IP_CAROL
+	leftcert=carolCert.pem
+	leftid=carol@strongswan.org
+	right=PH_IP_MOON
+	rightsubnet=10.1.0.0/16
+	rightid=@moon.strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/strongswan.conf
new file mode 100644
index 000000000..5e09a3a1d
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/carol/etc/strongswan.conf
@@ -0,0 +1,11 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/ipsec.conf b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/ipsec.conf
new file mode 100755
index 000000000..4919c3327
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/ipsec.conf
@@ -0,0 +1,25 @@
+# /etc/ipsec.conf - strongSwan IPsec configuration file
+
+config setup
+	plutodebug="control"
+	crlcheckinterval=180
+	strictcrlpolicy=no
+	charonstart=no
+       
+conn %default
+	ikelifetime=60m
+	keylife=20m
+	rekeymargin=3m
+	keyingtries=1
+	keyexchange=ikev1
+	ike=twofish256-sha2_512-modp4096!
+	esp=twofish256-sha2_512!
+
+conn rw
+	left=PH_IP_MOON
+	leftcert=moonCert.pem
+	leftid=@moon.strongswan.org
+	leftsubnet=10.1.0.0/16
+	right=%any
+	rightid=carol@strongswan.org
+	auto=add
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/strongswan.conf b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/strongswan.conf
new file mode 100644
index 000000000..5e09a3a1d
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/hosts/moon/etc/strongswan.conf
@@ -0,0 +1,11 @@
+# /etc/strongswan.conf - strongSwan configuration file
+
+pluto {
+  load = pem pkcs1 x509 gcrypt hmac curl kernel-netlink
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
+}
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/posttest.dat b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/posttest.dat
new file mode 100644
index 000000000..c6d6235f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/posttest.dat
@@ -0,0 +1,2 @@
+moon::ipsec stop
+carol::ipsec stop
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/pretest.dat b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/pretest.dat
new file mode 100644
index 000000000..6d2eeb5f9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/pretest.dat
@@ -0,0 +1,5 @@
+moon::echo 1 > /proc/sys/net/ipv4/ip_forward
+carol::ipsec start
+moon::ipsec start
+carol::sleep 2 
+carol::ipsec up home
diff --git a/testing/tests/gcrypt-ikev1-p-p/alg-twofish/test.conf b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/test.conf
new file mode 100644
index 000000000..6abbb89a9
--- /dev/null
+++ b/testing/tests/gcrypt-ikev1-p-p/alg-twofish/test.conf
@@ -0,0 +1,22 @@
+#!/bin/bash
+#
+# This configuration file provides information on the
+# UML instances used for this test
+
+# All UML instances that are required for this test
+#
+UMLHOSTS="alice moon carol winnetou"
+
+# Corresponding block diagram
+#
+DIAGRAM="a-m-c-w.png"
+
+# UML instances on which tcpdump is to be started
+#
+TCPDUMPHOSTS="moon"
+
+# UML instances on which IPsec is started
+# Used for IPsec logging purposes
+#
+IPSECHOSTS="moon carol"
+