[svn-upgrade] Integrating new upstream version, strongswan (4.1.8)

12 files changed, 19 insertions, 1 deletions

diff --git a/testing/tests/ikev1/dynamic-initiator/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/dynamic-initiator/hosts/carol/etc/ipsec.conf
index ba6f7bfe9..d8b885a88 100755
--- a/testing/tests/ikev1/dynamic-initiator/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/dynamic-initiator/hosts/carol/etc/ipsec.conf
@@ -14,6 +14,7 @@ conn %default
 
 conn moon 
 	left=%defaultroute
+	leftnexthop=%direct
 	leftsourceip=PH_IP_CAROL1
 	leftcert=carolCert.pem
 	leftid=carol@strongswan.org
diff --git a/testing/tests/ikev1/dynamic-initiator/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/dynamic-initiator/hosts/dave/etc/ipsec.conf
index ba6f7bfe9..d8b885a88 100755
--- a/testing/tests/ikev1/dynamic-initiator/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev1/dynamic-initiator/hosts/dave/etc/ipsec.conf
@@ -14,6 +14,7 @@ conn %default
 
 conn moon 
 	left=%defaultroute
+	leftnexthop=%direct
 	leftsourceip=PH_IP_CAROL1
 	leftcert=carolCert.pem
 	leftid=carol@strongswan.org
diff --git a/testing/tests/ikev1/dynamic-initiator/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/dynamic-initiator/hosts/moon/etc/ipsec.conf
index 2658293ac..bf39d7527 100755
--- a/testing/tests/ikev1/dynamic-initiator/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/dynamic-initiator/hosts/moon/etc/ipsec.conf
@@ -12,6 +12,7 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=%defaultroute
+	leftnexthop=%direct
 	leftsubnet=10.1.0.0/16
 	leftsourceip=PH_IP_MOON1
 	leftcert=moonCert.pem
diff --git a/testing/tests/ikev1/dynamic-responder/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/dynamic-responder/hosts/carol/etc/ipsec.conf
index ba6f7bfe9..d8b885a88 100755
--- a/testing/tests/ikev1/dynamic-responder/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/dynamic-responder/hosts/carol/etc/ipsec.conf
@@ -14,6 +14,7 @@ conn %default
 
 conn moon 
 	left=%defaultroute
+	leftnexthop=%direct
 	leftsourceip=PH_IP_CAROL1
 	leftcert=carolCert.pem
 	leftid=carol@strongswan.org
diff --git a/testing/tests/ikev1/dynamic-responder/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/dynamic-responder/hosts/dave/etc/ipsec.conf
index ba6f7bfe9..d8b885a88 100755
--- a/testing/tests/ikev1/dynamic-responder/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev1/dynamic-responder/hosts/dave/etc/ipsec.conf
@@ -14,6 +14,7 @@ conn %default
 
 conn moon 
 	left=%defaultroute
+	leftnexthop=%direct
 	leftsourceip=PH_IP_CAROL1
 	leftcert=carolCert.pem
 	leftid=carol@strongswan.org
diff --git a/testing/tests/ikev1/dynamic-responder/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/dynamic-responder/hosts/moon/etc/ipsec.conf
index 2658293ac..bf39d7527 100755
--- a/testing/tests/ikev1/dynamic-responder/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/dynamic-responder/hosts/moon/etc/ipsec.conf
@@ -12,6 +12,7 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=%defaultroute
+	leftnexthop=%direct
 	leftsubnet=10.1.0.0/16
 	leftsourceip=PH_IP_MOON1
 	leftcert=moonCert.pem
diff --git a/testing/tests/ikev1/dynamic-two-peers/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/dynamic-two-peers/hosts/carol/etc/ipsec.conf
index 41123c9d6..1f964d0de 100755
--- a/testing/tests/ikev1/dynamic-two-peers/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/dynamic-two-peers/hosts/carol/etc/ipsec.conf
@@ -14,6 +14,7 @@ conn %default
 
 conn moon 
 	left=%defaultroute
