From: Andreas Steffen <andreas.steffen@strongswan.org>
Date: Fri, 14 May 2010 15:26:59 +0000 (+0200)
Subject: adapted evaltest of ikev1/ip-pool-db-push scenario to resolve plugin
X-Git-Tag: 4.4.1~276
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b8520ad50d53b8f81f9c358d75717b6e59a06cd2;p=thirdparty%2Fstrongswan.git

adapted evaltest of ikev1/ip-pool-db-push scenario to resolve plugin
---

diff --git a/testing/tests/ikev1/ip-pool-db-push/evaltest.dat b/testing/tests/ikev1/ip-pool-db-push/evaltest.dat
index 92ef9fc551..9a5c5c7ee0 100644
--- a/testing/tests/ikev1/ip-pool-db-push/evaltest.dat
+++ b/testing/tests/ikev1/ip-pool-db-push/evaltest.dat
@@ -1,14 +1,11 @@
-carol::cat /var/log/auth.log::received IPv4 DNS server address PH_IP_WINNETOU::YES
-carol::cat /var/log/auth.log::received IPv4 DNS server address PH_IP_VENUS::YES
-carol::cat /var/log/auth.log::received IPv4 NBNS server address PH_IP_VENUS::YES
+carol::cat /etc/resolv.conf::nameserver PH_IP_WINNETOU .*from moon.strongswan.org::YES
+carol::cat /etc/resolv.conf::nameserver PH_IP_VENUS .*from moon.strongswan.org::YES
+carol::cat /var/log/auth.log::handling INTERNAL_IP4_NBNS attribute failed::YES
 carol::cat /var/log/auth.log::setting virtual IP source address to PH_IP_CAROL1::YES
 carol::ip addr list dev eth0::PH_IP_CAROL1::YES
 carol::ip route list table 220::10.1.0.0/16.*src PH_IP_CAROL1::YES
 carol::ipsec status::home.*IPsec SA established::YES
 carol::ping -c 1 PH_IP_ALICE::64 bytes from PH_IP_ALICE: icmp_seq=1::YES
-dave::cat /var/log/auth.log::received IPv4 DNS server address PH_IP_WINNETOU::YES
-dave::cat /var/log/auth.log::received IPv4 DNS server address PH_IP_VENUS::YES
-dave::cat /var/log/auth.log::received IPv4 NBNS server address PH_IP_VENUS::YES
 dave::cat /var/log/auth.log::setting virtual IP source address to PH_IP_DAVE1::YES
 dave::ip addr list dev eth0::PH_IP_DAVE1::YES
 dave::ip route list table 220::10.1.0.0/16.*src PH_IP_DAVE1::YES
diff --git a/testing/tests/ikev1/ip-pool-db-push/hosts/carol/etc/strongswan.conf b/testing/tests/ikev1/ip-pool-db-push/hosts/carol/etc/strongswan.conf
index d6460a2912..c93224ae56 100644
--- a/testing/tests/ikev1/ip-pool-db-push/hosts/carol/etc/strongswan.conf
+++ b/testing/tests/ikev1/ip-pool-db-push/hosts/carol/etc/strongswan.conf
@@ -1,5 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl resolve
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
 }
diff --git a/testing/tests/ikev1/ip-pool-db-push/hosts/dave/etc/strongswan.conf b/testing/tests/ikev1/ip-pool-db-push/hosts/dave/etc/strongswan.conf
index d6460a2912..c93224ae56 100644
--- a/testing/tests/ikev1/ip-pool-db-push/hosts/dave/etc/strongswan.conf
+++ b/testing/tests/ikev1/ip-pool-db-push/hosts/dave/etc/strongswan.conf
@@ -1,5 +1,11 @@
 # /etc/strongswan.conf - strongSwan configuration file
 
 pluto {
-  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl
+  load = sha1 sha2 md5 aes des hmac pem pkcs1 x509 gmp random curl resolve
+}
+
+# pluto uses optimized DH exponent sizes (RFC 3526)
+
+libstrongswan {
+  dh_exponent_ansi_x9_42 = no
 }