diff options
Diffstat (limited to 'testing/tests')
17 files changed, 51 insertions, 24 deletions
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 02357ea8d..f557eb961 100644 --- 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 a3caa2547..ea707b50b 100644 --- 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 07e74f45c..8b3524219 100644 --- 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 362f43d28..1c63ce427 100644 --- 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 3e3a4216a..a3f05f9d3 100644 --- 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 48b6accd1..8b2078ea1 100644 --- 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 02ac57a9a..a6bba5b04 100644 --- 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 99c9115c3..5b80edb9f 100644 --- 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 3c95bdd25..7e79c11f8 100644 --- 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 4571a0a2b..c3934559d 100644 --- 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 cd646a99f..8f18b9ee4 100644 --- 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 fb74b5869..d2bd0f538 100644 --- 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 e9707cf9d..e14f95107 100644 --- 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 b24bcbc7c..afc8379bf 100644 --- 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 e9707cf9d..e14f95107 100644 --- 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 f82bc37d8..3ac23f328 100644 --- 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 48b6accd1..8b2078ea1 100644 --- 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 |