define explicit IKEv1 key exchange mode II
authorAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 9 Oct 2010 18:04:00 +0000 (20:04 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Sat, 9 Oct 2010 18:04:00 +0000 (20:04 +0200)
136 files changed:
testing/tests/ikev1/esp-ah-transport/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/esp-ah-transport/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/esp-ah-tunnel/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/esp-ah-tunnel/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/esp-alg-aesxcbc/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/esp-alg-aesxcbc/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/esp-alg-des/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/esp-alg-des/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/esp-alg-strict-fail/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/esp-alg-strict-fail/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/esp-alg-strict/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/esp-alg-strict/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/esp-alg-weak/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/esp-alg-weak/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/host2host-swapped/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/host2host-swapped/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/host2host-transport/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/host2host-transport/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/ike-alg-strict-fail/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/ike-alg-strict-fail/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/ike-alg-strict/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/ike-alg-strict/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/mode-config-multiple/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/mode-config-multiple/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/mode-config-multiple/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/mode-config-push/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/mode-config-push/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/mode-config-push/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/mode-config-swapped/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/mode-config-swapped/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/mode-config-swapped/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/mode-config/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/mode-config/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/mode-config/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-ldap/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-ldap/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-ldap/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-loop/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-loop/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-pathlen/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-pathlen/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-revoked/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-revoked/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-strict/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-strict/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca-strict/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/multi-level-ca/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/nat-before-esp/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/nat-before-esp/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/nat-two-rw-mark/hosts/alice/etc/ipsec.conf
testing/tests/ikev1/nat-two-rw-mark/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/nat-two-rw-mark/hosts/venus/etc/ipsec.conf
testing/tests/ikev1/nat-two-rw-psk/hosts/alice/etc/ipsec.conf
testing/tests/ikev1/nat-two-rw-psk/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/nat-two-rw-psk/hosts/venus/etc/ipsec.conf
testing/tests/ikev1/net2net-pgp-v3/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/net2net-pgp-v3/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/net2net-pgp-v4/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/net2net-pgp-v4/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/net2net-psk-fail/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/net2net-psk-fail/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/net2net-psk/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/net2net-psk/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/net2net-route/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/net2net-rsa/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/net2net-rsa/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/net2net-start/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/ocsp-revoked/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/ocsp-revoked/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/ocsp-strict/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/ocsp-strict/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/passthrough/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/passthrough/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/protoport-dual/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/protoport-dual/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/protoport-pass/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/protoport-pass/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/protoport-route/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/protoport-route/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/rw-mark-in-out/hosts/alice/etc/ipsec.conf
testing/tests/ikev1/rw-mark-in-out/hosts/sun/etc/ipsec.conf
testing/tests/ikev1/rw-mark-in-out/hosts/venus/etc/ipsec.conf
testing/tests/ikev1/rw-psk-fqdn-named/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/rw-psk-fqdn-named/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/rw-psk-fqdn/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/rw-psk-fqdn/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/rw-psk-ipv4/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/rw-psk-ipv4/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/rw-psk-no-policy/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/rw-psk-no-policy/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/rw-psk-rsa-mixed/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/rw-psk-rsa-mixed/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/rw-rsa-no-policy/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/self-signed/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/self-signed/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/starter-also-loop/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/starter-also/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/starter-includes/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/starter-includes/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/strong-certs/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/strong-certs/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/strong-certs/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/virtual-ip-swapped/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/virtual-ip-swapped/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/virtual-ip/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/virtual-ip/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/wildcards/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/wildcards/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/wildcards/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/wlan/hosts/alice/etc/ipsec.conf
testing/tests/ikev1/wlan/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/wlan/hosts/venus/etc/ipsec.conf
testing/tests/ikev1/xauth-id-psk-mode-config/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/xauth-id-psk-mode-config/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/xauth-id-psk-mode-config/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/xauth-id-psk/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/xauth-id-psk/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/xauth-id-psk/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/xauth-id-rsa/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/xauth-id-rsa/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/xauth-id-rsa/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/xauth-psk/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/xauth-psk/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/xauth-psk/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa-fail/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa-fail/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa-mode-config/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa-mode-config/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa-mode-config/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa-nosecret/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa-nosecret/hosts/moon/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa/hosts/carol/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa/hosts/dave/etc/ipsec.conf
testing/tests/ikev1/xauth-rsa/hosts/moon/etc/ipsec.conf

index 6af3a88..299b6a8 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        auth=ah
        ike=aes128-sha
        esp=aes128-sha1
index e1bc08e..45ada02 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        auth=ah
        ike=aes128-sha
        esp=aes128-sha1
index 8a9f033..168e5d2 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        auth=ah
        ike=aes128-sha
        esp=aes128-sha1
index fb0e59d..b89d8e8 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        auth=ah
        ike=aes128-sha
        esp=aes128-sha1
index ed905d0..75ce0fb 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=aes256-sha2_256-modp2048!
        esp=aes256-aesxcbc!
 
index f1b7ff5..c2e0a6d 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=aes256-sha2_256-modp2048!
        esp=aes256-aesxcbc!
 
index feeef79..a5715a7 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=3des-md5-modp1024!
        esp=des-md5!
 
index be4c9ac..0329a53 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=3des-md5-modp1024!
        esp=des-md5!
 
index 2199794..46a6190 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=3des-sha1
        esp=3des-sha1
 
index 14f58cc..86a15c9 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=aes128-sha1
        esp=aes128-sha1!
 
index 7e2de30..052541b 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=3des-sha,aes128-sha1
        esp=3des-sha1,aes128-sha1
 
index 14f58cc..86a15c9 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=aes128-sha1
        esp=aes128-sha1!
 
index feeef79..a5715a7 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=3des-md5-modp1024!
        esp=des-md5!
 
index 147d8ff..e5fed2f 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn rw
        left=PH_IP_MOON
index b984b8d..95739fe 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn host-host
        right=PH_IP_MOON
index bb409ad..a0d600a 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn host-host
        right=PH_IP_SUN
index 49c84d8..b56189c 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn host-host
        left=PH_IP_MOON
index e517b39..1f2ade2 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn host-host
        left=PH_IP_SUN
index 63ad1c0..d75a702 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=3des-sha1
        esp=3des-sha1
 
index 1ea5fe7..460ff74 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=aes128-sha1!
        esp=aes128-sha1
 
index 9272bdc..36bdc0f 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=3des-sha1,aes128-sha1
        esp=3des-sha1,aes128-sha1
 conn home
index 1ea5fe7..460ff74 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=aes128-sha1!
        esp=aes128-sha1
 
index f059166..3d6addb 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn alice
        also=home
index 44644f2..0b93eb5 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn alice
         also=home
index ce760a4..7f5bb81 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=192.168.0.1
        leftsourceip=10.1.0.1
        leftcert=moonCert.pem
index 594f2c5..64c97eb 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        rekeymargin=3m
        rekey=no
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_CAROL
index 469145f..ba47559 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_DAVE
index 79be572..8b125ab 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        modeconfig=push
        left=PH_IP_MOON
        leftsubnet=10.1.0.0/16
index b019c5a..4cea3d8 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        right=PH_IP_CAROL
index 5b38a20..cf96dde 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        right=PH_IP_DAVE
index 911531e..b01f5b1 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightsourceip=PH_IP_MOON1
index 57ec704..9c75434 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_CAROL
index 3179faa..726998e 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_DAVE
index ce26fc5..3727808 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        rekey=no
        left=PH_IP_MOON
        leftsubnet=10.1.0.0/16
index cfdc692..d9e5b11 100755 (executable)
@@ -16,6 +16,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        right=PH_IP_MOON
index fecce5e..bf83264 100755 (executable)
@@ -16,6 +16,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_DAVE
        leftcert=daveCert.pem
        right=PH_IP_MOON
index 994792f..50b8965 100755 (executable)
@@ -26,6 +26,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
index 04a512e..4d42b14 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        right=PH_IP_MOON
index a9e648f..f91ca63 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
index 1da39e4..39a1aa8 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_CAROL
index 8e41bb1..ca5919d 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn duck 
        left=PH_IP_MOON
index d240302..b4bc210 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        leftid=carol@strongswan.org
index fdca83e..0b9917b 100755 (executable)
@@ -16,6 +16,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
index d4ce573..cf93bb2 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        right=PH_IP_MOON
index ea44552..5f04445 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_DAVE
        leftcert=daveCert.pem
        right=PH_IP_MOON
index cf952be..f79c501 100755 (executable)
@@ -16,6 +16,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
index 0adb259..d11724c 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        leftsendcert=ifasked
index 0e8e413..2d80aad 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_DAVE
        leftcert=daveCert.pem
        leftsendcert=ifasked
index 1e00096..9b97015 100755 (executable)
@@ -16,6 +16,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftsendcert=ifasked
index 82576bb..1ee1b77 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn host-net
        left=192.168.0.1
index 5064178..57496e1 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn host-net
        left=192.168.0.2
index 441aabf..4ed5562 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn nat-t
        left=%defaultroute
index 74d85b5..2b34643 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn alice
        rightid=alice@strongswan.org
index 604e917..0be3477 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn nat-t
        left=%defaultroute
index e8576f0..eee3c45 100755 (executable)
@@ -10,6 +10,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
                
 conn nat-t
index ebd735a..a7c500f 100755 (executable)
@@ -10,6 +10,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn nat-t
index e8576f0..eee3c45 100755 (executable)
@@ -10,6 +10,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
                
 conn nat-t
index 83d2b26..a38c660 100755 (executable)
@@ -10,6 +10,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        
 conn net-net
        left=PH_IP_MOON
index d5b7c39..6a373e2 100755 (executable)
@@ -10,6 +10,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        
 conn net-net
        left=PH_IP_SUN
index bbd1f3a..094ab3b 100755 (executable)
@@ -10,6 +10,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        
 conn net-net
        left=PH_IP_MOON
index abe91e6..428b10c 100755 (executable)
@@ -10,6 +10,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        
 conn net-net
        left=PH_IP_SUN
index 7302a42..ad0359f 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn net-net
index 7633f5c..9bbff90 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn net-net
index 5eedd9f..c63ec2f 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn net-net
index 24bd66f..e21ee99 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn net-net
index eabb76b..bc72fab 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn net-net
        left=PH_IP_MOON
index 18b18f3..837c1ab 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        
 conn net-net
        left=PH_IP_MOON
index 3f2bc48..efd9c79 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        
 conn net-net
        left=PH_IP_SUN
index e2e43ce..acb12e7 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn net-net
        left=PH_IP_MOON
index 9a1f093..a629648 100755 (executable)
@@ -16,6 +16,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolRevokedCert.pem
        leftid=carol@strongswan.org
index 9b0c9b5..cd2ab0a 100755 (executable)
@@ -16,6 +16,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
index 5624f4f..c79b1c3 100755 (executable)
@@ -16,6 +16,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        leftid=carol@strongswan.org
index 9b0c9b5..cd2ab0a 100755 (executable)
@@ -16,6 +16,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
index 557fb62..25eec2a 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftsubnet=10.1.0.0/16
        right=PH_IP_SUN
index 9276f1f..7541aa8 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn net-net
        left=PH_IP_SUN
index 3adfdc0..48df689 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        leftid=carol@strongswan.org
index e1ce149..c4bfebd 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
index 913e6d9..aae781b 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home-icmp
        left=PH_IP_CAROL
index d941e81..7b80a29 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn rw-icmp
        left=PH_IP_MOON
index dfc0143..2bb5574 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        leftid=carol@strongswan.org
index e1ce149..c4bfebd 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
index 6a645e0..4256006 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=%defaultroute
index 66884e0..83fe9ee 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn alice
        rightid=alice@strongswan.org
index 4c58dc5..e7561eb 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=%defaultroute
index f0e4036..ffa2112 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn home
index 864d014..5f7cded 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn rw-carol 
index f0e4036..ffa2112 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn home
index f3a6db1..efec3b3 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn rw
index d763379..0d2a5d2 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn home
index 025f335..41582ea 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=secret
        
 conn rw
index 980523a..c040fe8 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        
 conn home
        authby=secret
index d57d790..f0dbeb3 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn rw
        left=PH_IP_MOON
index 08a41e6..f2a15af 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        ike=aes128,serpent128,twofish128,3des
        
 conn home
index b8900c0..02270e0 100755 (executable)
@@ -9,6 +9,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftid=@moon.strongswan.org
        leftsubnet=10.1.0.0/16
index dbfac50..dbd3adb 100755 (executable)
@@ -8,6 +8,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn rw-psk
        authby=secret
index db281ef..f6859b8 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_CAROL
index f3c2be9..f14352b 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn carol
        left=PH_IP_MOON
index cd751df..af2fcc5 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn net-net
        also=host-host
index e78231f..2bd4985 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn net-net
        also=host-host
index 57ec704..9c75434 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_CAROL
index 3179faa..726998e 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_DAVE
index a2af4e9..2a1dad5 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_CAROL
index e48b1a7..e10e9d4 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_DAVE
index b9710cb..67e97eb 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn rw
        left=PH_IP_MOON
index b4ad3c0..4dfa345 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        right=PH_IP_CAROL
index eafcf5e..b65d7a6 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn rw
        right=PH_IP_MOON
index 71aa4de..e0ef169 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn home
        left=PH_IP_CAROL
index 471e9e8..63a8c92 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn rw
        left=PH_IP_MOON
index d4ce573..cf93bb2 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        right=PH_IP_MOON
index ea44552..5f04445 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_DAVE
        leftcert=daveCert.pem
        right=PH_IP_MOON
index 8952bc9..39b0315 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
index 30b6576..e3cf9b1 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn system
        left=PH_IP_ALICE
index ab3287a..61ce28e 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn alice
        right=PH_IP_ALICE
index bb9897c..fa2dc95 100755 (executable)
@@ -12,6 +12,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
 
 conn system
        left=PH_IP_VENUS
index aa0ae12..b7402d2 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthpsk
 
 conn home
index 0243f5a..8f9226d 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthpsk
 
 conn home
index 4206f89..452187f 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthpsk
        xauth=server
 
index 48015ad..da1a105 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthpsk
 
 conn home
index baa85e3..3a4b75a 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthpsk
 
 conn home
index c92ad87..850ea56 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthpsk
        xauth=server
 
index 32b1227..be62c2b 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
 
 conn home
index 090deac..c09fb3c 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
 
 conn home
index f79a81a..2510414 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
        xauth=server
 
index 684ace0..1c7d700 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthpsk
 
 conn home
index 14307a7..782c160 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthpsk
 
 conn home
index a4e01b5..595e658 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthpsk
        xauth=server
 
index 47bf1da..186d8e1 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
 
 conn home
index f79a81a..2510414 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
        xauth=server
 
index 4792818..ca2df4b 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
 
 conn home
index 8c8cb4a..079c6b0 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
 
 conn home
index 1c48e13..0a65acb 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
        xauth=server
        left=PH_IP_MOON
index 1e21fbb..fc86bab 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
 
 conn home
index 94cc681..e2709cd 100755 (executable)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
        xauth=server
 
index 47bf1da..186d8e1 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
 
 conn home
index 1fcf71d..478e732 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
 
 conn home
index f79a81a..2510414 100644 (file)
@@ -11,6 +11,7 @@ conn %default
        keylife=20m
        rekeymargin=3m
        keyingtries=1
+       keyexchange=ikev1
        authby=xauthrsasig
        xauth=server