change ikev1/xauth scenarios to modern notation

diff --git a/testing/tests/ikev1/xauth-id-psk-config/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/xauth-id-psk-config/hosts/carol/etc/ipsec.conf
index 02357ea8d2b8fd172655f4901d8a1319103e2a74..f557eb9612d10f7a38062daa4531143fea1385d6 100644 (file)
--- a/testing/tests/ikev1/xauth-id-psk-config/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-id-psk-config/hosts/carol/etc/ipsec.conf
@@ -8,15 +8,17 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthpsk
 
 conn home
        left=PH_IP_CAROL
        leftid=PH_IP_CAROL
        leftsourceip=%config
+       leftauth=psk
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightid=@moon.strongswan.org
        rightsubnet=10.1.0.0/16
+       rightauth=psk
        xauth_identity=carol
        auto=add

diff --git a/testing/tests/ikev1/xauth-id-psk-config/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/xauth-id-psk-config/hosts/dave/etc/ipsec.conf
index a3caa254790fdb3790c28e8b5eb9cff8e49327a5..ea707b50b71da90bd46df8818bb44f8020164028 100644 (file)
--- a/testing/tests/ikev1/xauth-id-psk-config/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-id-psk-config/hosts/dave/etc/ipsec.conf
@@ -8,15 +8,17 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthpsk
 
 conn home
        left=PH_IP_DAVE
        leftid=PH_IP_DAVE
        leftsourceip=%config
+       leftauth=psk
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightid=@moon.strongswan.org
        rightsubnet=10.1.0.0/16
+       rightauth=psk
        xauth_identity=dave
        auto=add

diff --git a/testing/tests/ikev1/xauth-id-psk-config/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/xauth-id-psk-config/hosts/moon/etc/ipsec.conf
index 07e74f45c83df423a1c27ea8cb555a9135e4f2ce..8b35242197ca77225eb4d9533cf934b9898c271d 100644 (file)
--- a/testing/tests/ikev1/xauth-id-psk-config/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-id-psk-config/hosts/moon/etc/ipsec.conf
@@ -8,14 +8,15 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthpsk
-       xauth=server
 
 conn rw
        left=PH_IP_MOON
        leftid=@moon.strongswan.org
        leftsubnet=10.1.0.0/16
+       leftauth=psk
        leftfirewall=yes
        right=%any
        rightsourceip=10.3.0.0/24
+       rightauth=psk
+       rightauth2=xauth
        auto=add

diff --git a/testing/tests/ikev1/xauth-id-rsa/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/xauth-id-rsa/hosts/carol/etc/ipsec.conf
index 362f43d28d8586ac44cbda60db09106fe1f1a3f0..1c63ce4279ca93f6b282162d0eea9f92120c016e 100644 (file)
--- a/testing/tests/ikev1/xauth-id-rsa/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-id-rsa/hosts/carol/etc/ipsec.conf
@@ -8,15 +8,17 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthrsasig
 
 conn home
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        leftid=carol@strongswan.org
+       leftauth=rsasig
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightid=@moon.strongswan.org
+       rightauth=rsasig
        xauth_identity=carol
        auto=add

diff --git a/testing/tests/ikev1/xauth-id-rsa/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/xauth-id-rsa/hosts/dave/etc/ipsec.conf
index 3e3a4216a67874016a116d635fef5be214625270..a3f05f9d31b7b8a7f9eafea885acb64a87f3dedc 100644 (file)
--- a/testing/tests/ikev1/xauth-id-rsa/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-id-rsa/hosts/dave/etc/ipsec.conf
@@ -8,15 +8,17 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthrsasig
 
 conn home
        left=PH_IP_DAVE
        leftcert=daveCert.pem
        leftid=dave@strongswan.org
+       leftauth=rsasig
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightid=@moon.strongswan.org
+       rightauth=rsasig
        xauth_identity=dave
        auto=add

diff --git a/testing/tests/ikev1/xauth-id-rsa/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/xauth-id-rsa/hosts/moon/etc/ipsec.conf
index 48b6accd1dd34e418cd4deb4825df1f6870e426b..8b2078ea19d74645187cfe8141e1ca54e1371d7e 100644 (file)
--- a/testing/tests/ikev1/xauth-id-rsa/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-id-rsa/hosts/moon/etc/ipsec.conf
@@ -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
        leftid=@moon.strongswan.org
        leftsubnet=10.1.0.0/16
