aboutsummaryrefslogtreecommitdiffstats
path: root/testing/tests/openssl-ikev2
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-07-15 11:19:27 +0200
committerTobias Brunner <tobias@strongswan.org>2013-07-15 11:27:07 +0200
commit9e7a45bec2df828ff04b19a9dd732fd60f6b81a7 (patch)
treead5a377668a2da3d3bc2673a632b1ee37e92cca7 /testing/tests/openssl-ikev2
parent591f923134091ada2b2a195cb4c784f3eb5a63c0 (diff)
downloadstrongswan-9e7a45bec2df828ff04b19a9dd732fd60f6b81a7.tar.bz2
strongswan-9e7a45bec2df828ff04b19a9dd732fd60f6b81a7.tar.xz
testing: Don't load certificates explicitly and delete CA certificates in PKCS#12 scenarios
Certificates are now properly extracted from PKCS#12 files.
Diffstat (limited to 'testing/tests/openssl-ikev2')
-rw-r--r--testing/tests/openssl-ikev2/net2net-pkcs12/hosts/moon/etc/ipsec.conf1
-rw-r--r--testing/tests/openssl-ikev2/net2net-pkcs12/hosts/sun/etc/ipsec.conf1
-rw-r--r--testing/tests/openssl-ikev2/net2net-pkcs12/pretest.dat3
3 files changed, 3 insertions, 2 deletions
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