define explicit IKEv1 key exchange mode

2010-10-07 07:31:44 +02:00
parent 9b201cf859
commit 84babfb895
61 changed files with 61 additions and 1 deletions
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 		
 conn nat-t
 	left=%defaultroute
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn nat-t
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn home
 	left=PH_IP_CAROL
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn home
 	left=PH_IP_DAVE
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_SUN
 	leftcert=sunCert.pem
 	[email protected]
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn nat-t
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=camellia128-sha256-modp2048!
 	esp=camellia128-sha256!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=camellia128-sha256-modp2048!
 	esp=camellia128-sha256!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=serpent256-sha2_512-modp4096!
 	esp=serpent256-sha2_512!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=serpent256-sha2_512-modp4096!
 	esp=serpent256-sha2_512!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=twofish256-sha2_512-modp4096!
 	esp=twofish256-sha2_512!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=twofish256-sha2_512-modp4096!
 	esp=twofish256-sha2_512!

@@ -9,6 +9,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev2

 conn home
 	left=PH_IP_DAVE
@@ -17,5 +18,4 @@ conn home
 	right=PH_IP_MOON
 	[email protected]
 	rightsubnet=10.1.0.0/16
-	keyexchange=ikev2
 	auto=add
@@ -9,6 +9,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1 

 conn rw
 	left=PH_IP_MOON
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn home
 	left=PH_IP_CAROL
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn rw
 	left=PH_IP_MOON
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=blowfish256-sha2_512-modp4096!
 	esp=blowfish256-sha2_512!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=blowfish256-sha2_512-modp4096!
 	esp=blowfish256-sha2_512!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=aes128-sha256-modp2048!
 	esp=aes128-sha256_96!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=aes128-sha256-modp2048!
 	esp=aes128-sha256_96!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=aes128-sha256-modp2048!
 	esp=aes128-sha256!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=aes128-sha256-modp2048!
 	esp=aes128-sha256!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=aes192-sha384-modp3072!
 	esp=aes192-sha384!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=aes192-sha384-modp3072!
 	esp=aes192-sha384!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=aes256-sha512-modp4096!
 	esp=aes256-sha512!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=aes256-sha512-modp4096!
 	esp=aes256-sha512!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_CAROL
 	leftcert=carolCert.pem
 	[email protected]
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_DAVE
 	leftcert=daveCert.pem
 	[email protected]
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1l
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	compress=yes

 conn home
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	compress=yes

 conn rw
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_CAROL
 	leftcert=carolCert.pem
 	[email protected]
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]
@@ -17,6 +17,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=2
+	keyexchange=ikev1

 conn home
 	left=PH_IP_CAROL
@@ -17,6 +17,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=2
+	keyexchange=ikev1
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_CAROL
 	leftcert=carolRevokedCert.pem
 	[email protected]
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_CAROL
 	leftcert=carolCert.pem
 	[email protected]
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_CAROL
 	leftcert=carolCert.pem
 	[email protected]
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn home
 	left=PH_IP_CAROL
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn carol
 	left=PH_IP_MOON
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 		
 conn nat-t
 	left=%defaultroute
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn nat-t
 	left=%defaultroute
@@ -12,6 +12,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 		
 conn nat-t
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	dpdaction=clear
 	dpddelay=10
 	dpdtimeout=30
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn moon 
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
        dpdaction=restart
        dpddelay=5
        dpdtimeout=25
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn moon 
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn moon 
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=%defaultroute
 	leftnexthop=%direct
 	leftsubnet=10.1.0.0/16
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn moon 
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn moon 
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=%defaultroute
 	leftnexthop=%direct
 	leftsubnet=10.1.0.0/16
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn moon 
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1

 conn moon
 	left=%defaultroute
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	left=%defaultroute
 	leftnexthop=%direct
 	leftsubnet=10.1.0.0/16
@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=camellia192-sha384-modp3072!
 	esp=camellia192-sha384!

@@ -11,6 +11,7 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
+	keyexchange=ikev1
 	ike=camellia192-sha384-modp3072!
 	esp=camellia192-sha384!