Add a bunch of test for deletion of ike rules, add a test for "to

any" rules without a peer specified.  These tests resulted in the
recent fix in ipsecctl/ike.c.

87 files changed, 641 insertions, 2 deletions

diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index 32dc9f1089a..23398b546d5 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.33 2006/06/15 11:05:58 hshoexer Exp $
+# $OpenBSD: Makefile,v 1.34 2006/06/15 17:03:21 hshoexer Exp $
 
 # TARGETS
 # ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -18,7 +18,12 @@ IKEFAIL=1 3 4 5
 IKETESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
 IKETESTS+=16 17 18 19 20 21 22 23
 IKETESTS+=29 30 31 32 33 34 35 36 37 38 39 40
-IKETESTS+=41 42 43 46
+IKETESTS+=41 42 43 46 47
+
+IKEDELTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
+IKEDELTESTS+=16 17 18 19 20 21 22 23
+IKEDELTESTS+=29 30 31 32 33 34 35 36 37 38 39 40
+IKEDELTESTS+=41 42 43 46 47
 
 SHELL=/bin/sh
 
@@ -80,6 +85,14 @@ ikefail${n}:
 	    ipsecctl -nv -f - 2>&1 | diff -u ${.CURDIR}/ikefail${n}.ok /dev/stdin
 .endfor
 
+.for n in ${IKEDELTESTS}
+IKEDEL_TARGETS+=ikedel${n}
+
+ikedel${n}:
+	cat ${.CURDIR}/ikedel${n}.in | sed -e 's,DIR,${.CURDIR},g' | \
+	    ipsecctl -dnv -f - | diff -u ${.CURDIR}/ikedel${n}.ok /dev/stdin
+.endfor
+
 ipsec:		${IPSEC_TARGETS}
 REGRESS_TARGETS+=ipsec
 
@@ -101,6 +114,9 @@ REGRESS_TARGETS+=ike
 ikefail:	${IKEFAIL_TARGETS}
 REGRESS_TARGETS+=ikefail
 
+ikedel:		${IKEDEL_TARGETS}
+REGRESS_TARGETS+=ikedel
+
 alltests: ${REGRESS_TARGETS}
 
 .PHONY: ${REGRESS_TARGETS}