+       leftauth=rsasig
        leftfirewall=yes
        right=%any
+       rightauth=rsasig
+       rightauth2=xauth
        auto=add

diff --git a/testing/tests/ikev1/xauth-psk/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/xauth-psk/hosts/carol/etc/ipsec.conf
index 02ac57a9ad50d90b3862f544b0f758cc1357f9c8..a6bba5b04e0b2a01d3621558fc762efecede402e 100644 (file)
--- a/testing/tests/ikev1/xauth-psk/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-psk/hosts/carol/etc/ipsec.conf
@@ -8,13 +8,15 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthpsk
 
 conn home
        left=PH_IP_CAROL
        leftid=carol@strongswan.org
+       leftauth=psk
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightid=@moon.strongswan.org
+       rightauth=psk
        auto=add

diff --git a/testing/tests/ikev1/xauth-psk/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/xauth-psk/hosts/dave/etc/ipsec.conf
index 99c9115c3d48b4f970465b16675d9a7079827f07..5b80edb9f67bb8a7dff828bbc4c983f93af70829 100644 (file)
--- a/testing/tests/ikev1/xauth-psk/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-psk/hosts/dave/etc/ipsec.conf
@@ -8,13 +8,15 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthpsk
 
 conn home
        left=PH_IP_DAVE
        leftid=dave@strongswan.org
        leftfirewall=yes
+       leftauth=psk
+       leftauth2=xauth
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightid=@moon.strongswan.org
+       rightauth=psk
        auto=add

diff --git a/testing/tests/ikev1/xauth-psk/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/xauth-psk/hosts/moon/etc/ipsec.conf
index 3c95bdd257dbbcf938168958efdadc657c6ad7b0..7e79c11f848419e7dd2d3941ce932947431c625d 100644 (file)
--- a/testing/tests/ikev1/xauth-psk/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-psk/hosts/moon/etc/ipsec.conf
@@ -8,13 +8,14 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthpsk
-       xauth=server
 
 conn rw
        left=PH_IP_MOON
        leftid=@moon.strongswan.org
        leftsubnet=10.1.0.0/16
+       leftauth=psk
        leftfirewall=yes
        right=%any
+       rightauth=psk
+       rightauth2=xauth
        auto=add

diff --git a/testing/tests/ikev1/xauth-rsa-config/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/xauth-rsa-config/hosts/carol/etc/ipsec.conf
index 4571a0a2b4099e7216e7be705d48d319156f60fd..c3934559de9e9a7ec7d899ddb2950e30ce8ccacf 100644 (file)
--- a/testing/tests/ikev1/xauth-rsa-config/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-rsa-config/hosts/carol/etc/ipsec.conf
@@ -8,15 +8,17 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthrsasig
 
 conn home
        left=PH_IP_CAROL
        leftsourceip=%config
        leftcert=carolCert.pem
        leftid=carol@strongswan.org
+       leftauth=rsasig
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightid=@moon.strongswan.org
+       rightauth=rsasig
        auto=add

diff --git a/testing/tests/ikev1/xauth-rsa-config/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/xauth-rsa-config/hosts/dave/etc/ipsec.conf
index cd646a99f9cee1f275ea8f9e78222f2c8e73c4b4..8f18b9ee4a5d25c92630d85e4e605b1c90275c0a 100644 (file)
--- a/testing/tests/ikev1/xauth-rsa-config/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-rsa-config/hosts/dave/etc/ipsec.conf
@@ -8,15 +8,17 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthrsasig
 
 conn home
        left=PH_IP_DAVE
        leftsourceip=%config
        leftcert=daveCert.pem
        leftid=dave@strongswan.org
+       leftauth=rsasig
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightid=@moon.strongswan.org
+       rightauth=rsasig
        auto=add

diff --git a/testing/tests/ikev1/xauth-rsa-config/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/xauth-rsa-config/hosts/moon/etc/ipsec.conf
index fb74b5869766e23d8fbbe50987b1e554e99ad851..d2bd0f53872926291adf59d774ba9736edd39cf2 100644 (file)
--- a/testing/tests/ikev1/xauth-rsa-config/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-rsa-config/hosts/moon/etc/ipsec.conf
@@ -8,14 +8,15 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthrsasig
-       xauth=server
        left=PH_IP_MOON
        leftcert=moonCert.pem
        leftid=@moon.strongswan.org
        leftsubnet=10.1.0.0/16
