summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2005-09-20 17:32:04 +0000
committerHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2005-09-20 17:32:04 +0000
commit3f1a349669b6dc858618a4cdc102081d4d850964 (patch)
treef3b0ff2aef2b0a77a4109940b3248c093e1ca185
parentdac90194ed66ed2c45a9c1b5c0b0356c3b2bd3ed (diff)
reflect latest changes ("Phase 1" and "Conneciton=...")
-rw-r--r--regress/sbin/ipsecctl/ike1.ok2
-rw-r--r--regress/sbin/ipsecctl/ike2.ok2
-rw-r--r--regress/sbin/ipsecctl/ike3.ok2
-rw-r--r--regress/sbin/ipsecctl/ike4.ok2
-rw-r--r--regress/sbin/ipsecctl/ike5.ok4
-rw-r--r--regress/sbin/ipsecctl/ike6.ok4
-rw-r--r--regress/sbin/ipsecctl/ike7.ok2
7 files changed, 18 insertions, 0 deletions
diff --git a/regress/sbin/ipsecctl/ike1.ok b/regress/sbin/ipsecctl/ike1.ok
index 428815b3f94..a77136732e2 100644
--- a/regress/sbin/ipsecctl/ike1.ok
+++ b/regress/sbin/ipsecctl/ike1.ok
@@ -1,3 +1,4 @@
+C set [Phase 1]:131.188.33.29=peer-131.188.33.29
C set [peer-131.188.33.29]:Phase=1 force
C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [IPsec-131.188.33.51-131.188.33.29]:Phase=2 force
@@ -11,5 +12,6 @@ C set [lid-131.188.33.51]:ID-type=IPV4_ADDR force
C set [lid-131.188.33.51]:Address=131.188.33.51 force
C set [rid-131.188.33.29]:ID-type=IPV4_ADDR force
C set [rid-131.188.33.29]:Address=131.188.33.29 force
+C add [Phase 2]:Connections=IPsec-131.188.33.51-131.188.33.29
t IPsec-131.188.33.51-131.188.33.29
c IPsec-131.188.33.51-131.188.33.29
diff --git a/regress/sbin/ipsecctl/ike2.ok b/regress/sbin/ipsecctl/ike2.ok
index 8e7b78b2a3a..5da20fa1cba 100644
--- a/regress/sbin/ipsecctl/ike2.ok
+++ b/regress/sbin/ipsecctl/ike2.ok
@@ -1,3 +1,4 @@
+C set [Phase 1]:131.188.33.29=peer-131.188.33.29
C set [peer-131.188.33.29]:Phase=1 force
C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Phase=2 force
@@ -13,5 +14,6 @@ C set [lid-10.1.1.0/24]:Netmask=255.255.255.0 force
C set [rid-10.1.2.0/24]:ID-type=IPV4_ADDR_SUBNET force
C set [rid-10.1.2.0/24]:Network=10.1.2.0 force
C set [rid-10.1.2.0/24]:Netmask=255.255.255.0 force
+C add [Phase 2]:Connections=IPsec-10.1.1.0/24-10.1.2.0/24
t IPsec-10.1.1.0/24-10.1.2.0/24
c IPsec-10.1.1.0/24-10.1.2.0/24
diff --git a/regress/sbin/ipsecctl/ike3.ok b/regress/sbin/ipsecctl/ike3.ok
index 934da8754e9..c770ade57e3 100644
--- a/regress/sbin/ipsecctl/ike3.ok
+++ b/regress/sbin/ipsecctl/ike3.ok
@@ -1,3 +1,4 @@
+C set [Phase 1]:131.188.33.29=peer-131.188.33.29
C set [peer-131.188.33.29]:Phase=1 force
C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [peer-131.188.33.29]:ID=local-ID force
@@ -17,5 +18,6 @@ C set [lid-131.188.33.51]:ID-type=IPV4_ADDR force
C set [lid-131.188.33.51]:Address=131.188.33.51 force
C set [rid-131.188.33.29]:ID-type=IPV4_ADDR force
C set [rid-131.188.33.29]:Address=131.188.33.29 force
+C add [Phase 2]:Connections=IPsec-131.188.33.51-131.188.33.29
t IPsec-131.188.33.51-131.188.33.29
c IPsec-131.188.33.51-131.188.33.29
diff --git a/regress/sbin/ipsecctl/ike4.ok b/regress/sbin/ipsecctl/ike4.ok
index b4a9fb8da43..e92eac29c5e 100644
--- a/regress/sbin/ipsecctl/ike4.ok
+++ b/regress/sbin/ipsecctl/ike4.ok
@@ -1,3 +1,4 @@
+C set [Phase 1]:131.188.33.29=peer-131.188.33.29
C set [peer-131.188.33.29]:Phase=1 force
C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [peer-131.188.33.29]:ID=local-ID force
@@ -19,5 +20,6 @@ C set [lid-10.1.1.0/24]:Netmask=255.255.255.0 force
C set [rid-10.1.2.0/24]:ID-type=IPV4_ADDR_SUBNET force
C set [rid-10.1.2.0/24]:Network=10.1.2.0 force
C set [rid-10.1.2.0/24]:Netmask=255.255.255.0 force
+C add [Phase 2]:Connections=IPsec-10.1.1.0/24-10.1.2.0/24
t IPsec-10.1.1.0/24-10.1.2.0/24
c IPsec-10.1.1.0/24-10.1.2.0/24
diff --git a/regress/sbin/ipsecctl/ike5.ok b/regress/sbin/ipsecctl/ike5.ok
index 4eaef03431b..a326c0bba7d 100644
--- a/regress/sbin/ipsecctl/ike5.ok
+++ b/regress/sbin/ipsecctl/ike5.ok
@@ -1,3 +1,4 @@
+C set [Phase 1]:131.188.33.29=peer-131.188.33.29
C set [peer-131.188.33.29]:Phase=1 force
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
@@ -22,8 +23,10 @@ C set [lid-10.1.1.0/24]:Netmask=255.255.255.0 force
C set [rid-10.1.2.0/24]:ID-type=IPV4_ADDR_SUBNET force
C set [rid-10.1.2.0/24]:Network=10.1.2.0 force
C set [rid-10.1.2.0/24]:Netmask=255.255.255.0 force
+C add [Phase 2]:Connections=IPsec-10.1.1.0/24-10.1.2.0/24
t IPsec-10.1.1.0/24-10.1.2.0/24
c IPsec-10.1.1.0/24-10.1.2.0/24
+C set [Phase 1]:131.188.33.29=peer-131.188.33.29
C set [peer-131.188.33.29]:Phase=1 force
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
@@ -46,5 +49,6 @@ C set [lid-131.188.33.51]:ID-type=IPV4_ADDR force
C set [lid-131.188.33.51]:Address=131.188.33.51 force
C set [rid-131.188.33.29]:ID-type=IPV4_ADDR force
C set [rid-131.188.33.29]:Address=131.188.33.29 force
+C add [Phase 2]:Connections=IPsec-131.188.33.51-131.188.33.29
t IPsec-131.188.33.51-131.188.33.29
c IPsec-131.188.33.51-131.188.33.29
diff --git a/regress/sbin/ipsecctl/ike6.ok b/regress/sbin/ipsecctl/ike6.ok
index 938fa5334b7..d6af14753db 100644
--- a/regress/sbin/ipsecctl/ike6.ok
+++ b/regress/sbin/ipsecctl/ike6.ok
@@ -1,3 +1,4 @@
+C set [Phase 1]:131.188.33.29=peer-131.188.33.29
C set [peer-131.188.33.29]:Phase=1 force
C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [IPsec-10.1.1.0/24-10.1.2.0/24]:Phase=2 force
@@ -13,8 +14,10 @@ C set [lid-10.1.1.0/24]:Netmask=255.255.255.0 force
C set [rid-10.1.2.0/24]:ID-type=IPV4_ADDR_SUBNET force
C set [rid-10.1.2.0/24]:Network=10.1.2.0 force
C set [rid-10.1.2.0/24]:Netmask=255.255.255.0 force
+C add [Phase 2]:Connections=IPsec-10.1.1.0/24-10.1.2.0/24
t IPsec-10.1.1.0/24-10.1.2.0/24
c IPsec-10.1.1.0/24-10.1.2.0/24
+C set [Phase 1]:131.188.33.29=peer-131.188.33.29
C set [peer-131.188.33.29]:Phase=1 force
C set [peer-131.188.33.29]:Address=131.188.33.29 force
C set [IPsec-131.188.33.51-131.188.33.29]:Phase=2 force
@@ -28,5 +31,6 @@ C set [lid-131.188.33.51]:ID-type=IPV4_ADDR force
C set [lid-131.188.33.51]:Address=131.188.33.51 force
C set [rid-131.188.33.29]:ID-type=IPV4_ADDR force
C set [rid-131.188.33.29]:Address=131.188.33.29 force
+C add [Phase 2]:Connections=IPsec-131.188.33.51-131.188.33.29
t IPsec-131.188.33.51-131.188.33.29
c IPsec-131.188.33.51-131.188.33.29
diff --git a/regress/sbin/ipsecctl/ike7.ok b/regress/sbin/ipsecctl/ike7.ok
index c2c19614781..447e31e982a 100644
--- a/regress/sbin/ipsecctl/ike7.ok
+++ b/regress/sbin/ipsecctl/ike7.ok
@@ -1,3 +1,4 @@
+C set [Phase 1]:131.188.33.51=peer-131.188.33.51
C set [peer-131.188.33.51]:Phase=1 force
C set [peer-131.188.33.51]:Address=131.188.33.51 force
C set [IPsec-10.1.2.0/24-10.1.1.0/24]:Phase=2 force
@@ -14,6 +15,7 @@ C set [rid-10.1.1.0/24]:ID-type=IPV4_ADDR_SUBNET force
C set [rid-10.1.1.0/24]:Network=10.1.1.0 force
C set [rid-10.1.1.0/24]:Netmask=255.255.255.0 force
C add [Phase 2]:Passive-Connections=IPsec-10.1.2.0/24-10.1.1.0/24
+C set [Phase 1]:131.188.33.51=peer-131.188.33.51
C set [peer-131.188.33.51]:Phase=1 force
C set [peer-131.188.33.51]:Address=131.188.33.51 force
C set [IPsec-131.188.33.29-131.188.33.51]:Phase=2 force