diff --git a/regress/sbin/ipsecctl/ike47.in b/regress/sbin/ipsecctl/ike47.in
new file mode 100644
index 00000000000..6d12bf6a97c
--- /dev/null
+++ b/regress/sbin/ipsecctl/ike47.in
@@ -0,0 +1 @@
+ike from any to any
diff --git a/regress/sbin/ipsecctl/ike47.ok b/regress/sbin/ipsecctl/ike47.ok
new file mode 100644
index 00000000000..f1c5ed825ca
--- /dev/null
+++ b/regress/sbin/ipsecctl/ike47.ok
@@ -0,0 +1,38 @@
+C set [Phase 1]:Default=peer-default force
+C set [peer-default]:Phase=1 force
+C set [peer-default]:Configuration=mm-default
+C set [mm-default]:EXCHANGE_TYPE=ID_PROT force
+C add [mm-default]:Transforms=AES-SHA-RSA_SIG force
+C set [IPsec-0.0.0.0/0-0.0.0.0/0]:Phase=2 force
+C set [IPsec-0.0.0.0/0-0.0.0.0/0]:ISAKMP-peer=peer-default force
+C set [IPsec-0.0.0.0/0-0.0.0.0/0]:Configuration=qm-0.0.0.0/0-0.0.0.0/0 force
+C set [IPsec-0.0.0.0/0-0.0.0.0/0]:Local-ID=lid-0.0.0.0/0 force
+C set [IPsec-0.0.0.0/0-0.0.0.0/0]:Remote-ID=rid-0.0.0.0/0 force
+C set [qm-0.0.0.0/0-0.0.0.0/0]:EXCHANGE_TYPE=QUICK_MODE force
+C set [qm-0.0.0.0/0-0.0.0.0/0]:Suites=QM-ESP-AES-SHA2-256-SUITE force
+C set [lid-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force
+C set [lid-0.0.0.0/0]:Network=0.0.0.0 force
+C set [lid-0.0.0.0/0]:Netmask=0.0.0.0 force
+C set [rid-0.0.0.0/0]:ID-type=IPV4_ADDR_SUBNET force
+C set [rid-0.0.0.0/0]:Network=0.0.0.0 force
+C set [rid-0.0.0.0/0]:Netmask=0.0.0.0 force
+C add [Phase 2]:Connections=IPsec-0.0.0.0/0-0.0.0.0/0
+C set [Phase 1]:Default=peer-default force
+C set [peer-default]:Phase=1 force
+C set [peer-default]:Configuration=mm-default
+C set [mm-default]:EXCHANGE_TYPE=ID_PROT force
+C add [mm-default]:Transforms=AES-SHA-RSA_SIG force
+C set [IPsec-::/0-::/0]:Phase=2 force
+C set [IPsec-::/0-::/0]:ISAKMP-peer=peer-default force
+C set [IPsec-::/0-::/0]:Configuration=qm-::/0-::/0 force
+C set [IPsec-::/0-::/0]:Local-ID=lid-::/0 force
+C set [IPsec-::/0-::/0]:Remote-ID=rid-::/0 force
+C set [qm-::/0-::/0]:EXCHANGE_TYPE=QUICK_MODE force
+C set [qm-::/0-::/0]:Suites=QM-ESP-AES-SHA2-256-SUITE force
+C set [lid-::/0]:ID-type=IPV6_ADDR_SUBNET force
+C set [lid-::/0]:Network=:: force
+C set [lid-::/0]:Netmask=:: force
+C set [rid-::/0]:ID-type=IPV6_ADDR_SUBNET force
+C set [rid-::/0]:Network=:: force
+C set [rid-::/0]:Netmask=:: force
+C add [Phase 2]:Connections=IPsec-::/0-::/0
diff --git a/regress/sbin/ipsecctl/ikedel1.in b/regress/sbin/ipsecctl/ikedel1.in
new file mode 100644
index 00000000000..c627e0e9f7d
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel1.in
@@ -0,0 +1 @@
+ike from 131.188.33.51 to 131.188.33.29
diff --git a/regress/sbin/ipsecctl/ikedel1.ok b/regress/sbin/ipsecctl/ikedel1.ok
new file mode 100644
index 00000000000..9c563d1d06b
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel1.ok
@@ -0,0 +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 [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]
+C rms [rid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel10.in b/regress/sbin/ipsecctl/ikedel10.in
new file mode 100644
index 00000000000..39783d0fb40
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel10.in
@@ -0,0 +1 @@
+ike esp proto etherip from 192.168.100.1 to 192.168.200.1
diff --git a/regress/sbin/ipsecctl/ikedel10.ok b/regress/sbin/ipsecctl/ikedel10.ok
new file mode 100644
index 00000000000..1c5552e0de8
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel10.ok
@@ -0,0 +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 [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]
+C rms [rid-192.168.200.1]
diff --git a/regress/sbin/ipsecctl/ikedel11.in b/regress/sbin/ipsecctl/ikedel11.in
new file mode 100644
index 00000000000..c7f1d04ad70
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel11.in
@@ -0,0 +1,2 @@
+ike from 1.1.1.1 to any local 192.168.3.2 peer 192.168.3.1
+ike from 1.1.1.1 to any peer 192.168.3.1 local 192.168.3.2
diff --git a/regress/sbin/ipsecctl/ikedel11.ok b/regress/sbin/ipsecctl/ikedel11.ok
new file mode 100644
index 00000000000..7b171b0cde5
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel11.ok
@@ -0,0 +1,14 @@
+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 [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]
+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 [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]
+C rms [rid-0.0.0.0/0]
diff --git a/regress/sbin/ipsecctl/ikedel12.in b/regress/sbin/ipsecctl/ikedel12.in
new file mode 100644
index 00000000000..b85bd6ee275
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel12.in
@@ -0,0 +1,2 @@
+TO="{ 2.2.2.0/24, 3.3.3.0/24, 4.4.4.0/24 }"
+ike from 1.1.1.1 to $TO peer 5.5.5.5
diff --git a/regress/sbin/ipsecctl/ikedel12.ok b/regress/sbin/ipsecctl/ikedel12.ok
new file mode 100644
index 00000000000..34221ebfaba
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel12.ok
@@ -0,0 +1,22 @@
+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 [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]
+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 [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]
+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 [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]
+C rms [rid-4.4.4.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel13.in b/regress/sbin/ipsecctl/ikedel13.in
new file mode 100644
index 00000000000..b3aaf8b4b7b
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel13.in
@@ -0,0 +1,2 @@
+FROM="{ 2.2.2.0/24, 3.3.3.0/24, 4.4.4.0/24 }"
+ike from $FROM to 1.1.1.1
diff --git a/regress/sbin/ipsecctl/ikedel13.ok b/regress/sbin/ipsecctl/ikedel13.ok
new file mode 100644
index 00000000000..8139d6079da
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel13.ok
@@ -0,0 +1,22 @@
+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 [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]
+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 [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]
+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 [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]
+C rms [rid-1.1.1.1]
diff --git a/regress/sbin/ipsecctl/ikedel14.in b/regress/sbin/ipsecctl/ikedel14.in
new file mode 100644
index 00000000000..9758b21717d
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel14.in
@@ -0,0 +1,3 @@
+FROM="{ 2.2.2.0/24, 3.3.3.0/24, 4.4.4.0/24 }"
+TO="{ 5.5.5.0/24, 6.6.6.0/24, 7.7.7.0/24 }"
+ike from $FROM to $TO peer 1.1.1.1
diff --git a/regress/sbin/ipsecctl/ikedel14.ok b/regress/sbin/ipsecctl/ikedel14.ok
new file mode 100644
index 00000000000..d86924c11f8
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel14.ok
@@ -0,0 +1,65 @@
+FROM = "{ 2.2.2.0/24, 3.3.3.0/24, 4.4.4.0/24 }"
+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 [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]
+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 [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]
+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 [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]
+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 [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]
+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 [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]
+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 [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]
+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 [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]
+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 [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]
+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 [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]
+C rms [rid-7.7.7.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel15.in b/regress/sbin/ipsecctl/ikedel15.in
new file mode 100644
index 00000000000..4470dc3b316
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel15.in
@@ -0,0 +1,2 @@
+ike from 10.1.1.0/24 to 10.1.2.0/24 peer 3ffe::1 \
+	srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
diff --git a/regress/sbin/ipsecctl/ikedel15.ok b/regress/sbin/ipsecctl/ikedel15.ok
new file mode 100644
index 00000000000..41334b72ac4
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel15.ok
@@ -0,0 +1,9 @@
+t IPsec-10.1.1.0/24-10.1.2.0/24
+C rms [peer-3ffe::1]
+C rms [mm-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]
+C rms [qm-10.1.1.0/24-10.1.2.0/24]
+C rms [lid-10.1.1.0/24]
+C rms [rid-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel16.in b/regress/sbin/ipsecctl/ikedel16.in
new file mode 100644
index 00000000000..bd4e41639f8
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel16.in
@@ -0,0 +1,8 @@
+ike esp from 10.1.1.0/24 to 10.1.2.0/24 peer 3ffe::29 \
+	main auth hmac-sha1 enc 3des group modp3072 \
+	quick auth hmac-sha1 enc 3des group modp3072 \
+	srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
+ike esp from 3ffe::51 to 3ffe::29 \
+	main auth hmac-sha1 enc aes group modp3072 \
+	quick auth hmac-sha2-256 enc aes group modp3072 \
+	srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
diff --git a/regress/sbin/ipsecctl/ikedel16.ok b/regress/sbin/ipsecctl/ikedel16.ok
new file mode 100644
index 00000000000..7b2d61194fb
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel16.ok
@@ -0,0 +1,18 @@
+t IPsec-10.1.1.0/24-10.1.2.0/24
+C rms [peer-3ffe::29]
+C rms [mm-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]
+C rms [qm-10.1.1.0/24-10.1.2.0/24]
+C rms [lid-10.1.1.0/24]
+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 [sharleena.as10.net-ID]
+C rms [faui31o.informatik.uni-erlangen.de-ID]
+C rms [IPsec-3ffe::51-3ffe::29]
+C rms [qm-3ffe::51-3ffe::29]
+C rms [lid-3ffe::51]
+C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel17.in b/regress/sbin/ipsecctl/ikedel17.in
new file mode 100644
index 00000000000..60cc40a8538
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel17.in
@@ -0,0 +1,2 @@
+ike from 10.1.1.0/24 to 10.1.2.0/24 peer 3ffe::29
+ike from 3ffe::51 to 3ffe::29
diff --git a/regress/sbin/ipsecctl/ikedel17.ok b/regress/sbin/ipsecctl/ikedel17.ok
new file mode 100644
index 00000000000..cb429046f70
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel17.ok
@@ -0,0 +1,14 @@
+t IPsec-10.1.1.0/24-10.1.2.0/24
+C rms [peer-3ffe::29]
+C rms [mm-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]
+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 [IPsec-3ffe::51-3ffe::29]
+C rms [qm-3ffe::51-3ffe::29]
+C rms [lid-3ffe::51]
+C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel18.in b/regress/sbin/ipsecctl/ikedel18.in
new file mode 100644
index 00000000000..7fabcbf797a
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel18.in
@@ -0,0 +1,2 @@
+ike passive from 10.1.2.0/24 to 10.1.1.0/24 peer 3ffe::51
+ike passive from 3ffe::29 to 3ffe::51
diff --git a/regress/sbin/ipsecctl/ikedel18.ok b/regress/sbin/ipsecctl/ikedel18.ok
new file mode 100644
index 00000000000..7b818e66e06
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel18.ok
@@ -0,0 +1,16 @@
+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 [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]
+C rms [rid-10.1.1.0/24]
+C rms [Phase 2]
+t IPsec-3ffe::29-3ffe::51
+C rms [peer-3ffe::51]
+C rms [mm-3ffe::51]
+C rms [IPsec-3ffe::29-3ffe::51]
+C rms [qm-3ffe::29-3ffe::51]
+C rms [lid-3ffe::29]
+C rms [rid-3ffe::51]
diff --git a/regress/sbin/ipsecctl/ikedel19.in b/regress/sbin/ipsecctl/ikedel19.in
new file mode 100644
index 00000000000..d4e3fdb1df8
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel19.in
@@ -0,0 +1 @@
+ike from 1.1.1.1 to any peer 3ffe::1
diff --git a/regress/sbin/ipsecctl/ikedel19.ok b/regress/sbin/ipsecctl/ikedel19.ok
new file mode 100644
index 00000000000..83b157082d7
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel19.ok
@@ -0,0 +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 [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]
+C rms [rid-0.0.0.0/0]
diff --git a/regress/sbin/ipsecctl/ikedel2.in b/regress/sbin/ipsecctl/ikedel2.in
new file mode 100644
index 00000000000..8e67139c336
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel2.in
@@ -0,0 +1 @@
+ike from 10.1.1.0/24 to 10.1.2.0/24 peer 131.188.33.29
diff --git a/regress/sbin/ipsecctl/ikedel2.ok b/regress/sbin/ipsecctl/ikedel2.ok
new file mode 100644
index 00000000000..7db72bb9cbf
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel2.ok
@@ -0,0 +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 [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]
+C rms [rid-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel20.in b/regress/sbin/ipsecctl/ikedel20.in
new file mode 100644
index 00000000000..c7f1d04ad70
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel20.in
@@ -0,0 +1,2 @@
+ike from 1.1.1.1 to any local 192.168.3.2 peer 192.168.3.1
+ike from 1.1.1.1 to any peer 192.168.3.1 local 192.168.3.2
diff --git a/regress/sbin/ipsecctl/ikedel20.ok b/regress/sbin/ipsecctl/ikedel20.ok
new file mode 100644
index 00000000000..7b171b0cde5
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel20.ok
@@ -0,0 +1,14 @@
+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 [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]
+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 [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]
+C rms [rid-0.0.0.0/0]
diff --git a/regress/sbin/ipsecctl/ikedel21.in b/regress/sbin/ipsecctl/ikedel21.in
new file mode 100644
index 00000000000..213c71e19fc
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel21.in
@@ -0,0 +1 @@
+ike from 3ffe::1 to 3ffe::2
diff --git a/regress/sbin/ipsecctl/ikedel21.ok b/regress/sbin/ipsecctl/ikedel21.ok
new file mode 100644
index 00000000000..fff3ef9c934
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel21.ok
@@ -0,0 +1,7 @@
+t IPsec-3ffe::1-3ffe::2
+C rms [peer-3ffe::2]
+C rms [mm-3ffe::2]
+C rms [IPsec-3ffe::1-3ffe::2]
+C rms [qm-3ffe::1-3ffe::2]
+C rms [lid-3ffe::1]
+C rms [rid-3ffe::2]
diff --git a/regress/sbin/ipsecctl/ikedel22.in b/regress/sbin/ipsecctl/ikedel22.in
new file mode 100644
index 00000000000..ddc4a19e1a7
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel22.in
@@ -0,0 +1 @@
+ike from 10.1.1.0/24 to 10.1.2.0/24 peer 3ffe::1
diff --git a/regress/sbin/ipsecctl/ikedel22.ok b/regress/sbin/ipsecctl/ikedel22.ok
new file mode 100644
index 00000000000..ad25345287c
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel22.ok
@@ -0,0 +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 [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]
+C rms [rid-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel23.in b/regress/sbin/ipsecctl/ikedel23.in
new file mode 100644
index 00000000000..2b129c8f2fe
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel23.in
@@ -0,0 +1,2 @@
+ike from 3ffe::51 to 3ffe::29 \
+	srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
diff --git a/regress/sbin/ipsecctl/ikedel23.ok b/regress/sbin/ipsecctl/ikedel23.ok
new file mode 100644
index 00000000000..6e62d58f1e5
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel23.ok
@@ -0,0 +1,9 @@
+t IPsec-3ffe::51-3ffe::29
+C rms [peer-3ffe::29]
+C rms [mm-3ffe::29]
+C rms [sharleena.as10.net-ID]
+C rms [faui31o.informatik.uni-erlangen.de-ID]
+C rms [IPsec-3ffe::51-3ffe::29]
+C rms [qm-3ffe::51-3ffe::29]
+C rms [lid-3ffe::51]
+C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel29.in b/regress/sbin/ipsecctl/ikedel29.in
new file mode 100644
index 00000000000..d3f6c5b81a6
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel29.in
@@ -0,0 +1 @@
+ike dynamic esp from 3ffe:3::/64 to 3ffe:4::/64 peer 3ffe:2::1 srcid noname.my.domain
diff --git a/regress/sbin/ipsecctl/ikedel29.ok b/regress/sbin/ipsecctl/ikedel29.ok
new file mode 100644
index 00000000000..1c640c2b207
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel29.ok
@@ -0,0 +1,8 @@
+t IPsec-3ffe:3::/64-3ffe:4::/64
+C rms [peer-3ffe:2::1]
+C rms [mm-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]
+C rms [lid-3ffe:3::/64]
+C rms [rid-3ffe:4::/64]
diff --git a/regress/sbin/ipsecctl/ikedel3.in b/regress/sbin/ipsecctl/ikedel3.in
new file mode 100644
index 00000000000..4dec756edfb
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel3.in
@@ -0,0 +1,2 @@
+ike from 131.188.33.51 to 131.188.33.29 \
+	srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
diff --git a/regress/sbin/ipsecctl/ikedel3.ok b/regress/sbin/ipsecctl/ikedel3.ok
new file mode 100644
index 00000000000..8a49706958b
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel3.ok
@@ -0,0 +1,9 @@
+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 [sharleena.as10.net-ID]
+C rms [faui31o.informatik.uni-erlangen.de-ID]
+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]
+C rms [rid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel30.in b/regress/sbin/ipsecctl/ikedel30.in
new file mode 100644
index 00000000000..c09a378cdf9
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel30.in
@@ -0,0 +1 @@
+ike esp proto etherip from 3ffe::1 to 3ffe::2
diff --git a/regress/sbin/ipsecctl/ikedel30.ok b/regress/sbin/ipsecctl/ikedel30.ok
new file mode 100644
index 00000000000..fff3ef9c934
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel30.ok
@@ -0,0 +1,7 @@
+t IPsec-3ffe::1-3ffe::2
+C rms [peer-3ffe::2]
+C rms [mm-3ffe::2]
+C rms [IPsec-3ffe::1-3ffe::2]
+C rms [qm-3ffe::1-3ffe::2]
+C rms [lid-3ffe::1]
+C rms [rid-3ffe::2]
diff --git a/regress/sbin/ipsecctl/ikedel31.in b/regress/sbin/ipsecctl/ikedel31.in
new file mode 100644
index 00000000000..c818df63fbd
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel31.in
@@ -0,0 +1 @@
+ike from 3ffe:2::1 to any peer 3ffe::1
diff --git a/regress/sbin/ipsecctl/ikedel31.ok b/regress/sbin/ipsecctl/ikedel31.ok
new file mode 100644
index 00000000000..7ad0ed05d0f
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel31.ok
@@ -0,0 +1,7 @@
+t IPsec-3ffe:2::1-::/0
+C rms [peer-3ffe::1]
+C rms [mm-3ffe::1]
+C rms [IPsec-3ffe:2::1-::/0]
+C rms [qm-3ffe:2::1-::/0]
+C rms [lid-3ffe:2::1]
+C rms [rid-::/0]
diff --git a/regress/sbin/ipsecctl/ikedel32.in b/regress/sbin/ipsecctl/ikedel32.in
new file mode 100644
index 00000000000..0851e70d03d
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel32.in
@@ -0,0 +1 @@
+ike from 1.1.1.1 to 2.2.2.2 quick life 1200
diff --git a/regress/sbin/ipsecctl/ikedel32.ok b/regress/sbin/ipsecctl/ikedel32.ok
new file mode 100644
index 00000000000..9c2f40e30db
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel32.ok
@@ -0,0 +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 [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]
+C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel33.in b/regress/sbin/ipsecctl/ikedel33.in
new file mode 100644
index 00000000000..10aff973939
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel33.in
@@ -0,0 +1 @@
+ike from 1.1.1.1 to 2.2.2.2 main life 3600
diff --git a/regress/sbin/ipsecctl/ikedel33.ok b/regress/sbin/ipsecctl/ikedel33.ok
new file mode 100644
index 00000000000..9c2f40e30db
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel33.ok
@@ -0,0 +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 [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]
+C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel34.in b/regress/sbin/ipsecctl/ikedel34.in
new file mode 100644
index 00000000000..60ded09d6c6
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel34.in
@@ -0,0 +1 @@
+ike from 3ffe::1/24 to 3ffe:2::/24 peer 1.2.3.4
diff --git a/regress/sbin/ipsecctl/ikedel34.ok b/regress/sbin/ipsecctl/ikedel34.ok
new file mode 100644
index 00000000000..c5ed8accc79
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel34.ok
@@ -0,0 +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 [IPsec-3ffe::1/24-3ffe:2::/24]
+C rms [qm-3ffe::1/24-3ffe:2::/24]
+C rms [lid-3ffe::1/24]
+C rms [rid-3ffe:2::/24]
diff --git a/regress/sbin/ipsecctl/ikedel35.in b/regress/sbin/ipsecctl/ikedel35.in
new file mode 100644
index 00000000000..fbf177e5fb8
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel35.in
@@ -0,0 +1 @@
+ike from 3ffe:2::/24 to 3ffe::1/24 peer 1.2.3.4
diff --git a/regress/sbin/ipsecctl/ikedel35.ok b/regress/sbin/ipsecctl/ikedel35.ok
new file mode 100644
index 00000000000..e4c88c14fe0
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel35.ok
@@ -0,0 +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 [IPsec-3ffe:2::/24-3ffe::1/24]
+C rms [qm-3ffe:2::/24-3ffe::1/24]
+C rms [lid-3ffe:2::/24]
+C rms [rid-3ffe::1/24]
diff --git a/regress/sbin/ipsecctl/ikedel36.in b/regress/sbin/ipsecctl/ikedel36.in
new file mode 100644
index 00000000000..ae00f247248
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel36.in
@@ -0,0 +1 @@
+ike from 3ffe::3 to 3ffe::4 peer 3ffe::1
diff --git a/regress/sbin/ipsecctl/ikedel36.ok b/regress/sbin/ipsecctl/ikedel36.ok
new file mode 100644
index 00000000000..41df3c59536
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel36.ok
@@ -0,0 +1,7 @@
+t IPsec-3ffe::3-3ffe::4
+C rms [peer-3ffe::1]
+C rms [mm-3ffe::1]
+C rms [IPsec-3ffe::3-3ffe::4]
+C rms [qm-3ffe::3-3ffe::4]
+C rms [lid-3ffe::3]
+C rms [rid-3ffe::4]
diff --git a/regress/sbin/ipsecctl/ikedel37.in b/regress/sbin/ipsecctl/ikedel37.in
new file mode 100644
index 00000000000..dad86107c50
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel37.in
@@ -0,0 +1,2 @@
+ike from 3ffe:1::/64 to 3ffe:2::/64 peer 3ffe::1 \
+        srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
diff --git a/regress/sbin/ipsecctl/ikedel37.ok b/regress/sbin/ipsecctl/ikedel37.ok
new file mode 100644
index 00000000000..3545ec0ab13
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel37.ok
@@ -0,0 +1,9 @@
+t IPsec-3ffe:1::/64-3ffe:2::/64
+C rms [peer-3ffe::1]
+C rms [mm-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]
+C rms [qm-3ffe:1::/64-3ffe:2::/64]
+C rms [lid-3ffe:1::/64]
+C rms [rid-3ffe:2::/64]
diff --git a/regress/sbin/ipsecctl/ikedel38.in b/regress/sbin/ipsecctl/ikedel38.in
new file mode 100644
index 00000000000..2f0968bc08b
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel38.in
@@ -0,0 +1,9 @@
+ike esp from 3ffe:1::/64 to 3ffe:2::/64 peer 3ffe::29 \
+        main auth hmac-sha1 enc 3des group modp3072 \
+        quick auth hmac-sha1 enc 3des group modp3072 \
+        srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
+ike esp from 3ffe::51 to 3ffe::29 \
+        main auth hmac-sha1 enc aes group modp3072 \
+        quick auth hmac-sha2-256 enc aes group modp3072 \
+        srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
+
diff --git a/regress/sbin/ipsecctl/ikedel38.ok b/regress/sbin/ipsecctl/ikedel38.ok
new file mode 100644
index 00000000000..16b242ee629
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel38.ok
@@ -0,0 +1,18 @@
+t IPsec-3ffe:1::/64-3ffe:2::/64
+C rms [peer-3ffe::29]
+C rms [mm-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]
+C rms [qm-3ffe:1::/64-3ffe:2::/64]
+C rms [lid-3ffe:1::/64]
+C rms [rid-3ffe:2::/64]
+t IPsec-3ffe::51-3ffe::29
+C rms [peer-3ffe::29]
+C rms [mm-3ffe::29]
+C rms [sharleena.as10.net-ID]
+C rms [faui31o.informatik.uni-erlangen.de-ID]
+C rms [IPsec-3ffe::51-3ffe::29]
+C rms [qm-3ffe::51-3ffe::29]
+C rms [lid-3ffe::51]
+C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel39.in b/regress/sbin/ipsecctl/ikedel39.in
new file mode 100644
index 00000000000..b1c9c036f45
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel39.in
@@ -0,0 +1,2 @@
+ike from 3ffe:1::/64 to 3ffe:2::/64 peer 3ffe::29 
+ike from 3ffe::51 to 3ffe::29
diff --git a/regress/sbin/ipsecctl/ikedel39.ok b/regress/sbin/ipsecctl/ikedel39.ok
new file mode 100644
index 00000000000..60d5679d6d7
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel39.ok
@@ -0,0 +1,14 @@
+t IPsec-3ffe:1::/64-3ffe:2::/64
+C rms [peer-3ffe::29]
+C rms [mm-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]
+C rms [rid-3ffe:2::/64]
+t IPsec-3ffe::51-3ffe::29
+C rms [peer-3ffe::29]
+C rms [mm-3ffe::29]
+C rms [IPsec-3ffe::51-3ffe::29]
+C rms [qm-3ffe::51-3ffe::29]
+C rms [lid-3ffe::51]
+C rms [rid-3ffe::29]
diff --git a/regress/sbin/ipsecctl/ikedel4.in b/regress/sbin/ipsecctl/ikedel4.in
new file mode 100644
index 00000000000..3bd0446aaa7
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel4.in
@@ -0,0 +1,2 @@
+ike from 10.1.1.0/24 to 10.1.2.0/24 peer 131.188.33.29 \
+	srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
diff --git a/regress/sbin/ipsecctl/ikedel4.ok b/regress/sbin/ipsecctl/ikedel4.ok
new file mode 100644
index 00000000000..1f6610b5cc5
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel4.ok
@@ -0,0 +1,9 @@
+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 [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]
+C rms [qm-10.1.1.0/24-10.1.2.0/24]
+C rms [lid-10.1.1.0/24]
+C rms [rid-10.1.2.0/24]
diff --git a/regress/sbin/ipsecctl/ikedel40.in b/regress/sbin/ipsecctl/ikedel40.in
new file mode 100644
index 00000000000..a9d288e7b80
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel40.in
@@ -0,0 +1,2 @@
+ike passive from 3ffe:1::/64 to 3ffe:2::/64 peer 3ffe::51
+ike passive from 3ffe::29 to 3ffe::51
diff --git a/regress/sbin/ipsecctl/ikedel40.ok b/regress/sbin/ipsecctl/ikedel40.ok
new file mode 100644
index 00000000000..1ede2ebfe25
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel40.ok
@@ -0,0 +1,16 @@
+C rms [Phase 2]
+t IPsec-3ffe:1::/64-3ffe:2::/64
+C rms [peer-3ffe::51]
+C rms [mm-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]
+C rms [rid-3ffe:2::/64]
+C rms [Phase 2]
+t IPsec-3ffe::29-3ffe::51
+C rms [peer-3ffe::51]
+C rms [mm-3ffe::51]
+C rms [IPsec-3ffe::29-3ffe::51]
+C rms [qm-3ffe::29-3ffe::51]
+C rms [lid-3ffe::29]
+C rms [rid-3ffe::51]
diff --git a/regress/sbin/ipsecctl/ikedel41.in b/regress/sbin/ipsecctl/ikedel41.in
new file mode 100644
index 00000000000..ae225eb5ef8
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel41.in
@@ -0,0 +1 @@
+ike from 1.1.1.1 to 2.2.2.2 main life 3600 quick life 1200
diff --git a/regress/sbin/ipsecctl/ikedel41.ok b/regress/sbin/ipsecctl/ikedel41.ok
new file mode 100644
index 00000000000..9c2f40e30db
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel41.ok
@@ -0,0 +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 [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]
+C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel42.in b/regress/sbin/ipsecctl/ikedel42.in
new file mode 100644
index 00000000000..5fd64cf0ace
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel42.in
@@ -0,0 +1 @@
+ike esp proto udp from 1.1.1.1 port ntp to 2.2.2.2
diff --git a/regress/sbin/ipsecctl/ikedel42.ok b/regress/sbin/ipsecctl/ikedel42.ok
new file mode 100644
index 00000000000..9c2f40e30db
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel42.ok
@@ -0,0 +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 [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]
+C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel43.in b/regress/sbin/ipsecctl/ikedel43.in
new file mode 100644
index 00000000000..509ab0c0738
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel43.in
@@ -0,0 +1 @@
+ike esp proto tcp from 3ffe::1 port 2022 to 3ffe::2 port ssh
diff --git a/regress/sbin/ipsecctl/ikedel43.ok b/regress/sbin/ipsecctl/ikedel43.ok
new file mode 100644
index 00000000000..fff3ef9c934
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel43.ok
@@ -0,0 +1,7 @@
+t IPsec-3ffe::1-3ffe::2
+C rms [peer-3ffe::2]
+C rms [mm-3ffe::2]
+C rms [IPsec-3ffe::1-3ffe::2]
+C rms [qm-3ffe::1-3ffe::2]
+C rms [lid-3ffe::1]
+C rms [rid-3ffe::2]
diff --git a/regress/sbin/ipsecctl/ikedel46.in b/regress/sbin/ipsecctl/ikedel46.in
new file mode 100644
index 00000000000..e3f90f6c004
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel46.in
@@ -0,0 +1,2 @@
+ike esp tunnel from 1.1.1.1 to 2.2.2.2
+ike esp transport from 1.1.1.1 to 2.2.2.2
diff --git a/regress/sbin/ipsecctl/ikedel46.ok b/regress/sbin/ipsecctl/ikedel46.ok
new file mode 100644
index 00000000000..9df06014101
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel46.ok
@@ -0,0 +1,14 @@
+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 [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]
+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 [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]
+C rms [rid-2.2.2.2]
diff --git a/regress/sbin/ipsecctl/ikedel47.in b/regress/sbin/ipsecctl/ikedel47.in
new file mode 100644
index 00000000000..6d12bf6a97c
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel47.in
@@ -0,0 +1 @@
+ike from any to any
diff --git a/regress/sbin/ipsecctl/ikedel47.ok b/regress/sbin/ipsecctl/ikedel47.ok
new file mode 100644
index 00000000000..63a60eb9522
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel47.ok
@@ -0,0 +1,10 @@
+t IPsec-0.0.0.0/0-0.0.0.0/0
+C rms [IPsec-0.0.0.0/0-0.0.0.0/0]
+C rms [qm-0.0.0.0/0-0.0.0.0/0]
+C rms [lid-0.0.0.0/0]
+C rms [rid-0.0.0.0/0]
+t IPsec-::/0-::/0
+C rms [IPsec-::/0-::/0]
+C rms [qm-::/0-::/0]
+C rms [lid-::/0]
+C rms [rid-::/0]
diff --git a/regress/sbin/ipsecctl/ikedel5.in b/regress/sbin/ipsecctl/ikedel5.in
new file mode 100644
index 00000000000..7a4c38a5d1f
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel5.in
@@ -0,0 +1,8 @@
+ike esp from 10.1.1.0/24 to 10.1.2.0/24 peer 131.188.33.29 \
+	main auth hmac-sha1 enc 3des group modp3072 \
+	quick auth hmac-sha1 enc 3des group modp3072 \
+	srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
+ike esp from 131.188.33.51 to 131.188.33.29 \
+	main auth hmac-sha1 enc aes group modp3072 \
+	quick auth hmac-sha2-256 enc aes group modp3072 \
+	srcid sharleena.as10.net dstid faui31o.informatik.uni-erlangen.de
diff --git a/regress/sbin/ipsecctl/ikedel5.ok b/regress/sbin/ipsecctl/ikedel5.ok
new file mode 100644
index 00000000000..eb53ce05b98
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel5.ok
@@ -0,0 +1,18 @@
+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 [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]
+C rms [qm-10.1.1.0/24-10.1.2.0/24]
+C rms [lid-10.1.1.0/24]
+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 [sharleena.as10.net-ID]
+C rms [faui31o.informatik.uni-erlangen.de-ID]
+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]
+C rms [rid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel6.in b/regress/sbin/ipsecctl/ikedel6.in
new file mode 100644
index 00000000000..9ae17618490
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel6.in
@@ -0,0 +1,2 @@
+ike from 10.1.1.0/24 to 10.1.2.0/24 peer 131.188.33.29
+ike from 131.188.33.51 to 131.188.33.29
diff --git a/regress/sbin/ipsecctl/ikedel6.ok b/regress/sbin/ipsecctl/ikedel6.ok
new file mode 100644
index 00000000000..445629901f8
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel6.ok
@@ -0,0 +1,14 @@
+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 [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]
+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 [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]
+C rms [rid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedel7.in b/regress/sbin/ipsecctl/ikedel7.in
new file mode 100644
index 00000000000..90197b85e6c
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel7.in
@@ -0,0 +1,2 @@
+ike passive from 10.1.2.0/24 to 10.1.1.0/24 peer 131.188.33.51
+ike passive from 131.188.33.29 to 131.188.33.51
diff --git a/regress/sbin/ipsecctl/ikedel7.ok b/regress/sbin/ipsecctl/ikedel7.ok
new file mode 100644
index 00000000000..bf4e30d7953
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel7.ok
@@ -0,0 +1,16 @@
+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 [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]
+C rms [rid-10.1.1.0/24]
+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 [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]
+C rms [rid-131.188.33.51]
diff --git a/regress/sbin/ipsecctl/ikedel8.in b/regress/sbin/ipsecctl/ikedel8.in
new file mode 100644
index 00000000000..6eb53021735
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel8.in
@@ -0,0 +1 @@
+ike from 1.1.1.1 to any peer 192.168.3.1
diff --git a/regress/sbin/ipsecctl/ikedel8.ok b/regress/sbin/ipsecctl/ikedel8.ok
new file mode 100644
index 00000000000..dbecdf7fb19
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel8.ok
@@ -0,0 +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 [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]
+C rms [rid-0.0.0.0/0]
diff --git a/regress/sbin/ipsecctl/ikedel9.in b/regress/sbin/ipsecctl/ikedel9.in
new file mode 100644
index 00000000000..f00ab35a878
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel9.in
@@ -0,0 +1 @@
+ike dynamic esp from 3.3.3.0/24 to 4.4.4.0/24 peer 2.2.2.2 srcid noname.my.domain
diff --git a/regress/sbin/ipsecctl/ikedel9.ok b/regress/sbin/ipsecctl/ikedel9.ok
new file mode 100644
index 00000000000..94648e08607
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedel9.ok
@@ -0,0 +1,8 @@
+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 [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]
+C rms [lid-3.3.3.0/24]
+C rms [rid-4.4.4.0/24]
diff --git a/regress/sbin/ipsecctl/ikedeldel1.in b/regress/sbin/ipsecctl/ikedeldel1.in
new file mode 100644
index 00000000000..c627e0e9f7d
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedeldel1.in
@@ -0,0 +1 @@
+ike from 131.188.33.51 to 131.188.33.29
diff --git a/regress/sbin/ipsecctl/ikedeldel1.ok b/regress/sbin/ipsecctl/ikedeldel1.ok
new file mode 100644
index 00000000000..9c563d1d06b
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedeldel1.ok
@@ -0,0 +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 [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]
+C rms [rid-131.188.33.29]
diff --git a/regress/sbin/ipsecctl/ikedeldel47.in b/regress/sbin/ipsecctl/ikedeldel47.in
new file mode 100644
index 00000000000..6d12bf6a97c
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedeldel47.in
@@ -0,0 +1 @@
+ike from any to any
diff --git a/regress/sbin/ipsecctl/ikedeldel47.ok b/regress/sbin/ipsecctl/ikedeldel47.ok
new file mode 100644
index 00000000000..63a60eb9522
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikedeldel47.ok
@@ -0,0 +1,10 @@
+t IPsec-0.0.0.0/0-0.0.0.0/0
+C rms [IPsec-0.0.0.0/0-0.0.0.0/0]
+C rms [qm-0.0.0.0/0-0.0.0.0/0]
+C rms [lid-0.0.0.0/0]
+C rms [rid-0.0.0.0/0]
+t IPsec-::/0-::/0
+C rms [IPsec-::/0-::/0]
+C rms [qm-::/0-::/0]
+C rms [lid-::/0]
+C rms [rid-::/0]