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 02357ea..f557eb9 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 a3caa25..ea707b5 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 07e74f4..8b35242 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 362f43d..1c63ce4 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 3e3a421..a3f05f9 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 48b6acc..8b2078e 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 02ac57a..a6bba5b 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 99c9115..5b80edb 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 3c95bdd..7e79c11 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 4571a0a..c393455 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 cd646a9..8f18b9e 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 fb74b58..d2bd0f5 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 e9707cf..e14f951 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 b24bcbc..afc8379 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 e9707cf..e14f951 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 f82bc37..3ac23f3 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 48b6acc..8b2078e 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