aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Steffen <andreas.steffen@strongswan.org>2009-06-16 21:03:13 +0200
committerAndreas Steffen <andreas.steffen@strongswan.org>2009-06-16 21:03:13 +0200
commitbd33859fb8240cdeb1576fd7753394042a715f23 (patch)
treeb3672c1214d98e491bc0de0e26b066b93ec47f5f
parentc8db70156db3ee62a92ae29e6785726cb0cfd121 (diff)
downloadstrongswan-bd33859fb8240cdeb1576fd7753394042a715f23.tar.bz2
strongswan-bd33859fb8240cdeb1576fd7753394042a715f23.tar.xz
some more scenario adaptations
-rw-r--r--testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/strongswan.conf11
-rw-r--r--testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/strongswan.conf12
-rw-r--r--testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/strongswan.conf14
3 files changed, 31 insertions, 6 deletions
diff --git a/testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/strongswan.conf b/testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/strongswan.conf
index ce37764d4..e2a83185b 100644
--- a/testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/openssl-ikev1/rw-cert/hosts/carol/etc/strongswan.conf
@@ -1,5 +1,14 @@
# /etc/strongswan.conf - strongSwan configuration file
pluto {
- load = openssl pubkey random hmac curl
+ load = test-vectors openssl pubkey random hmac curl
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+ dh_exponent_ansi_x9_42 = no
+ crypto_test {
+ on_add = yes
+ }
}
diff --git a/testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/strongswan.conf b/testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/strongswan.conf
index 71ee2c076..2ba85bb98 100644
--- a/testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/openssl-ikev1/rw-cert/hosts/dave/etc/strongswan.conf
@@ -1,5 +1,15 @@
# /etc/strongswan.conf - strongSwan configuration file
pluto {
- load = aes des sha1 sha2 md5 gmp pubkey random hmac curl
+ load = test-vectors aes des sha1 sha2 md5 gmp pubkey random hmac curl
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+ dh_exponent_ansi_x9_42 = no
+ crypto_test {
+ required = yes
+ on_add = yes
+ }
}
diff --git a/testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/strongswan.conf b/testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/strongswan.conf
index eed1d0ee2..28d9ab3ba 100644
--- a/testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/strongswan.conf
+++ b/testing/tests/openssl-ikev1/rw-cert/hosts/moon/etc/strongswan.conf
@@ -1,9 +1,15 @@
# /etc/strongswan.conf - strongSwan configuration file
-charon {
- dh_exponent_ansi_x9_42 = no
+pluto {
+ load = test-vectors openssl pubkey random hmac curl
}
-pluto {
- load = openssl pubkey random hmac curl
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+ dh_exponent_ansi_x9_42 = no
+ crypto_test {
+ on_add = yes
+ }
}
+