From 542471e3fea3c3b7d42dd5ab3638485b65aca4f5 Mon Sep 17 00:00:00 2001 From: Andreas Steffen Date: Fri, 17 Jul 2009 22:33:22 +0200 Subject: [PATCH] adapted scenario description for OpenPGP V3 keys --- .../tests/ikev1/{net2net-pgp => net2net-pgp-v3}/description.txt | 2 +- .../tests/ikev1/{net2net-pgp => net2net-pgp-v3}/evaltest.dat | 0 .../{net2net-pgp => net2net-pgp-v3}/hosts/moon/etc/ipsec.conf | 0 .../hosts/moon/etc/ipsec.d/certs/moonCert.asc | 0 .../hosts/moon/etc/ipsec.d/certs/sunCert.asc | 0 .../hosts/moon/etc/ipsec.d/private/moonKey.asc | 0 .../hosts/moon/etc/ipsec.secrets | 0 .../{net2net-pgp => net2net-pgp-v3}/hosts/sun/etc/ipsec.conf | 0 .../hosts/sun/etc/ipsec.d/certs/moonCert.asc | 0 .../hosts/sun/etc/ipsec.d/certs/sunCert.asc | 0 .../hosts/sun/etc/ipsec.d/private/sunKey.asc | 0 .../{net2net-pgp => net2net-pgp-v3}/hosts/sun/etc/ipsec.secrets | 0 .../tests/ikev1/{net2net-pgp => net2net-pgp-v3}/posttest.dat | 0 testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/pretest.dat | 0 testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/test.conf | 0 15 files changed, 1 insertion(+), 1 deletion(-) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/description.txt (83%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/evaltest.dat (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/moon/etc/ipsec.conf (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/moon/etc/ipsec.d/certs/moonCert.asc (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/moon/etc/ipsec.d/certs/sunCert.asc (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/moon/etc/ipsec.d/private/moonKey.asc (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/moon/etc/ipsec.secrets (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/sun/etc/ipsec.conf (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/sun/etc/ipsec.d/certs/moonCert.asc (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/sun/etc/ipsec.d/certs/sunCert.asc (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/sun/etc/ipsec.d/private/sunKey.asc (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/hosts/sun/etc/ipsec.secrets (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/posttest.dat (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/pretest.dat (100%) rename testing/tests/ikev1/{net2net-pgp => net2net-pgp-v3}/test.conf (100%) diff --git a/testing/tests/ikev1/net2net-pgp/description.txt b/testing/tests/ikev1/net2net-pgp-v3/description.txt similarity index 83% rename from testing/tests/ikev1/net2net-pgp/description.txt rename to testing/tests/ikev1/net2net-pgp-v3/description.txt index c85f2e5d0..bd680b57a 100644 --- a/testing/tests/ikev1/net2net-pgp/description.txt +++ b/testing/tests/ikev1/net2net-pgp-v3/description.txt @@ -1,5 +1,5 @@ A connection between the subnets behind the gateways moon and sun is set up. -The authentication is based on OpenPGP keys. Upon the successful +The authentication is based on OpenPGP V3 keys. Upon the successful establishment of the IPsec tunnel, leftfirewall=yes automatically inserts iptables-based firewall rules that let pass the tunneled traffic. In order to test both tunnel and firewall, client alice behind gateway moon diff --git a/testing/tests/ikev1/net2net-pgp/evaltest.dat b/testing/tests/ikev1/net2net-pgp-v3/evaltest.dat similarity index 100% rename from testing/tests/ikev1/net2net-pgp/evaltest.dat rename to testing/tests/ikev1/net2net-pgp-v3/evaltest.dat diff --git a/testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.conf similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.conf rename to testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.conf diff --git a/testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.d/certs/moonCert.asc b/testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.d/certs/moonCert.asc similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.d/certs/moonCert.asc rename to testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.d/certs/moonCert.asc diff --git a/testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.d/certs/sunCert.asc b/testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.d/certs/sunCert.asc similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.d/certs/sunCert.asc rename to testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.d/certs/sunCert.asc diff --git a/testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.d/private/moonKey.asc b/testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.d/private/moonKey.asc similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.d/private/moonKey.asc rename to testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.d/private/moonKey.asc diff --git a/testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.secrets b/testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.secrets similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/moon/etc/ipsec.secrets rename to testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.secrets diff --git a/testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.conf b/testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.conf similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.conf rename to testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.conf diff --git a/testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.d/certs/moonCert.asc b/testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.d/certs/moonCert.asc similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.d/certs/moonCert.asc rename to testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.d/certs/moonCert.asc diff --git a/testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.d/certs/sunCert.asc b/testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.d/certs/sunCert.asc similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.d/certs/sunCert.asc rename to testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.d/certs/sunCert.asc diff --git a/testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.d/private/sunKey.asc b/testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.d/private/sunKey.asc similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.d/private/sunKey.asc rename to testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.d/private/sunKey.asc diff --git a/testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.secrets b/testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.secrets similarity index 100% rename from testing/tests/ikev1/net2net-pgp/hosts/sun/etc/ipsec.secrets rename to testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.secrets diff --git a/testing/tests/ikev1/net2net-pgp/posttest.dat b/testing/tests/ikev1/net2net-pgp-v3/posttest.dat similarity index 100% rename from testing/tests/ikev1/net2net-pgp/posttest.dat rename to testing/tests/ikev1/net2net-pgp-v3/posttest.dat diff --git a/testing/tests/ikev1/net2net-pgp/pretest.dat b/testing/tests/ikev1/net2net-pgp-v3/pretest.dat similarity index 100% rename from testing/tests/ikev1/net2net-pgp/pretest.dat rename to testing/tests/ikev1/net2net-pgp-v3/pretest.dat diff --git a/testing/tests/ikev1/net2net-pgp/test.conf b/testing/tests/ikev1/net2net-pgp-v3/test.conf similarity index 100% rename from testing/tests/ikev1/net2net-pgp/test.conf rename to testing/tests/ikev1/net2net-pgp-v3/test.conf