merged multi-auth branch back into trunk

2009-04-14 10:34:24 +00:00
parent 6e5c8d9413
commit a44bb9345f
230 changed files with 6163 additions and 4193 deletions
@@ -2,7 +2,7 @@

 config setup
        crlcheckinterval=180
-	strictcrlpolicy=no
+	strictcrlpolicy=yes
 	plutostart=no

 conn %default
@@ -10,14 +10,20 @@ conn %default
 	keylife=20m
 	rekeymargin=3m
 	keyingtries=1
-
-conn home
+	keyexchange=ikev2
 	left=PH_IP_CAROL
-	leftcert=carolCert.pem
 	[email protected]
 	leftfirewall=yes
 	right=PH_IP_MOON
 	[email protected]
-	rightsubnet=10.1.0.0/16
-	keyexchange=ikev2
+
+conn alice 
+	leftcert=carolCert.pem
+	rightsubnet=10.1.0.10/32
 	auto=add
+
+conn venus
+	leftcert=carolCert-002.pem
+	rightsubnet=10.1.0.20/32
+	auto=add
+