define explicit IKEv1 keyexchange mode III

diff --git a/testing/tests/ipv6/host2host-ikev1/hosts/moon/etc/ipsec.conf b/testing/tests/ipv6/host2host-ikev1/hosts/moon/etc/ipsec.conf
index 2814e881f84cf84d98397e3e47ade8ce28ec1169..9940e81a5d98fabf3db3110f71a3c3b538bf8d7a 100755 (executable)
--- a/testing/tests/ipv6/host2host-ikev1/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ipv6/host2host-ikev1/hosts/moon/etc/ipsec.conf
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn net-net
        also=host-host

diff --git a/testing/tests/ipv6/host2host-ikev1/hosts/sun/etc/ipsec.conf b/testing/tests/ipv6/host2host-ikev1/hosts/sun/etc/ipsec.conf
index 4cf027ad5ef5e1f2baa58a8623180c27e042e937..016adc09568bdfe9b9ac0d184f9567a5e7a34018 100755 (executable)
--- a/testing/tests/ipv6/host2host-ikev1/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/ipv6/host2host-ikev1/hosts/sun/etc/ipsec.conf
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn net-net
        also=host-host

diff --git a/testing/tests/ipv6/net2net-ikev1/hosts/moon/etc/ipsec.conf b/testing/tests/ipv6/net2net-ikev1/hosts/moon/etc/ipsec.conf
index 84abbb07ac1d27cba653dbc4bc58ee18af9c1e30..bb96a71e07b51835c09d0ca3707b66072a4f0710 100755 (executable)
--- a/testing/tests/ipv6/net2net-ikev1/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ipv6/net2net-ikev1/hosts/moon/etc/ipsec.conf
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn net-net
        also=host-host

diff --git a/testing/tests/ipv6/net2net-ikev1/hosts/sun/etc/ipsec.conf b/testing/tests/ipv6/net2net-ikev1/hosts/sun/etc/ipsec.conf
index 4cf027ad5ef5e1f2baa58a8623180c27e042e937..016adc09568bdfe9b9ac0d184f9567a5e7a34018 100755 (executable)
--- a/testing/tests/ipv6/net2net-ikev1/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/ipv6/net2net-ikev1/hosts/sun/etc/ipsec.conf
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn net-net
        also=host-host

diff --git a/testing/tests/ipv6/rw-ikev1/hosts/carol/etc/ipsec.conf b/testing/tests/ipv6/rw-ikev1/hosts/carol/etc/ipsec.conf
index b27609917ac2b5069e36349463fd56e0ca98d73a..363c910b07bbf8fcc16321cfe7e9ab268c63c283 100755 (executable)
--- a/testing/tests/ipv6/rw-ikev1/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ipv6/rw-ikev1/hosts/carol/etc/ipsec.conf
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP6_CAROL

diff --git a/testing/tests/ipv6/rw-ikev1/hosts/moon/etc/ipsec.conf b/testing/tests/ipv6/rw-ikev1/hosts/moon/etc/ipsec.conf
index 0129ef74429d4ba8b3e9f59b629a29cb9d5e9ea7..1b5a2aced3644f07fd9c4806357de8027721a22d 100755 (executable)
--- a/testing/tests/ipv6/rw-ikev1/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ipv6/rw-ikev1/hosts/moon/etc/ipsec.conf
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn rw
        left=PH_IP6_MOON

diff --git a/testing/tests/ipv6/rw-psk-ikev1/hosts/carol/etc/ipsec.conf b/testing/tests/ipv6/rw-psk-ikev1/hosts/carol/etc/ipsec.conf
index 5d77c2dd5db1aedcee71faa3238585d0ae5d928b..76135d1ee31f4b9880b13a328b7316217319733b 100755 (executable)
--- a/testing/tests/ipv6/rw-psk-ikev1/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ipv6/rw-psk-ikev1/hosts/carol/etc/ipsec.conf
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn home

diff --git a/testing/tests/ipv6/rw-psk-ikev1/hosts/moon/etc/ipsec.conf b/testing/tests/ipv6/rw-psk-ikev1/hosts/moon/etc/ipsec.conf
index 78f6740260fd5a47c386f442891f2c7c94bc6278..69b154bcfb4af5c1f1ac0171cd55fce789a1a71c 100755 (executable)
--- a/testing/tests/ipv6/rw-psk-ikev1/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ipv6/rw-psk-ikev1/hosts/moon/etc/ipsec.conf
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn rw

diff --git a/testing/tests/ipv6/transport-ikev1/hosts/moon/etc/ipsec.conf b/testing/tests/ipv6/transport-ikev1/hosts/moon/etc/ipsec.conf
index 8bc0deba8e381ed3d8043409096fa4471a055d5d..69ba50530e5d74981e754e478d9cf8915f02074f 100755 (executable)
--- a/testing/tests/ipv6/transport-ikev1/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ipv6/transport-ikev1/hosts/moon/etc/ipsec.conf
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn host-host
        left=PH_IP6_MOON

diff --git a/testing/tests/ipv6/transport-ikev1/hosts/sun/etc/ipsec.conf b/testing/tests/ipv6/transport-ikev1/hosts/sun/etc/ipsec.conf
index b68082dd951ccc754dfaf0720e1597ece38cafa8..a7c6b18c7469208d5e9bc78fb8a708cab6ec71d9 100755 (executable)
--- a/testing/tests/ipv6/transport-ikev1/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/ipv6/transport-ikev1/hosts/sun/etc/ipsec.conf
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn host-host
        left=PH_IP6_SUN