change ikev1/xauth scenarios to modern notation

2012-06-18 21:22:01 +02:00
parent 6d3702ed61
commit 7a892288fb
17 changed files with 51 additions and 24 deletions
@@ -8,14 +8,16 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev1
-	authby=xauthrsasig

 conn home
 	left=PH_IP_CAROL
 	leftcert=carolCert.pem
 	[email protected]
+	leftauth=rsasig
+	leftauth2=xauth
 	leftfirewall=yes
 	right=PH_IP_MOON
 	rightsubnet=10.1.0.0/16
 	[email protected]
+	rightauth=rsasig
 	auto=add
@@ -8,14 +8,16 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev1
-	authby=xauthrsasig

 conn home
 	left=PH_IP_DAVE
 	leftcert=daveCert.pem
 	[email protected]
+	leftauth=rsasig
+	leftauth2=xauth
 	leftfirewall=yes
 	right=PH_IP_MOON
 	rightsubnet=10.1.0.0/16
 	[email protected]
+	rightauth=rsasig
 	auto=add
@@ -8,14 +8,15 @@ conn %default
 	rekeymargin=3m
 	keyingtries=1
 	keyexchange=ikev1
-	authby=xauthrsasig
-	xauth=server

 conn rw
 	left=PH_IP_MOON
 	leftcert=moonCert.pem
 	[email protected]
 	leftsubnet=10.1.0.0/16
+	leftauth=rsasig
 	leftfirewall=yes
 	right=%any
+	rightauth=rsasig
+	rightauth2=xauth
 	auto=add