From 9e7a45bec2df828ff04b19a9dd732fd60f6b81a7 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Mon, 15 Jul 2013 11:19:27 +0200 Subject: [PATCH] testing: Don't load certificates explicitly and delete CA certificates in PKCS#12 scenarios Certificates are now properly extracted from PKCS#12 files. --- testing/tests/ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf | 1 - testing/tests/ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf | 1 - testing/tests/ikev2/net2net-pkcs12/pretest.dat | 3 +++ .../openssl-ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf | 1 - .../openssl-ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf | 1 - testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat | 3 +++ 6 files changed, 6 insertions(+), 4 deletions(-) diff --git a/testing/tests/ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf index 2d31a19d2..0296e1804 100644 --- a/testing/tests/ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf +++ b/testing/tests/ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf @@ -12,7 +12,6 @@ conn %default conn net-net left=PH_IP_MOON - leftcert=moonCert.pem leftid=@moon.strongswan.org leftsubnet=10.1.0.0/16 leftfirewall=yes diff --git a/testing/tests/ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf b/testing/tests/ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf index 06bfa038b..6dcedd0e6 100644 --- a/testing/tests/ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf +++ b/testing/tests/ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf @@ -12,7 +12,6 @@ conn %default conn net-net left=PH_IP_SUN - leftcert=sunCert.pem leftid=@sun.strongswan.org leftsubnet=10.2.0.0/16 leftfirewall=yes diff --git a/testing/tests/ikev2/net2net-pkcs12/pretest.dat b/testing/tests/ikev2/net2net-pkcs12/pretest.dat index 4a6f0db6b..3492238f0 100644 --- a/testing/tests/ikev2/net2net-pkcs12/pretest.dat +++ b/testing/tests/ikev2/net2net-pkcs12/pretest.dat @@ -1,4 +1,7 @@ moon::rm /etc/ipsec.d/private/moonKey.pem +moon::rm /etc/ipsec.d/cacerts/strongswanCert.pem +sun::rm /etc/ipsec.d/private/sunKey.pem +sun::rm /etc/ipsec.d/cacerts/strongswanCert.pem moon::iptables-restore < /etc/iptables.rules sun::iptables-restore < /etc/iptables.rules moon::ipsec start diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf index 2d31a19d2..0296e1804 100644 --- a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf +++ b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf @@ -12,7 +12,6 @@ conn %default conn net-net left=PH_IP_MOON - leftcert=moonCert.pem leftid=@moon.strongswan.org leftsubnet=10.1.0.0/16 leftfirewall=yes diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf index 06bfa038b..6dcedd0e6 100644 --- a/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf +++ b/testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf @@ -12,7 +12,6 @@ conn %default conn net-net left=PH_IP_SUN - leftcert=sunCert.pem leftid=@sun.strongswan.org leftsubnet=10.2.0.0/16 leftfirewall=yes diff --git a/testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat b/testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat index 4a6f0db6b..3492238f0 100644 --- a/testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat +++ b/testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat @@ -1,4 +1,7 @@ moon::rm /etc/ipsec.d/private/moonKey.pem +moon::rm /etc/ipsec.d/cacerts/strongswanCert.pem +sun::rm /etc/ipsec.d/private/sunKey.pem +sun::rm /etc/ipsec.d/cacerts/strongswanCert.pem moon::iptables-restore < /etc/iptables.rules sun::iptables-restore < /etc/iptables.rules moon::ipsec start