diff options
author | Andreas Steffen <andreas.steffen@strongswan.org> | 2012-05-23 14:45:15 +0200 |
---|---|---|
committer | Andreas Steffen <andreas.steffen@strongswan.org> | 2012-05-23 14:45:15 +0200 |
commit | 148b6438807cf8fd2f6ae04ac4b77795d0c21fea (patch) | |
tree | 0cf56902ecd0be678c5e8999f90443acb55ee594 /testing/tests/ikev1/ip-pool-db/hosts/dave | |
parent | 3c475660c50fa11d6b95b86072cf35165057c911 (diff) | |
download | strongswan-148b6438807cf8fd2f6ae04ac4b77795d0c21fea.tar.bz2 strongswan-148b6438807cf8fd2f6ae04ac4b77795d0c21fea.tar.xz |
upgraded ikev1 scenarios to 5.0.0
Diffstat (limited to 'testing/tests/ikev1/ip-pool-db/hosts/dave')
-rwxr-xr-x | testing/tests/ikev1/ip-pool-db/hosts/dave/etc/ipsec.conf | 5 | ||||
-rw-r--r-- | testing/tests/ikev1/ip-pool-db/hosts/dave/etc/strongswan.conf | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/testing/tests/ikev1/ip-pool-db/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/ip-pool-db/hosts/dave/etc/ipsec.conf index 163c19516..bf0f9ccae 100755 --- a/testing/tests/ikev1/ip-pool-db/hosts/dave/etc/ipsec.conf +++ b/testing/tests/ikev1/ip-pool-db/hosts/dave/etc/ipsec.conf @@ -1,10 +1,7 @@ # /etc/ipsec.conf - strongSwan IPsec configuration file config setup - crlcheckinterval=180 - strictcrlpolicy=no - charonstart=no - plutodebug=control + plutostart=no conn %default ikelifetime=60m diff --git a/testing/tests/ikev1/ip-pool-db/hosts/dave/etc/strongswan.conf b/testing/tests/ikev1/ip-pool-db/hosts/dave/etc/strongswan.conf index 56f13324a..bd19ffe3d 100644 --- a/testing/tests/ikev1/ip-pool-db/hosts/dave/etc/strongswan.conf +++ b/testing/tests/ikev1/ip-pool-db/hosts/dave/etc/strongswan.conf @@ -1,11 +1,5 @@ # /etc/strongswan.conf - strongSwan configuration file -pluto { - load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl resolve kernel-netlink -} - -# pluto uses optimized DH exponent sizes (RFC 3526) - -libstrongswan { - dh_exponent_ansi_x9_42 = no +charon { + load = curl aes des sha1 sha2 md5 pem pkcs1 gmp random nonce x509 revocation hmac xcbc stroke kernel-netlink socket-default updown resolve } |