summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Thomas McBride <mcbride@cvs.openbsd.org>2006-11-01 03:24:22 +0000
committerRyan Thomas McBride <mcbride@cvs.openbsd.org>2006-11-01 03:24:22 +0000
commit4215128eaf88d9fc8ae8feca7b72fb5ad954c065 (patch)
tree156e23ec64b7154947c475686390d7eea9b96529
parent901f9a7ad8984911e36db6daaf51b2249132c968 (diff)
Adjust existing ikedel tests for aggressive mode support (we now
delete both mainmode and aggressive mode phase 1 transforms)
-rw-r--r--regress/sbin/ipsecctl/ikedel1.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel10.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel11.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel12.ok3
-rw-r--r--regress/sbin/ipsecctl/ikedel13.ok3
-rw-r--r--regress/sbin/ipsecctl/ikedel14.ok9
-rw-r--r--regress/sbin/ipsecctl/ikedel15.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel16.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel17.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel18.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel19.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel2.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel20.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel21.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel22.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel23.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel29.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel3.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel30.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel31.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel32.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel33.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel34.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel35.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel36.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel37.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel38.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel39.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel4.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel40.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel41.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel42.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel43.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel46.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel5.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel6.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel7.ok2
-rw-r--r--regress/sbin/ipsecctl/ikedel8.ok1
-rw-r--r--regress/sbin/ipsecctl/ikedel9.ok1
39 files changed, 63 insertions, 0 deletions
diff --git a/regress/sbin/ipsecctl/ikedel1.ok b/regress/sbin/ipsecctl/ikedel1.ok
index 9c563d1d06b..dfc709c6813 100644
--- a/regress/sbin/ipsecctl/ikedel1.ok
+++ b/regress/sbin/ipsecctl/ikedel1.ok
@@ -1,6 +1,7 @@
t IPsec-131.188.33.51-131.188.33.29
C rms [peer-131.188.33.29]
C rms [mm-131.188.33.29]
+C rms [am-131.188.33.29]
C rms [IPsec-131.188.33.51-131.188.33.29]
C rms [qm-131.188.33.51-131.188.33.29]
C rms [lid-131.188.33.51]
diff --git a/regress/sbin/ipsecctl/ikedel10.ok b/regress/sbin/ipsecctl/ikedel10.ok
index 1c5552e0de8..f70ca021c90 100644
--- a/regress/sbin/ipsecctl/ikedel10.ok
+++ b/regress/sbin/ipsecctl/ikedel10.ok
@@ -1,6 +1,7 @@
t IPsec-192.168.100.1-192.168.200.1
C rms [peer-192.168.200.1]
C rms [mm-192.168.200.1]
+C rms [am-192.168.200.1]
C rms [IPsec-192.168.100.1-192.168.200.1]
C rms [qm-192.168.100.1-192.168.200.1]
C rms [lid-192.168.100.1]
diff --git a/regress/sbin/ipsecctl/ikedel11.ok b/regress/sbin/ipsecctl/ikedel11.ok
index 7b171b0cde5..d0aa4d6c4ad 100644
--- a/regress/sbin/ipsecctl/ikedel11.ok
+++ b/regress/sbin/ipsecctl/ikedel11.ok
@@ -1,6 +1,7 @@
t IPsec-1.1.1.1-0.0.0.0/0
C rms [peer-192.168.3.1]
C rms [mm-192.168.3.1]
+C rms [am-192.168.3.1]
C rms [IPsec-1.1.1.1-0.0.0.0/0]
C rms [qm-1.1.1.1-0.0.0.0/0]
C rms [lid-1.1.1.1]
@@ -8,6 +9,7 @@ C rms [rid-0.0.0.0/0]
t IPsec-1.1.1.1-0.0.0.0/0
C rms [peer-192.168.3.1]
C rms [mm-192.168.3.1]
+C rms [am-192.168.3.1]
C rms [IPsec-1.1.1.1-0.0.0.0/0]
C rms [qm-1.1.1.1-0.0.0.0/0]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel12.ok b/regress/sbin/ipsecctl/ikedel12.ok
index 34221ebfaba..586b6d3d5ce 100644
--- a/regress/sbin/ipsecctl/ikedel12.ok
+++ b/regress/sbin/ipsecctl/ikedel12.ok
@@ -2,6 +2,7 @@ TO = "{ 2.2.2.0/24, 3.3.3.0/24, 4.4.4.0/24 }"
t IPsec-1.1.1.1-2.2.2.0/24
C rms [peer-5.5.5.5]
C rms [mm-5.5.5.5]
+C rms [am-5.5.5.5]
C rms [IPsec-1.1.1.1-2.2.2.0/24]
C rms [qm-1.1.1.1-2.2.2.0/24]
C rms [lid-1.1.1.1]
@@ -9,6 +10,7 @@ C rms [rid-2.2.2.0/24]
t IPsec-1.1.1.1-3.3.3.0/24
C rms [peer-5.5.5.5]
C rms [mm-5.5.5.5]
+C rms [am-5.5.5.5]
C rms [IPsec-1.1.1.1-3.3.3.0/24]
C rms [qm-1.1.1.1-3.3.3.0/24]
C rms [lid-1.1.1.1]
@@ -16,6 +18,7 @@ C rms [rid-3.3.3.0/24]
t IPsec-1.1.1.1-4.4.4.0/24
C rms [peer-5.5.5.5]
C rms [mm-5.5.5.5]
+C rms [am-5.5.5.5]
C rms [IPsec-1.1.1.1-4.4.4.0/24]
C rms [qm-1.1.1.1-4.4.4.0/24]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel13.ok b/regress/sbin/ipsecctl/ikedel13.ok
index 8139d6079da..d19081115eb 100644
--- a/regress/sbin/ipsecctl/ikedel13.ok
+++ b/regress/sbin/ipsecctl/ikedel13.ok
@@ -2,6 +2,7 @@ FROM = "{ 2.2.2.0/24, 3.3.3.0/24, 4.4.4.0/24 }"
t IPsec-2.2.2.0/24-1.1.1.1
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-2.2.2.0/24-1.1.1.1]
C rms [qm-2.2.2.0/24-1.1.1.1]
C rms [lid-2.2.2.0/24]
@@ -9,6 +10,7 @@ C rms [rid-1.1.1.1]
t IPsec-3.3.3.0/24-1.1.1.1
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-3.3.3.0/24-1.1.1.1]
C rms [qm-3.3.3.0/24-1.1.1.1]
C rms [lid-3.3.3.0/24]
@@ -16,6 +18,7 @@ C rms [rid-1.1.1.1]
t IPsec-4.4.4.0/24-1.1.1.1
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-4.4.4.0/24-1.1.1.1]
C rms [qm-4.4.4.0/24-1.1.1.1]
C rms [lid-4.4.4.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel14.ok b/regress/sbin/ipsecctl/ikedel14.ok
index d86924c11f8..1b63c6f5aff 100644
--- a/regress/sbin/ipsecctl/ikedel14.ok
+++ b/regress/sbin/ipsecctl/ikedel14.ok
@@ -3,6 +3,7 @@ TO = "{ 5.5.5.0/24, 6.6.6.0/24, 7.7.7.0/24 }"
t IPsec-2.2.2.0/24-5.5.5.0/24
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-2.2.2.0/24-5.5.5.0/24]
C rms [qm-2.2.2.0/24-5.5.5.0/24]
C rms [lid-2.2.2.0/24]
@@ -10,6 +11,7 @@ C rms [rid-5.5.5.0/24]
t IPsec-2.2.2.0/24-6.6.6.0/24
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-2.2.2.0/24-6.6.6.0/24]
C rms [qm-2.2.2.0/24-6.6.6.0/24]
C rms [lid-2.2.2.0/24]
@@ -17,6 +19,7 @@ C rms [rid-6.6.6.0/24]
t IPsec-2.2.2.0/24-7.7.7.0/24
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-2.2.2.0/24-7.7.7.0/24]
C rms [qm-2.2.2.0/24-7.7.7.0/24]
C rms [lid-2.2.2.0/24]
@@ -24,6 +27,7 @@ C rms [rid-7.7.7.0/24]
t IPsec-3.3.3.0/24-5.5.5.0/24
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-3.3.3.0/24-5.5.5.0/24]
C rms [qm-3.3.3.0/24-5.5.5.0/24]
C rms [lid-3.3.3.0/24]
@@ -31,6 +35,7 @@ C rms [rid-5.5.5.0/24]
t IPsec-3.3.3.0/24-6.6.6.0/24
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-3.3.3.0/24-6.6.6.0/24]
C rms [qm-3.3.3.0/24-6.6.6.0/24]
C rms [lid-3.3.3.0/24]
@@ -38,6 +43,7 @@ C rms [rid-6.6.6.0/24]
t IPsec-3.3.3.0/24-7.7.7.0/24
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-3.3.3.0/24-7.7.7.0/24]
C rms [qm-3.3.3.0/24-7.7.7.0/24]
C rms [lid-3.3.3.0/24]
@@ -45,6 +51,7 @@ C rms [rid-7.7.7.0/24]
t IPsec-4.4.4.0/24-5.5.5.0/24
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-4.4.4.0/24-5.5.5.0/24]
C rms [qm-4.4.4.0/24-5.5.5.0/24]
C rms [lid-4.4.4.0/24]
@@ -52,6 +59,7 @@ C rms [rid-5.5.5.0/24]
t IPsec-4.4.4.0/24-6.6.6.0/24
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-4.4.4.0/24-6.6.6.0/24]
C rms [qm-4.4.4.0/24-6.6.6.0/24]
C rms [lid-4.4.4.0/24]
@@ -59,6 +67,7 @@ C rms [rid-6.6.6.0/24]
t IPsec-4.4.4.0/24-7.7.7.0/24
C rms [peer-1.1.1.1]
C rms [mm-1.1.1.1]
+C rms [am-1.1.1.1]
C rms [IPsec-4.4.4.0/24-7.7.7.0/24]
C rms [qm-4.4.4.0/24-7.7.7.0/24]
C rms [lid-4.4.4.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel15.ok b/regress/sbin/ipsecctl/ikedel15.ok
index 41334b72ac4..4855cbba7f6 100644
--- a/regress/sbin/ipsecctl/ikedel15.ok
+++ b/regress/sbin/ipsecctl/ikedel15.ok
@@ -1,6 +1,7 @@
t IPsec-10.1.1.0/24-10.1.2.0/24
C rms [peer-3ffe::1]
C rms [mm-3ffe::1]
+C rms [am-3ffe::1]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel16.ok b/regress/sbin/ipsecctl/ikedel16.ok
index 7b2d61194fb..1481ad435ad 100644
--- a/regress/sbin/ipsecctl/ikedel16.ok
+++ b/regress/sbin/ipsecctl/ikedel16.ok
@@ -1,6 +1,7 @@
t IPsec-10.1.1.0/24-10.1.2.0/24
C rms [peer-3ffe::29]
C rms [mm-3ffe::29]
+C rms [am-3ffe::29]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
@@ -10,6 +11,7 @@ C rms [rid-10.1.2.0/24]
t IPsec-3ffe::51-3ffe::29
C rms [peer-3ffe::29]
C rms [mm-3ffe::29]
+C rms [am-3ffe::29]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-3ffe::51-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel17.ok b/regress/sbin/ipsecctl/ikedel17.ok
index cb429046f70..630c6d512c4 100644
--- a/regress/sbin/ipsecctl/ikedel17.ok
+++ b/regress/sbin/ipsecctl/ikedel17.ok
@@ -1,6 +1,7 @@
t IPsec-10.1.1.0/24-10.1.2.0/24
C rms [peer-3ffe::29]
C rms [mm-3ffe::29]
+C rms [am-3ffe::29]
C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
C rms [qm-10.1.1.0/24-10.1.2.0/24]
C rms [lid-10.1.1.0/24]
@@ -8,6 +9,7 @@ C rms [rid-10.1.2.0/24]
t IPsec-3ffe::51-3ffe::29
C rms [peer-3ffe::29]
C rms [mm-3ffe::29]
+C rms [am-3ffe::29]
C rms [IPsec-3ffe::51-3ffe::29]
C rms [qm-3ffe::51-3ffe::29]
C rms [lid-3ffe::51]
diff --git a/regress/sbin/ipsecctl/ikedel18.ok b/regress/sbin/ipsecctl/ikedel18.ok
index 7b818e66e06..1b21469ae55 100644
--- a/regress/sbin/ipsecctl/ikedel18.ok
+++ b/regress/sbin/ipsecctl/ikedel18.ok
@@ -2,6 +2,7 @@ C rms [Phase 2]
t IPsec-10.1.2.0/24-10.1.1.0/24
C rms [peer-3ffe::51]
C rms [mm-3ffe::51]
+C rms [am-3ffe::51]
C rms [IPsec-10.1.2.0/24-10.1.1.0/24]
C rms [qm-10.1.2.0/24-10.1.1.0/24]
C rms [lid-10.1.2.0/24]
@@ -10,6 +11,7 @@ C rms [Phase 2]
t IPsec-3ffe::29-3ffe::51
C rms [peer-3ffe::51]
C rms [mm-3ffe::51]
+C rms [am-3ffe::51]
C rms [IPsec-3ffe::29-3ffe::51]
C rms [qm-3ffe::29-3ffe::51]
C rms [lid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel19.ok b/regress/sbin/ipsecctl/ikedel19.ok
index 83b157082d7..f692e9aaba8 100644
--- a/regress/sbin/ipsecctl/ikedel19.ok
+++ b/regress/sbin/ipsecctl/ikedel19.ok
@@ -1,6 +1,7 @@
t IPsec-1.1.1.1-0.0.0.0/0
C rms [peer-3ffe::1]
C rms [mm-3ffe::1]
+C rms [am-3ffe::1]
C rms [IPsec-1.1.1.1-0.0.0.0/0]
C rms [qm-1.1.1.1-0.0.0.0/0]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel2.ok b/regress/sbin/ipsecctl/ikedel2.ok
index 7db72bb9cbf..a49f502e0ab 100644
--- a/regress/sbin/ipsecctl/ikedel2.ok
+++ b/regress/sbin/ipsecctl/ikedel2.ok
@@ -1,6 +1,7 @@
t IPsec-10.1.1.0/24-10.1.2.0/24
C rms [peer-131.188.33.29]
C rms [mm-131.188.33.29]
+C rms [am-131.188.33.29]
C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
C rms [qm-10.1.1.0/24-10.1.2.0/24]
C rms [lid-10.1.1.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel20.ok b/regress/sbin/ipsecctl/ikedel20.ok
index 7b171b0cde5..d0aa4d6c4ad 100644
--- a/regress/sbin/ipsecctl/ikedel20.ok
+++ b/regress/sbin/ipsecctl/ikedel20.ok
@@ -1,6 +1,7 @@
t IPsec-1.1.1.1-0.0.0.0/0
C rms [peer-192.168.3.1]
C rms [mm-192.168.3.1]
+C rms [am-192.168.3.1]
C rms [IPsec-1.1.1.1-0.0.0.0/0]
C rms [qm-1.1.1.1-0.0.0.0/0]
C rms [lid-1.1.1.1]
@@ -8,6 +9,7 @@ C rms [rid-0.0.0.0/0]
t IPsec-1.1.1.1-0.0.0.0/0
C rms [peer-192.168.3.1]
C rms [mm-192.168.3.1]
+C rms [am-192.168.3.1]
C rms [IPsec-1.1.1.1-0.0.0.0/0]
C rms [qm-1.1.1.1-0.0.0.0/0]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel21.ok b/regress/sbin/ipsecctl/ikedel21.ok
index fff3ef9c934..f2b18e592cd 100644
--- a/regress/sbin/ipsecctl/ikedel21.ok
+++ b/regress/sbin/ipsecctl/ikedel21.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe::1-3ffe::2
C rms [peer-3ffe::2]
C rms [mm-3ffe::2]
+C rms [am-3ffe::2]
C rms [IPsec-3ffe::1-3ffe::2]
C rms [qm-3ffe::1-3ffe::2]
C rms [lid-3ffe::1]
diff --git a/regress/sbin/ipsecctl/ikedel22.ok b/regress/sbin/ipsecctl/ikedel22.ok
index ad25345287c..4a3ff0aa29a 100644
--- a/regress/sbin/ipsecctl/ikedel22.ok
+++ b/regress/sbin/ipsecctl/ikedel22.ok
@@ -1,6 +1,7 @@
t IPsec-10.1.1.0/24-10.1.2.0/24
C rms [peer-3ffe::1]
C rms [mm-3ffe::1]
+C rms [am-3ffe::1]
C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
C rms [qm-10.1.1.0/24-10.1.2.0/24]
C rms [lid-10.1.1.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel23.ok b/regress/sbin/ipsecctl/ikedel23.ok
index 6e62d58f1e5..108c5f0fbb7 100644
--- a/regress/sbin/ipsecctl/ikedel23.ok
+++ b/regress/sbin/ipsecctl/ikedel23.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe::51-3ffe::29
C rms [peer-3ffe::29]
C rms [mm-3ffe::29]
+C rms [am-3ffe::29]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-3ffe::51-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel29.ok b/regress/sbin/ipsecctl/ikedel29.ok
index 1c640c2b207..2cc46912226 100644
--- a/regress/sbin/ipsecctl/ikedel29.ok
+++ b/regress/sbin/ipsecctl/ikedel29.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe:3::/64-3ffe:4::/64
C rms [peer-3ffe:2::1]
C rms [mm-3ffe:2::1]
+C rms [am-3ffe:2::1]
C rms [noname.my.domain-ID]
C rms [IPsec-3ffe:3::/64-3ffe:4::/64]
C rms [qm-3ffe:3::/64-3ffe:4::/64]
diff --git a/regress/sbin/ipsecctl/ikedel3.ok b/regress/sbin/ipsecctl/ikedel3.ok
index 8a49706958b..f058cc60663 100644
--- a/regress/sbin/ipsecctl/ikedel3.ok
+++ b/regress/sbin/ipsecctl/ikedel3.ok
@@ -1,6 +1,7 @@
t IPsec-131.188.33.51-131.188.33.29
C rms [peer-131.188.33.29]
C rms [mm-131.188.33.29]
+C rms [am-131.188.33.29]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-131.188.33.51-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel30.ok b/regress/sbin/ipsecctl/ikedel30.ok
index fff3ef9c934..f2b18e592cd 100644
--- a/regress/sbin/ipsecctl/ikedel30.ok
+++ b/regress/sbin/ipsecctl/ikedel30.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe::1-3ffe::2
C rms [peer-3ffe::2]
C rms [mm-3ffe::2]
+C rms [am-3ffe::2]
C rms [IPsec-3ffe::1-3ffe::2]
C rms [qm-3ffe::1-3ffe::2]
C rms [lid-3ffe::1]
diff --git a/regress/sbin/ipsecctl/ikedel31.ok b/regress/sbin/ipsecctl/ikedel31.ok
index 7ad0ed05d0f..54febfd135b 100644
--- a/regress/sbin/ipsecctl/ikedel31.ok
+++ b/regress/sbin/ipsecctl/ikedel31.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe:2::1-::/0
C rms [peer-3ffe::1]
C rms [mm-3ffe::1]
+C rms [am-3ffe::1]
C rms [IPsec-3ffe:2::1-::/0]
C rms [qm-3ffe:2::1-::/0]
C rms [lid-3ffe:2::1]
diff --git a/regress/sbin/ipsecctl/ikedel32.ok b/regress/sbin/ipsecctl/ikedel32.ok
index 9c2f40e30db..ed6d2bd0c25 100644
--- a/regress/sbin/ipsecctl/ikedel32.ok
+++ b/regress/sbin/ipsecctl/ikedel32.ok
@@ -1,6 +1,7 @@
t IPsec-1.1.1.1-2.2.2.2
C rms [peer-2.2.2.2]
C rms [mm-2.2.2.2]
+C rms [am-2.2.2.2]
C rms [IPsec-1.1.1.1-2.2.2.2]
C rms [qm-1.1.1.1-2.2.2.2]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel33.ok b/regress/sbin/ipsecctl/ikedel33.ok
index 9c2f40e30db..ed6d2bd0c25 100644
--- a/regress/sbin/ipsecctl/ikedel33.ok
+++ b/regress/sbin/ipsecctl/ikedel33.ok
@@ -1,6 +1,7 @@
t IPsec-1.1.1.1-2.2.2.2
C rms [peer-2.2.2.2]
C rms [mm-2.2.2.2]
+C rms [am-2.2.2.2]
C rms [IPsec-1.1.1.1-2.2.2.2]
C rms [qm-1.1.1.1-2.2.2.2]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel34.ok b/regress/sbin/ipsecctl/ikedel34.ok
index c5ed8accc79..9754bd5de23 100644
--- a/regress/sbin/ipsecctl/ikedel34.ok
+++ b/regress/sbin/ipsecctl/ikedel34.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe::1/24-3ffe:2::/24
C rms [peer-1.2.3.4]
C rms [mm-1.2.3.4]
+C rms [am-1.2.3.4]
C rms [IPsec-3ffe::1/24-3ffe:2::/24]
C rms [qm-3ffe::1/24-3ffe:2::/24]
C rms [lid-3ffe::1/24]
diff --git a/regress/sbin/ipsecctl/ikedel35.ok b/regress/sbin/ipsecctl/ikedel35.ok
index e4c88c14fe0..cf816a92bef 100644
--- a/regress/sbin/ipsecctl/ikedel35.ok
+++ b/regress/sbin/ipsecctl/ikedel35.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe:2::/24-3ffe::1/24
C rms [peer-1.2.3.4]
C rms [mm-1.2.3.4]
+C rms [am-1.2.3.4]
C rms [IPsec-3ffe:2::/24-3ffe::1/24]
C rms [qm-3ffe:2::/24-3ffe::1/24]
C rms [lid-3ffe:2::/24]
diff --git a/regress/sbin/ipsecctl/ikedel36.ok b/regress/sbin/ipsecctl/ikedel36.ok
index 41df3c59536..83fb0c3d68b 100644
--- a/regress/sbin/ipsecctl/ikedel36.ok
+++ b/regress/sbin/ipsecctl/ikedel36.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe::3-3ffe::4
C rms [peer-3ffe::1]
C rms [mm-3ffe::1]
+C rms [am-3ffe::1]
C rms [IPsec-3ffe::3-3ffe::4]
C rms [qm-3ffe::3-3ffe::4]
C rms [lid-3ffe::3]
diff --git a/regress/sbin/ipsecctl/ikedel37.ok b/regress/sbin/ipsecctl/ikedel37.ok
index 3545ec0ab13..1a7798ff7fa 100644
--- a/regress/sbin/ipsecctl/ikedel37.ok
+++ b/regress/sbin/ipsecctl/ikedel37.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe:1::/64-3ffe:2::/64
C rms [peer-3ffe::1]
C rms [mm-3ffe::1]
+C rms [am-3ffe::1]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-3ffe:1::/64-3ffe:2::/64]
diff --git a/regress/sbin/ipsecctl/ikedel38.ok b/regress/sbin/ipsecctl/ikedel38.ok
index 16b242ee629..f9248a55c92 100644
--- a/regress/sbin/ipsecctl/ikedel38.ok
+++ b/regress/sbin/ipsecctl/ikedel38.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe:1::/64-3ffe:2::/64
C rms [peer-3ffe::29]
C rms [mm-3ffe::29]
+C rms [am-3ffe::29]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-3ffe:1::/64-3ffe:2::/64]
@@ -10,6 +11,7 @@ C rms [rid-3ffe:2::/64]
t IPsec-3ffe::51-3ffe::29
C rms [peer-3ffe::29]
C rms [mm-3ffe::29]
+C rms [am-3ffe::29]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-3ffe::51-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel39.ok b/regress/sbin/ipsecctl/ikedel39.ok
index 60d5679d6d7..79a21ac571c 100644
--- a/regress/sbin/ipsecctl/ikedel39.ok
+++ b/regress/sbin/ipsecctl/ikedel39.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe:1::/64-3ffe:2::/64
C rms [peer-3ffe::29]
C rms [mm-3ffe::29]
+C rms [am-3ffe::29]
C rms [IPsec-3ffe:1::/64-3ffe:2::/64]
C rms [qm-3ffe:1::/64-3ffe:2::/64]
C rms [lid-3ffe:1::/64]
@@ -8,6 +9,7 @@ C rms [rid-3ffe:2::/64]
t IPsec-3ffe::51-3ffe::29
C rms [peer-3ffe::29]
C rms [mm-3ffe::29]
+C rms [am-3ffe::29]
C rms [IPsec-3ffe::51-3ffe::29]
C rms [qm-3ffe::51-3ffe::29]
C rms [lid-3ffe::51]
diff --git a/regress/sbin/ipsecctl/ikedel4.ok b/regress/sbin/ipsecctl/ikedel4.ok
index 1f6610b5cc5..93a4c2127b8 100644
--- a/regress/sbin/ipsecctl/ikedel4.ok
+++ b/regress/sbin/ipsecctl/ikedel4.ok
@@ -1,6 +1,7 @@
t IPsec-10.1.1.0/24-10.1.2.0/24
C rms [peer-131.188.33.29]
C rms [mm-131.188.33.29]
+C rms [am-131.188.33.29]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel40.ok b/regress/sbin/ipsecctl/ikedel40.ok
index 1ede2ebfe25..dd123d75240 100644
--- a/regress/sbin/ipsecctl/ikedel40.ok
+++ b/regress/sbin/ipsecctl/ikedel40.ok
@@ -2,6 +2,7 @@ C rms [Phase 2]
t IPsec-3ffe:1::/64-3ffe:2::/64
C rms [peer-3ffe::51]
C rms [mm-3ffe::51]
+C rms [am-3ffe::51]
C rms [IPsec-3ffe:1::/64-3ffe:2::/64]
C rms [qm-3ffe:1::/64-3ffe:2::/64]
C rms [lid-3ffe:1::/64]
@@ -10,6 +11,7 @@ C rms [Phase 2]
t IPsec-3ffe::29-3ffe::51
C rms [peer-3ffe::51]
C rms [mm-3ffe::51]
+C rms [am-3ffe::51]
C rms [IPsec-3ffe::29-3ffe::51]
C rms [qm-3ffe::29-3ffe::51]
C rms [lid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel41.ok b/regress/sbin/ipsecctl/ikedel41.ok
index 9c2f40e30db..ed6d2bd0c25 100644
--- a/regress/sbin/ipsecctl/ikedel41.ok
+++ b/regress/sbin/ipsecctl/ikedel41.ok
@@ -1,6 +1,7 @@
t IPsec-1.1.1.1-2.2.2.2
C rms [peer-2.2.2.2]
C rms [mm-2.2.2.2]
+C rms [am-2.2.2.2]
C rms [IPsec-1.1.1.1-2.2.2.2]
C rms [qm-1.1.1.1-2.2.2.2]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel42.ok b/regress/sbin/ipsecctl/ikedel42.ok
index 9c2f40e30db..ed6d2bd0c25 100644
--- a/regress/sbin/ipsecctl/ikedel42.ok
+++ b/regress/sbin/ipsecctl/ikedel42.ok
@@ -1,6 +1,7 @@
t IPsec-1.1.1.1-2.2.2.2
C rms [peer-2.2.2.2]
C rms [mm-2.2.2.2]
+C rms [am-2.2.2.2]
C rms [IPsec-1.1.1.1-2.2.2.2]
C rms [qm-1.1.1.1-2.2.2.2]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel43.ok b/regress/sbin/ipsecctl/ikedel43.ok
index fff3ef9c934..f2b18e592cd 100644
--- a/regress/sbin/ipsecctl/ikedel43.ok
+++ b/regress/sbin/ipsecctl/ikedel43.ok
@@ -1,6 +1,7 @@
t IPsec-3ffe::1-3ffe::2
C rms [peer-3ffe::2]
C rms [mm-3ffe::2]
+C rms [am-3ffe::2]
C rms [IPsec-3ffe::1-3ffe::2]
C rms [qm-3ffe::1-3ffe::2]
C rms [lid-3ffe::1]
diff --git a/regress/sbin/ipsecctl/ikedel46.ok b/regress/sbin/ipsecctl/ikedel46.ok
index 9df06014101..4c998523868 100644
--- a/regress/sbin/ipsecctl/ikedel46.ok
+++ b/regress/sbin/ipsecctl/ikedel46.ok
@@ -1,6 +1,7 @@
t IPsec-1.1.1.1-2.2.2.2
C rms [peer-2.2.2.2]
C rms [mm-2.2.2.2]
+C rms [am-2.2.2.2]
C rms [IPsec-1.1.1.1-2.2.2.2]
C rms [qm-1.1.1.1-2.2.2.2]
C rms [lid-1.1.1.1]
@@ -8,6 +9,7 @@ C rms [rid-2.2.2.2]
t IPsec-1.1.1.1-2.2.2.2
C rms [peer-2.2.2.2]
C rms [mm-2.2.2.2]
+C rms [am-2.2.2.2]
C rms [IPsec-1.1.1.1-2.2.2.2]
C rms [qm-1.1.1.1-2.2.2.2]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel5.ok b/regress/sbin/ipsecctl/ikedel5.ok
index eb53ce05b98..99ce28b1c77 100644
--- a/regress/sbin/ipsecctl/ikedel5.ok
+++ b/regress/sbin/ipsecctl/ikedel5.ok
@@ -1,6 +1,7 @@
t IPsec-10.1.1.0/24-10.1.2.0/24
C rms [peer-131.188.33.29]
C rms [mm-131.188.33.29]
+C rms [am-131.188.33.29]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
@@ -10,6 +11,7 @@ C rms [rid-10.1.2.0/24]
t IPsec-131.188.33.51-131.188.33.29
C rms [peer-131.188.33.29]
C rms [mm-131.188.33.29]
+C rms [am-131.188.33.29]
C rms [sharleena.as10.net-ID]
C rms [faui31o.informatik.uni-erlangen.de-ID]
C rms [IPsec-131.188.33.51-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel6.ok b/regress/sbin/ipsecctl/ikedel6.ok
index 445629901f8..36ab0e1cf65 100644
--- a/regress/sbin/ipsecctl/ikedel6.ok
+++ b/regress/sbin/ipsecctl/ikedel6.ok
@@ -1,6 +1,7 @@
t IPsec-10.1.1.0/24-10.1.2.0/24
C rms [peer-131.188.33.29]
C rms [mm-131.188.33.29]
+C rms [am-131.188.33.29]
C rms [IPsec-10.1.1.0/24-10.1.2.0/24]
C rms [qm-10.1.1.0/24-10.1.2.0/24]
C rms [lid-10.1.1.0/24]
@@ -8,6 +9,7 @@ C rms [rid-10.1.2.0/24]
t IPsec-131.188.33.51-131.188.33.29
C rms [peer-131.188.33.29]
C rms [mm-131.188.33.29]
+C rms [am-131.188.33.29]
C rms [IPsec-131.188.33.51-131.188.33.29]
C rms [qm-131.188.33.51-131.188.33.29]
C rms [lid-131.188.33.51]
diff --git a/regress/sbin/ipsecctl/ikedel7.ok b/regress/sbin/ipsecctl/ikedel7.ok
index bf4e30d7953..20c5da44aff 100644
--- a/regress/sbin/ipsecctl/ikedel7.ok
+++ b/regress/sbin/ipsecctl/ikedel7.ok
@@ -2,6 +2,7 @@ C rms [Phase 2]
t IPsec-10.1.2.0/24-10.1.1.0/24
C rms [peer-131.188.33.51]
C rms [mm-131.188.33.51]
+C rms [am-131.188.33.51]
C rms [IPsec-10.1.2.0/24-10.1.1.0/24]
C rms [qm-10.1.2.0/24-10.1.1.0/24]
C rms [lid-10.1.2.0/24]
@@ -10,6 +11,7 @@ C rms [Phase 2]
t IPsec-131.188.33.29-131.188.33.51
C rms [peer-131.188.33.51]
C rms [mm-131.188.33.51]
+C rms [am-131.188.33.51]
C rms [IPsec-131.188.33.29-131.188.33.51]
C rms [qm-131.188.33.29-131.188.33.51]
C rms [lid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel8.ok b/regress/sbin/ipsecctl/ikedel8.ok
index dbecdf7fb19..45061394f20 100644
--- a/regress/sbin/ipsecctl/ikedel8.ok
+++ b/regress/sbin/ipsecctl/ikedel8.ok
@@ -1,6 +1,7 @@
t IPsec-1.1.1.1-0.0.0.0/0
C rms [peer-192.168.3.1]
C rms [mm-192.168.3.1]
+C rms [am-192.168.3.1]
C rms [IPsec-1.1.1.1-0.0.0.0/0]
C rms [qm-1.1.1.1-0.0.0.0/0]
C rms [lid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel9.ok b/regress/sbin/ipsecctl/ikedel9.ok
index 94648e08607..2bdfa9fe873 100644
--- a/regress/sbin/ipsecctl/ikedel9.ok
+++ b/regress/sbin/ipsecctl/ikedel9.ok
@@ -1,6 +1,7 @@
t IPsec-3.3.3.0/24-4.4.4.0/24
C rms [peer-2.2.2.2]
C rms [mm-2.2.2.2]
+C rms [am-2.2.2.2]
C rms [noname.my.domain-ID]
C rms [IPsec-3.3.3.0/24-4.4.4.0/24]
C rms [qm-3.3.3.0/24-4.4.4.0/24]