+	leftnexthop=%direct
 	leftsourceip=PH_IP_CAROL1
 	leftcert=carolCert.pem
 	leftid=carol@strongswan.org
diff --git a/testing/tests/ikev1/dynamic-two-peers/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/dynamic-two-peers/hosts/dave/etc/ipsec.conf
index 2ba4db724..c098ffd90 100755
--- a/testing/tests/ikev1/dynamic-two-peers/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev1/dynamic-two-peers/hosts/dave/etc/ipsec.conf
@@ -14,6 +14,7 @@ conn %default
 
 conn moon
 	left=%defaultroute
+	leftnexthop=%direct
 	leftsourceip=PH_IP_DAVE1
 	leftcert=daveCert.pem
 	leftid=dave@strongswan.org
diff --git a/testing/tests/ikev1/dynamic-two-peers/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/dynamic-two-peers/hosts/moon/etc/ipsec.conf
index 50c3a6a69..45ec8094b 100755
--- a/testing/tests/ikev1/dynamic-two-peers/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/dynamic-two-peers/hosts/moon/etc/ipsec.conf
@@ -12,6 +12,7 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	left=%defaultroute
+	leftnexthop=%direct
 	leftsubnet=10.1.0.0/16
 	leftsourceip=PH_IP_MOON1
 	leftcert=moonCert.pem
diff --git a/testing/tests/ikev1/passthrough/posttest.dat b/testing/tests/ikev1/passthrough/posttest.dat
index 5a9150bc8..db17f4c65 100644
--- a/testing/tests/ikev1/passthrough/posttest.dat
+++ b/testing/tests/ikev1/passthrough/posttest.dat
@@ -1,4 +1,6 @@
 moon::ipsec stop
 sun::ipsec stop
+moon::ip route flush table 50 
+moon::ip rule del table 50
 moon::/etc/init.d/iptables stop 2> /dev/null
 sun::/etc/init.d/iptables stop 2> /dev/null
diff --git a/testing/tests/ikev1/passthrough/pretest.dat b/testing/tests/ikev1/passthrough/pretest.dat
index 2606db192..6b5295469 100644
--- a/testing/tests/ikev1/passthrough/pretest.dat
+++ b/testing/tests/ikev1/passthrough/pretest.dat
@@ -2,6 +2,9 @@ moon::/etc/init.d/iptables start 2> /dev/null
 sun::/etc/init.d/iptables start 2> /dev/null
 moon::iptables -I INPUT  -i eth1 -s 10.1.0.0/16 -j ACCEPT
 moon::iptables -I OUTPUT -o eth1 -d 10.1.0.0/16 -j ACCEPT
+moon::ip rule add pref 50 table 50
+moon::ip route add 192.168.0.254 via PH_IP_MOON table 50
+moon::ip route add 10.1.0.0/16 via PH_IP_MOON1 table 50
 moon::ipsec start
 sun::ipsec start
 moon::sleep 2
diff --git a/testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/ipsec.secrets b/testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/ipsec.secrets
index 70ea1dab6..d2bba2f4c 100644
--- a/testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/ipsec.secrets
+++ b/testing/tests/ikev1/xauth-psk-mode-config/hosts/carol/etc/ipsec.secrets
@@ -1,5 +1,9 @@
 # /etc/ipsec.secrets - strongSwan IPsec secrets file
 
-: PSK 0sv+NkxY9LLZvwj4qCC2o/gGrWDF2d21jL
+carol@strongswan.org @dave.strongswan.org : PSK 0sqc1FhzwoUSbpjYUSp8I6qUdxDacxLCTq
+
+carol@strongswan.org @moon.strongswan.org : PSK 0sv+NkxY9LLZvwj4qCC2o/gGrWDF2d21jL
+
+carol@strongswan.org @sun.strongswan.org :  PSK 0sR64pR6y0S5d6d8rNhUIM7aPbdjND4st5
 
 : XAUTH carol "4iChxLT3"