tests with subjectAltNames now

diff --git a/testing/tests/ikev2-ikev1-mixed/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2-ikev1-mixed/hosts/moon/etc/ipsec.conf
index 0653549..dae4cf5 100644 (file)
--- a/testing/tests/ikev2-ikev1-mixed/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev2-ikev1-mixed/hosts/moon/etc/ipsec.conf
@@ -5,17 +5,18 @@ version       2.0     # conforms to second version of ipsec.conf specification
 conn %default
        left=PH_IP_MOON
        leftcert=moonCert.pem
+       leftid=@moon.strongswan.org
        leftsubnet=10.1.0.0/16
 
 conn net-net
        right=PH_IP_SUN
        rightcert=sunCert.pem
+       rightid=@sun.strongswan.org
        rightsubnet=10.2.0.0/16
        keyexchange=ikev2
        auto=add
 
 conn rw
-       leftid=@moon.strongswan.org
        right=%any
        rightid=carol@strongswan.org
        keyexchange=ikev1

diff --git a/testing/tests/ikev2-ikev1-mixed/hosts/sun/etc/ipsec.conf b/testing/tests/ikev2-ikev1-mixed/hosts/sun/etc/ipsec.conf
index defccb9..fa1ba5d 100644 (file)
--- a/testing/tests/ikev2-ikev1-mixed/hosts/sun/etc/ipsec.conf
+++ b/testing/tests/ikev2-ikev1-mixed/hosts/sun/etc/ipsec.conf
@@ -8,9 +8,11 @@ config setup
 conn net-net 
        left=PH_IP_SUN
        leftcert=sunCert.pem
+       leftid=@sun.strongswan.org
        leftsubnet=10.2.0.0/16
        right=PH_IP_MOON
        rightcert=moonCert.pem
+       rightid=@moon.strongswan.org
        rightsubnet=10.1.0.0/16
        keyexchange=ikev2
        auto=add

diff --git a/testing/tests/ikev2-rw/hosts/carol/etc/ipsec.conf b/testing/tests/ikev2-rw/hosts/carol/etc/ipsec.conf
index 0099cca..b936d72 100644 (file)
--- a/testing/tests/ikev2-rw/hosts/carol/etc/ipsec.conf
+++ b/testing/tests/ikev2-rw/hosts/carol/etc/ipsec.conf
@@ -8,8 +8,10 @@ config setup
 conn home
        left=PH_IP_CAROL
        leftcert=carolCert.pem
+       leftid=carol@strongswan.org
        right=PH_IP_MOON
        rightcert=moonCert.pem
+       rightid=@moon.strongswan.org
        rightsubnet=10.1.0.0/16
        keyexchange=ikev2
        auto=add

diff --git a/testing/tests/ikev2-rw/hosts/dave/etc/ipsec.conf b/testing/tests/ikev2-rw/hosts/dave/etc/ipsec.conf
index 19880cc..357beff 100644 (file)
--- a/testing/tests/ikev2-rw/hosts/dave/etc/ipsec.conf
+++ b/testing/tests/ikev2-rw/hosts/dave/etc/ipsec.conf
@@ -8,8 +8,10 @@ config setup
 conn home
        left=PH_IP_DAVE
        leftcert=daveCert.pem
+       leftid=dave@strongswan.org
        right=PH_IP_MOON
        rightcert=moonCert.pem
+       rightid=@moon.strongswan.org
        rightsubnet=10.1.0.0/16
        keyexchange=ikev2
        auto=add

diff --git a/testing/tests/ikev2-rw/hosts/moon/etc/ipsec.conf b/testing/tests/ikev2-rw/hosts/moon/etc/ipsec.conf
index fc309bb..92d484d 100644 (file)
--- a/testing/tests/ikev2-rw/hosts/moon/etc/ipsec.conf
+++ b/testing/tests/ikev2-rw/hosts/moon/etc/ipsec.conf
@@ -8,15 +8,18 @@ config setup
 conn %default
        left=PH_IP_MOON
        leftcert=moonCert.pem
+       leftid=@moon.strongswan.org
        leftsubnet=10.1.0.0/16
        keyexchange=ikev2
        
 conn rw-carol
        right=%any
        rightcert=carolCert.pem
+       rightid=carol@strongswan.org
        auto=add
 
 conn rw-dave
        right=%any
        rightcert=daveCert.pem
+       rightid=dave@strongswan.org
        auto=add