+       leftauth=rsasig
        leftfirewall=yes
        right=%any
+       rightauth=rsasig
+       rightauth2=xauth
        auto=add
 
 conn rw-carol
@@ -25,4 +26,3 @@ conn rw-carol
 conn rw-dave
        rightid=dave@strongswan.org
        rightsourceip=PH_IP_DAVE1
-

diff --git a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/carol/etc/ipsec.conf
index e9707cf9d095b592e37157237ca6ed178dc07610..e14f95107c6dc102d231b641f15f49d20b8b9def 100644 (file)
--- a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/carol/etc/ipsec.conf
@@ -8,14 +8,16 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthrsasig
 
 conn home
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        leftid=carol@strongswan.org
+       leftauth=rsasig
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightid=@moon.strongswan.org
+       rightauth=rsasig
        auto=add

diff --git a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/moon/etc/ipsec.conf
index b24bcbc7cf87a8288b673a6ed7aeedaa5e92d431..afc8379bfa8d4e317bff1b844ce6df9ee6e1ef74 100644 (file)
--- a/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-rsa-eap-md5-radius/hosts/moon/etc/ipsec.conf
@@ -8,14 +8,15 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthrsasig
-       xauth=server
 
 conn rw
        left=PH_IP_MOON
        leftsubnet=10.1.0.0/16
        leftid=@moon.strongswan.org
        leftcert=moonCert.pem
+       leftauth=rsasig
        leftfirewall=yes
        right=%any
+       rightauth=rsasig
+       rightauth2=xauth
        auto=add

diff --git a/testing/tests/ikev1/xauth-rsa/hosts/carol/etc/ipsec.conf b/testing/tests/ikev1/xauth-rsa/hosts/carol/etc/ipsec.conf
index e9707cf9d095b592e37157237ca6ed178dc07610..e14f95107c6dc102d231b641f15f49d20b8b9def 100644 (file)
--- a/testing/tests/ikev1/xauth-rsa/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-rsa/hosts/carol/etc/ipsec.conf
@@ -8,14 +8,16 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthrsasig
 
 conn home
        left=PH_IP_CAROL
        leftcert=carolCert.pem
        leftid=carol@strongswan.org
+       leftauth=rsasig
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightid=@moon.strongswan.org
+       rightauth=rsasig
        auto=add

diff --git a/testing/tests/ikev1/xauth-rsa/hosts/dave/etc/ipsec.conf b/testing/tests/ikev1/xauth-rsa/hosts/dave/etc/ipsec.conf
index f82bc37d89ce0d9af3faf4688ca88e11ce3acd9f..3ac23f3281c1139b0fb746b50ecda287620ae29f 100644 (file)
--- a/testing/tests/ikev1/xauth-rsa/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-rsa/hosts/dave/etc/ipsec.conf
@@ -8,14 +8,16 @@ conn %default
        rekeymargin=3m
        keyingtries=1
        keyexchange=ikev1
-       authby=xauthrsasig
 
 conn home
        left=PH_IP_DAVE
        leftcert=daveCert.pem
        leftid=dave@strongswan.org
+       leftauth=rsasig
+       leftauth2=xauth
        leftfirewall=yes
        right=PH_IP_MOON
        rightsubnet=10.1.0.0/16
        rightid=@moon.strongswan.org
+       rightauth=rsasig
        auto=add

diff --git a/testing/tests/ikev1/xauth-rsa/hosts/moon/etc/ipsec.conf b/testing/tests/ikev1/xauth-rsa/hosts/moon/etc/ipsec.conf
index 48b6accd1dd34e418cd4deb4825df1f6870e426b..8b2078ea19d74645187cfe8141e1ca54e1371d7e 100644 (file)
--- a/testing/tests/ikev1/xauth-rsa/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev1/xauth-rsa/hosts/moon/etc/ipsec.conf
@@ -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
        leftid=@moon.strongswan.org
        leftsubnet=10.1.0.0/16
+       leftauth=rsasig
        leftfirewall=yes
        right=%any
+       rightauth=rsasig
+       rightauth2=xauth
        auto=add