summaryrefslogtreecommitdiff
path: root/regress/sbin
diff options
context:
space:
mode:
authorMathieu Sauve-Frankel <msf@cvs.openbsd.org>2006-06-01 18:04:33 +0000
committerMathieu Sauve-Frankel <msf@cvs.openbsd.org>2006-06-01 18:04:33 +0000
commit1da18e2f42442421991b07217fbd3c305fc9b0cd (patch)
treeabc091b5af650e7cb805aeffbe891a1f46572f77 /regress/sbin
parentb8d46b0042a04db3c6c7c61465fa6e337dcf6c78 (diff)
change the ike regression tests to use the new local-ID format
ok hshoexer@
Diffstat (limited to 'regress/sbin')
-rw-r--r--regress/sbin/ipsecctl/ike15.ok6
-rw-r--r--regress/sbin/ipsecctl/ike3.ok6
-rw-r--r--regress/sbin/ipsecctl/ike4.ok6
-rw-r--r--regress/sbin/ipsecctl/ike5.ok12
-rw-r--r--regress/sbin/ipsecctl/ike9.ok6
5 files changed, 18 insertions, 18 deletions
diff --git a/regress/sbin/ipsecctl/ike15.ok b/regress/sbin/ipsecctl/ike15.ok
index 5e69d1ec014..28d95040cd3 100644
--- a/regress/sbin/ipsecctl/ike15.ok
+++ b/regress/sbin/ipsecctl/ike15.ok
@@ -4,9 +4,9 @@ C set [peer-3ffe::1]:Address=3ffe::1 force
C set [peer-3ffe::1]:Configuration=mm-3ffe::1 force
C set [mm-3ffe::1]:EXCHANGE_TYPE=ID_PROT force
C add [mm-3ffe::1]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-3ffe::1]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-3ffe::1]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
C set [peer-3ffe::1]:Remote-ID=3ffe::1-ID force
C set [3ffe::1-ID]:ID-type=FQDN force
C set [3ffe::1-ID]:Name=faui31o.informatik.uni-erlangen.de force
diff --git a/regress/sbin/ipsecctl/ike3.ok b/regress/sbin/ipsecctl/ike3.ok
index a84d2600514..39fccfa8b74 100644
--- a/regress/sbin/ipsecctl/ike3.ok
+++ b/regress/sbin/ipsecctl/ike3.ok
@@ -4,9 +4,9 @@ C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force
C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force
C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-131.188.33.29]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-131.188.33.29]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
C set [peer-131.188.33.29]:Remote-ID=131.188.33.29-ID force
C set [131.188.33.29-ID]:ID-type=FQDN force
C set [131.188.33.29-ID]:Name=faui31o.informatik.uni-erlangen.de force
diff --git a/regress/sbin/ipsecctl/ike4.ok b/regress/sbin/ipsecctl/ike4.ok
index 4ad2626bde1..e2e2aa46923 100644
--- a/regress/sbin/ipsecctl/ike4.ok
+++ b/regress/sbin/ipsecctl/ike4.ok
@@ -4,9 +4,9 @@ C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force
C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force
C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-131.188.33.29]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-131.188.33.29]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
C set [peer-131.188.33.29]:Remote-ID=131.188.33.29-ID force
C set [131.188.33.29-ID]:ID-type=FQDN force
C set [131.188.33.29-ID]:Name=faui31o.informatik.uni-erlangen.de force
diff --git a/regress/sbin/ipsecctl/ike5.ok b/regress/sbin/ipsecctl/ike5.ok
index ca626a7bfea..2488919ccf7 100644
--- a/regress/sbin/ipsecctl/ike5.ok
+++ b/regress/sbin/ipsecctl/ike5.ok
@@ -4,9 +4,9 @@ C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force
C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force
C add [mm-131.188.33.29]:Transforms=3DES-SHA-GRP15-RSA_SIG force
-C set [peer-131.188.33.29]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-131.188.33.29]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
C set [peer-131.188.33.29]:Remote-ID=131.188.33.29-ID force
C set [131.188.33.29-ID]:ID-type=FQDN force
C set [131.188.33.29-ID]:Name=faui31o.informatik.uni-erlangen.de force
@@ -30,9 +30,9 @@ C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [peer-131.188.33.29]:Configuration=mm-131.188.33.29 force
C set [mm-131.188.33.29]:EXCHANGE_TYPE=ID_PROT force
C add [mm-131.188.33.29]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-131.188.33.29]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=sharleena.as10.net force
+C set [peer-131.188.33.29]:ID=sharleena.as10.net-ID force
+C set [sharleena.as10.net-ID]:ID-type=FQDN force
+C set [sharleena.as10.net-ID]:Name=sharleena.as10.net force
C set [peer-131.188.33.29]:Remote-ID=131.188.33.29-ID force
C set [131.188.33.29-ID]:ID-type=FQDN force
C set [131.188.33.29-ID]:Name=faui31o.informatik.uni-erlangen.de force
diff --git a/regress/sbin/ipsecctl/ike9.ok b/regress/sbin/ipsecctl/ike9.ok
index b05a08dd34d..fe36268a619 100644
--- a/regress/sbin/ipsecctl/ike9.ok
+++ b/regress/sbin/ipsecctl/ike9.ok
@@ -6,9 +6,9 @@ C set [peer-2.2.2.2]:Address=2.2.2.2 force
C set [peer-2.2.2.2]:Configuration=mm-2.2.2.2 force
C set [mm-2.2.2.2]:EXCHANGE_TYPE=ID_PROT force
C add [mm-2.2.2.2]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [peer-2.2.2.2]:ID=local-ID force
-C set [local-ID]:ID-type=FQDN force
-C set [local-ID]:Name=noname.my.domain force
+C set [peer-2.2.2.2]:ID=noname.my.domain-ID force
+C set [noname.my.domain-ID]:ID-type=FQDN force
+C set [noname.my.domain-ID]:Name=noname.my.domain force
C set [IPsec-3.3.3.0/24-4.4.4.0/24]:Phase=2 force
C set [IPsec-3.3.3.0/24-4.4.4.0/24]:ISAKMP-peer=peer-2.2.2.2 force
C set [IPsec-3.3.3.0/24-4.4.4.0/24]:Configuration=qm-3.3.3.0/24-4.4.4.0/24 force