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
@@ -3,8 +3,14 @@
 config setup
        crlcheckinterval=180
 	strictcrlpolicy=yes
+	uniqueids=no
 	plutostart=no

+ca strongswan
+        cacert=strongswanCert.pem
+        crluri=http://crl.strongswan.org/strongswan.crl
+        auto=add
+
 conn %default
 	ikelifetime=60m
 	keylife=20m
@@ -13,19 +19,16 @@ conn %default
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]
-	leftsubnet=10.1.0.0/16
 	leftfirewall=yes
 	right=%any
+	[email protected]
 	keyexchange=ikev2

-conn carol
-	[email protected]
-	rightcert=carolRevokedCert.pem
+conn alice 
+	leftsubnet=10.1.0.10/32
 	auto=add

-conn dave
-	[email protected]
-	rightcert=daveCert.der
-	rightca=%any
+conn venus 
+	leftsubnet=10.1.0.20/32
 	auto=add