From c1343b3278cdf99533b7902744d15969f9d6fdc1 Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Wed, 2 Jan 2013 14:18:20 +0100 Subject: Imported Upstream version 5.0.1 --- .../tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/ipsec.conf | 5 +---- .../openssl-ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf | 10 ++-------- 2 files changed, 3 insertions(+), 12 deletions(-) mode change 100755 => 100644 testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/ipsec.conf (limited to 'testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave') diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/ipsec.conf b/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/ipsec.conf old mode 100755 new mode 100644 index 23813b20b..150c63bc7 --- a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/ipsec.conf +++ b/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/ipsec.conf @@ -1,10 +1,7 @@ # /etc/ipsec.conf - strongSwan IPsec configuration file config setup - crlcheckinterval=180 - plutodebug=control - charonstart=no - + conn %default ikelifetime=60m keylife=20m diff --git a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf index 4c5d53dff..0bbf93a18 100644 --- a/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf +++ b/testing/tests/openssl-ikev1/ecdsa-certs/hosts/dave/etc/strongswan.conf @@ -1,11 +1,5 @@ # /etc/strongswan.conf - strongSwan configuration file -pluto { - load = pem pkcs1 pem pkcs1 openssl random hmac curl kernel-netlink -} - -# pluto uses optimized DH exponent sizes (RFC 3526) - -libstrongswan { - dh_exponent_ansi_x9_42 = no +charon { + load = curl pem pkcs1 openssl revocation random nonce hmac stroke kernel-netlink socket-default updown } -- cgit v1.2.3