really, this is the correct *.ok output, what was generated in the past was

due to recently fixed code
move some ike?? to ikefail?

23 files changed, 88 insertions, 124 deletions

diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index cb1482532ff..c7a199e2a7a 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.31 2006/06/08 21:15:21 naddy Exp $
+# $OpenBSD: Makefile,v 1.32 2006/06/08 21:20:19 todd Exp $
 
 # TARGETS
 # ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -14,11 +14,11 @@ TCPMD5TESTS=1 2 3
 SATESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
 SAFAIL=1
 IPSECFAIL=1 2
-IKEFAIL=1 3
+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 44 45 46
+IKETESTS+=41 42 43 46
 
 SHELL=/bin/sh
 
diff --git a/regress/sbin/ipsecctl/ike29.ok b/regress/sbin/ipsecctl/ike29.ok
index f6f7452ebd3..baaf19f2a1c 100644
--- a/regress/sbin/ipsecctl/ike29.ok
+++ b/regress/sbin/ipsecctl/ike29.ok
@@ -18,8 +18,8 @@ C set [qm-3ffe:3::/64-3ffe:4::/64]:EXCHANGE_TYPE=QUICK_MODE force
 C set [qm-3ffe:3::/64-3ffe:4::/64]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
 C set [lid-3ffe:3::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [lid-3ffe:3::/64]:Network=3ffe:3:: force
-C set [lid-3ffe:3::/64]:Netmask=255.255.255.255 force
+C set [lid-3ffe:3::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C set [rid-3ffe:4::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [rid-3ffe:4::/64]:Network=3ffe:4:: force
-C set [rid-3ffe:4::/64]:Netmask=255.255.255.255 force
+C set [rid-3ffe:4::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C add [Phase 2]:Connections=IPsec-3ffe:3::/64-3ffe:4::/64
diff --git a/regress/sbin/ipsecctl/ike31.ok b/regress/sbin/ipsecctl/ike31.ok
index 46c7bdb7e8f..2a7506aee76 100644
--- a/regress/sbin/ipsecctl/ike31.ok
+++ b/regress/sbin/ipsecctl/ike31.ok
@@ -13,7 +13,7 @@ C set [qm-3ffe:2::1-::/0]:EXCHANGE_TYPE=QUICK_MODE force
 C set [qm-3ffe:2::1-::/0]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
 C set [lid-3ffe:2::1]:ID-type=IPV6_ADDR force
 C set [lid-3ffe:2::1]:Address=3ffe:2::1 force
-C set [rid-::/0]:ID-type=IPV4_ADDR_SUBNET force
-C set [rid-::/0]:Network=0.0.0.0 force
-C set [rid-::/0]:Netmask=0.0.0.0 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-3ffe:2::1-::/0
diff --git a/regress/sbin/ipsecctl/ike32.in b/regress/sbin/ipsecctl/ike32.in
index 8ad27e31ef7..0851e70d03d 100644
--- a/regress/sbin/ipsecctl/ike32.in
+++ b/regress/sbin/ipsecctl/ike32.in
@@ -1 +1 @@
-ike from 3ffe::1/24 to 10.1.2.0/24 peer 3ffe::1
+ike from 1.1.1.1 to 2.2.2.2 quick life 1200
diff --git a/regress/sbin/ipsecctl/ike32.ok b/regress/sbin/ipsecctl/ike32.ok
index a7981fb0a90..338d7adcb76 100644
--- a/regress/sbin/ipsecctl/ike32.ok
+++ b/regress/sbin/ipsecctl/ike32.ok
@@ -1,20 +1,19 @@
-C set [Phase 1]:3ffe::1=peer-3ffe::1 force
-C set [peer-3ffe::1]:Phase=1 force
-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 [IPsec-3ffe::1/24-10.1.2.0/24]:Phase=2 force
-C set [IPsec-3ffe::1/24-10.1.2.0/24]:ISAKMP-peer=peer-3ffe::1 force
-C set [IPsec-3ffe::1/24-10.1.2.0/24]:Configuration=qm-3ffe::1/24-10.1.2.0/24 force
-C set [IPsec-3ffe::1/24-10.1.2.0/24]:Local-ID=lid-3ffe::1/24 force
-C set [IPsec-3ffe::1/24-10.1.2.0/24]:Remote-ID=rid-10.1.2.0/24 force
-C set [qm-3ffe::1/24-10.1.2.0/24]:EXCHANGE_TYPE=QUICK_MODE force
-C set [qm-3ffe::1/24-10.1.2.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
-C set [lid-3ffe::1/24]:ID-type=IPV6_ADDR_SUBNET force
-C set [lid-3ffe::1/24]:Network=3ffe::1 force
-C set [lid-3ffe::1/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-3ffe::1/24-10.1.2.0/24
+C set [General]:Default-phase-2-lifetime=1200 force
+C set [Phase 1]:2.2.2.2=peer-2.2.2.2 force
+C set [peer-2.2.2.2]:Phase=1 force
+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 [IPsec-1.1.1.1-2.2.2.2]:Phase=2 force
+C set [IPsec-1.1.1.1-2.2.2.2]:ISAKMP-peer=peer-2.2.2.2 force
+C set [IPsec-1.1.1.1-2.2.2.2]:Configuration=qm-1.1.1.1-2.2.2.2 force
+C set [IPsec-1.1.1.1-2.2.2.2]:Local-ID=lid-1.1.1.1 force
+C set [IPsec-1.1.1.1-2.2.2.2]:Remote-ID=rid-2.2.2.2 force
+C set [qm-1.1.1.1-2.2.2.2]:EXCHANGE_TYPE=QUICK_MODE force
+C set [qm-1.1.1.1-2.2.2.2]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
+C set [lid-1.1.1.1]:ID-type=IPV4_ADDR force
+C set [lid-1.1.1.1]:Address=1.1.1.1 force
+C set [rid-2.2.2.2]:ID-type=IPV4_ADDR force
+C set [rid-2.2.2.2]:Address=2.2.2.2 force
+C add [Phase 2]:Connections=IPsec-1.1.1.1-2.2.2.2
diff --git a/regress/sbin/ipsecctl/ike33.in b/regress/sbin/ipsecctl/ike33.in
index db240853665..10aff973939 100644
--- a/regress/sbin/ipsecctl/ike33.in
+++ b/regress/sbin/ipsecctl/ike33.in
@@ -1 +1 @@
-ike from 10.1.2.0/24 to 3ffe::1/24 peer 3ffe::1
+ike from 1.1.1.1 to 2.2.2.2 main life 3600
diff --git a/regress/sbin/ipsecctl/ike33.ok b/regress/sbin/ipsecctl/ike33.ok
index 40089d0be3a..188d7080c32 100644
--- a/regress/sbin/ipsecctl/ike33.ok
+++ b/regress/sbin/ipsecctl/ike33.ok
@@ -1,20 +1,19 @@
-C set [Phase 1]:3ffe::1=peer-3ffe::1 force
-C set [peer-3ffe::1]:Phase=1 force
-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 [IPsec-10.1.2.0/24-3ffe::1/24]:Phase=2 force
-C set [IPsec-10.1.2.0/24-3ffe::1/24]:ISAKMP-peer=peer-3ffe::1 force
-C set [IPsec-10.1.2.0/24-3ffe::1/24]:Configuration=qm-10.1.2.0/24-3ffe::1/24 force
-C set [IPsec-10.1.2.0/24-3ffe::1/24]:Local-ID=lid-10.1.2.0/24 force
-C set [IPsec-10.1.2.0/24-3ffe::1/24]:Remote-ID=rid-3ffe::1/24 force
-C set [qm-10.1.2.0/24-3ffe::1/24]:EXCHANGE_TYPE=QUICK_MODE force
-C set [qm-10.1.2.0/24-3ffe::1/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
-C set [lid-10.1.2.0/24]:ID-type=IPV4_ADDR_SUBNET force
-C set [lid-10.1.2.0/24]:Network=10.1.2.0 force
-C set [lid-10.1.2.0/24]:Netmask=255.255.255.0 force
-C set [rid-3ffe::1/24]:ID-type=IPV6_ADDR_SUBNET force
-C set [rid-3ffe::1/24]:Network=3ffe::1 force
-C set [rid-3ffe::1/24]:Netmask=255.255.255.0 force
-C add [Phase 2]:Connections=IPsec-10.1.2.0/24-3ffe::1/24
+C set [General]:Default-phase-1-lifetime=3600 force
+C set [Phase 1]:2.2.2.2=peer-2.2.2.2 force
+C set [peer-2.2.2.2]:Phase=1 force
+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 [IPsec-1.1.1.1-2.2.2.2]:Phase=2 force
+C set [IPsec-1.1.1.1-2.2.2.2]:ISAKMP-peer=peer-2.2.2.2 force
+C set [IPsec-1.1.1.1-2.2.2.2]:Configuration=qm-1.1.1.1-2.2.2.2 force
+C set [IPsec-1.1.1.1-2.2.2.2]:Local-ID=lid-1.1.1.1 force
+C set [IPsec-1.1.1.1-2.2.2.2]:Remote-ID=rid-2.2.2.2 force
+C set [qm-1.1.1.1-2.2.2.2]:EXCHANGE_TYPE=QUICK_MODE force
+C set [qm-1.1.1.1-2.2.2.2]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
+C set [lid-1.1.1.1]:ID-type=IPV4_ADDR force
+C set [lid-1.1.1.1]:Address=1.1.1.1 force
+C set [rid-2.2.2.2]:ID-type=IPV4_ADDR force
+C set [rid-2.2.2.2]:Address=2.2.2.2 force
+C add [Phase 2]:Connections=IPsec-1.1.1.1-2.2.2.2
diff --git a/regress/sbin/ipsecctl/ike34.in b/regress/sbin/ipsecctl/ike34.in
index a0375f0c14c..60ded09d6c6 100644
--- a/regress/sbin/ipsecctl/ike34.in
+++ b/regress/sbin/ipsecctl/ike34.in
@@ -1 +1 @@
-ike from 3ffe::1/24 to 10.1.2.0/24 peer 1.2.3.4
+ike from 3ffe::1/24 to 3ffe:2::/24 peer 1.2.3.4
diff --git a/regress/sbin/ipsecctl/ike34.ok b/regress/sbin/ipsecctl/ike34.ok
index 45c129ad0db..1158ef6245a 100644
--- a/regress/sbin/ipsecctl/ike34.ok
+++ b/regress/sbin/ipsecctl/ike34.ok
@@ -4,17 +4,17 @@ C set [peer-1.2.3.4]:Address=1.2.3.4 force
 C set [peer-1.2.3.4]:Configuration=mm-1.2.3.4 force
 C set [mm-1.2.3.4]:EXCHANGE_TYPE=ID_PROT force
 C add [mm-1.2.3.4]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [IPsec-3ffe::1/24-10.1.2.0/24]:Phase=2 force
-C set [IPsec-3ffe::1/24-10.1.2.0/24]:ISAKMP-peer=peer-1.2.3.4 force
-C set [IPsec-3ffe::1/24-10.1.2.0/24]:Configuration=qm-3ffe::1/24-10.1.2.0/24 force
-C set [IPsec-3ffe::1/24-10.1.2.0/24]:Local-ID=lid-3ffe::1/24 force
-C set [IPsec-3ffe::1/24-10.1.2.0/24]:Remote-ID=rid-10.1.2.0/24 force
-C set [qm-3ffe::1/24-10.1.2.0/24]:EXCHANGE_TYPE=QUICK_MODE force
-C set [qm-3ffe::1/24-10.1.2.0/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
+C set [IPsec-3ffe::1/24-3ffe:2::/24]:Phase=2 force
+C set [IPsec-3ffe::1/24-3ffe:2::/24]:ISAKMP-peer=peer-1.2.3.4 force
+C set [IPsec-3ffe::1/24-3ffe:2::/24]:Configuration=qm-3ffe::1/24-3ffe:2::/24 force
+C set [IPsec-3ffe::1/24-3ffe:2::/24]:Local-ID=lid-3ffe::1/24 force
+C set [IPsec-3ffe::1/24-3ffe:2::/24]:Remote-ID=rid-3ffe:2::/24 force
+C set [qm-3ffe::1/24-3ffe:2::/24]:EXCHANGE_TYPE=QUICK_MODE force
+C set [qm-3ffe::1/24-3ffe:2::/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
 C set [lid-3ffe::1/24]:ID-type=IPV6_ADDR_SUBNET force
 C set [lid-3ffe::1/24]:Network=3ffe::1 force
-C set [lid-3ffe::1/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-3ffe::1/24-10.1.2.0/24
+C set [lid-3ffe::1/24]:Netmask=ffff:ff00:: force
+C set [rid-3ffe:2::/24]:ID-type=IPV6_ADDR_SUBNET force
+C set [rid-3ffe:2::/24]:Network=3ffe:2:: force
+C set [rid-3ffe:2::/24]:Netmask=ffff:ff00:: force
+C add [Phase 2]:Connections=IPsec-3ffe::1/24-3ffe:2::/24
diff --git a/regress/sbin/ipsecctl/ike35.in b/regress/sbin/ipsecctl/ike35.in
index ff23b4ad183..fbf177e5fb8 100644
--- a/regress/sbin/ipsecctl/ike35.in
+++ b/regress/sbin/ipsecctl/ike35.in
@@ -1 +1 @@
-ike from 10.1.2.0/24 to 3ffe::1/24 peer 1.2.3.4
+ike from 3ffe:2::/24 to 3ffe::1/24 peer 1.2.3.4
diff --git a/regress/sbin/ipsecctl/ike35.ok b/regress/sbin/ipsecctl/ike35.ok
index 147cb9fa6ff..7339a2d7701 100644
--- a/regress/sbin/ipsecctl/ike35.ok
+++ b/regress/sbin/ipsecctl/ike35.ok
@@ -4,17 +4,17 @@ C set [peer-1.2.3.4]:Address=1.2.3.4 force
 C set [peer-1.2.3.4]:Configuration=mm-1.2.3.4 force
 C set [mm-1.2.3.4]:EXCHANGE_TYPE=ID_PROT force
 C add [mm-1.2.3.4]:Transforms=AES-SHA-GRP15-RSA_SIG force
-C set [IPsec-10.1.2.0/24-3ffe::1/24]:Phase=2 force
-C set [IPsec-10.1.2.0/24-3ffe::1/24]:ISAKMP-peer=peer-1.2.3.4 force
-C set [IPsec-10.1.2.0/24-3ffe::1/24]:Configuration=qm-10.1.2.0/24-3ffe::1/24 force
-C set [IPsec-10.1.2.0/24-3ffe::1/24]:Local-ID=lid-10.1.2.0/24 force
-C set [IPsec-10.1.2.0/24-3ffe::1/24]:Remote-ID=rid-3ffe::1/24 force
-C set [qm-10.1.2.0/24-3ffe::1/24]:EXCHANGE_TYPE=QUICK_MODE force
-C set [qm-10.1.2.0/24-3ffe::1/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
-C set [lid-10.1.2.0/24]:ID-type=IPV4_ADDR_SUBNET force
-C set [lid-10.1.2.0/24]:Network=10.1.2.0 force
-C set [lid-10.1.2.0/24]:Netmask=255.255.255.0 force
+C set [IPsec-3ffe:2::/24-3ffe::1/24]:Phase=2 force
+C set [IPsec-3ffe:2::/24-3ffe::1/24]:ISAKMP-peer=peer-1.2.3.4 force
+C set [IPsec-3ffe:2::/24-3ffe::1/24]:Configuration=qm-3ffe:2::/24-3ffe::1/24 force
+C set [IPsec-3ffe:2::/24-3ffe::1/24]:Local-ID=lid-3ffe:2::/24 force
+C set [IPsec-3ffe:2::/24-3ffe::1/24]:Remote-ID=rid-3ffe::1/24 force
+C set [qm-3ffe:2::/24-3ffe::1/24]:EXCHANGE_TYPE=QUICK_MODE force
+C set [qm-3ffe:2::/24-3ffe::1/24]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
+C set [lid-3ffe:2::/24]:ID-type=IPV6_ADDR_SUBNET force
+C set [lid-3ffe:2::/24]:Network=3ffe:2:: force
+C set [lid-3ffe:2::/24]:Netmask=ffff:ff00:: force
 C set [rid-3ffe::1/24]:ID-type=IPV6_ADDR_SUBNET force
 C set [rid-3ffe::1/24]:Network=3ffe::1 force
-C set [rid-3ffe::1/24]:Netmask=255.255.255.0 force
-C add [Phase 2]:Connections=IPsec-10.1.2.0/24-3ffe::1/24
+C set [rid-3ffe::1/24]:Netmask=ffff:ff00:: force
+C add [Phase 2]:Connections=IPsec-3ffe:2::/24-3ffe::1/24
diff --git a/regress/sbin/ipsecctl/ike37.ok b/regress/sbin/ipsecctl/ike37.ok
index 8a4ec0dae6f..9d735efe24b 100644
--- a/regress/sbin/ipsecctl/ike37.ok
+++ b/regress/sbin/ipsecctl/ike37.ok
@@ -19,8 +19,8 @@ C set [qm-3ffe:1::/64-3ffe:2::/64]:EXCHANGE_TYPE=QUICK_MODE force
 C set [qm-3ffe:1::/64-3ffe:2::/64]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
 C set [lid-3ffe:1::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [lid-3ffe:1::/64]:Network=3ffe:1:: force
-C set [lid-3ffe:1::/64]:Netmask=255.255.255.255 force
+C set [lid-3ffe:1::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C set [rid-3ffe:2::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [rid-3ffe:2::/64]:Network=3ffe:2:: force
-C set [rid-3ffe:2::/64]:Netmask=255.255.255.255 force
+C set [rid-3ffe:2::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C add [Phase 2]:Connections=IPsec-3ffe:1::/64-3ffe:2::/64
diff --git a/regress/sbin/ipsecctl/ike38.ok b/regress/sbin/ipsecctl/ike38.ok
index 1b4991d93d3..13b74889d00 100644
--- a/regress/sbin/ipsecctl/ike38.ok
+++ b/regress/sbin/ipsecctl/ike38.ok
@@ -19,10 +19,10 @@ C set [qm-3ffe:1::/64-3ffe:2::/64]:EXCHANGE_TYPE=QUICK_MODE force
 C set [qm-3ffe:1::/64-3ffe:2::/64]:Suites=QM-ESP-3DES-SHA-PFS-GRP15-SUITE force
 C set [lid-3ffe:1::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [lid-3ffe:1::/64]:Network=3ffe:1:: force
-C set [lid-3ffe:1::/64]:Netmask=255.255.255.255 force
+C set [lid-3ffe:1::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C set [rid-3ffe:2::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [rid-3ffe:2::/64]:Network=3ffe:2:: force
-C set [rid-3ffe:2::/64]:Netmask=255.255.255.255 force
+C set [rid-3ffe:2::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C add [Phase 2]:Connections=IPsec-3ffe:1::/64-3ffe:2::/64
 C set [Phase 1]:3ffe::29=peer-3ffe::29 force
 C set [peer-3ffe::29]:Phase=1 force
diff --git a/regress/sbin/ipsecctl/ike39.ok b/regress/sbin/ipsecctl/ike39.ok
index 0c29945db02..d11254f52e2 100644
--- a/regress/sbin/ipsecctl/ike39.ok
+++ b/regress/sbin/ipsecctl/ike39.ok
@@ -13,10 +13,10 @@ C set [qm-3ffe:1::/64-3ffe:2::/64]:EXCHANGE_TYPE=QUICK_MODE force
 C set [qm-3ffe:1::/64-3ffe:2::/64]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
 C set [lid-3ffe:1::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [lid-3ffe:1::/64]:Network=3ffe:1:: force
-C set [lid-3ffe:1::/64]:Netmask=255.255.255.255 force
+C set [lid-3ffe:1::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C set [rid-3ffe:2::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [rid-3ffe:2::/64]:Network=3ffe:2:: force
-C set [rid-3ffe:2::/64]:Netmask=255.255.255.255 force
+C set [rid-3ffe:2::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C add [Phase 2]:Connections=IPsec-3ffe:1::/64-3ffe:2::/64
 C set [Phase 1]:3ffe::29=peer-3ffe::29 force
 C set [peer-3ffe::29]:Phase=1 force
diff --git a/regress/sbin/ipsecctl/ike40.ok b/regress/sbin/ipsecctl/ike40.ok
index 2df6a5e8590..9761d98b353 100644
--- a/regress/sbin/ipsecctl/ike40.ok
+++ b/regress/sbin/ipsecctl/ike40.ok
@@ -13,10 +13,10 @@ C set [qm-3ffe:1::/64-3ffe:2::/64]:EXCHANGE_TYPE=QUICK_MODE force
 C set [qm-3ffe:1::/64-3ffe:2::/64]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
 C set [lid-3ffe:1::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [lid-3ffe:1::/64]:Network=3ffe:1:: force
-C set [lid-3ffe:1::/64]:Netmask=255.255.255.255 force
+C set [lid-3ffe:1::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C set [rid-3ffe:2::/64]:ID-type=IPV6_ADDR_SUBNET force
 C set [rid-3ffe:2::/64]:Network=3ffe:2:: force
-C set [rid-3ffe:2::/64]:Netmask=255.255.255.255 force
+C set [rid-3ffe:2::/64]:Netmask=ffff:ffff:ffff:ffff:: force
 C add [Phase 2]:Passive-Connections=IPsec-3ffe:1::/64-3ffe:2::/64
 C set [Phase 1]:3ffe::51=peer-3ffe::51 force
 C set [peer-3ffe::51]:Phase=1 force
diff --git a/regress/sbin/ipsecctl/ike44.in b/regress/sbin/ipsecctl/ike44.in
deleted file mode 100644
index 10aff973939..00000000000
--- a/regress/sbin/ipsecctl/ike44.in
+++ /dev/null
@@ -1 +0,0 @@
-ike from 1.1.1.1 to 2.2.2.2 main life 3600
diff --git a/regress/sbin/ipsecctl/ike44.ok b/regress/sbin/ipsecctl/ike44.ok
deleted file mode 100644
index 188d7080c32..00000000000
--- a/regress/sbin/ipsecctl/ike44.ok
+++ /dev/null
@@ -1,19 +0,0 @@
-C set [General]:Default-phase-1-lifetime=3600 force
-C set [Phase 1]:2.2.2.2=peer-2.2.2.2 force
-C set [peer-2.2.2.2]:Phase=1 force
-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 [IPsec-1.1.1.1-2.2.2.2]:Phase=2 force
-C set [IPsec-1.1.1.1-2.2.2.2]:ISAKMP-peer=peer-2.2.2.2 force
-C set [IPsec-1.1.1.1-2.2.2.2]:Configuration=qm-1.1.1.1-2.2.2.2 force
-C set [IPsec-1.1.1.1-2.2.2.2]:Local-ID=lid-1.1.1.1 force
-C set [IPsec-1.1.1.1-2.2.2.2]:Remote-ID=rid-2.2.2.2 force
-C set [qm-1.1.1.1-2.2.2.2]:EXCHANGE_TYPE=QUICK_MODE force
-C set [qm-1.1.1.1-2.2.2.2]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
-C set [lid-1.1.1.1]:ID-type=IPV4_ADDR force
-C set [lid-1.1.1.1]:Address=1.1.1.1 force
-C set [rid-2.2.2.2]:ID-type=IPV4_ADDR force
-C set [rid-2.2.2.2]:Address=2.2.2.2 force
-C add [Phase 2]:Connections=IPsec-1.1.1.1-2.2.2.2
diff --git a/regress/sbin/ipsecctl/ike45.in b/regress/sbin/ipsecctl/ike45.in
deleted file mode 100644
index 0851e70d03d..00000000000
--- a/regress/sbin/ipsecctl/ike45.in
+++ /dev/null
@@ -1 +0,0 @@
-ike from 1.1.1.1 to 2.2.2.2 quick life 1200
diff --git a/regress/sbin/ipsecctl/ike45.ok b/regress/sbin/ipsecctl/ike45.ok
deleted file mode 100644
index 338d7adcb76..00000000000
--- a/regress/sbin/ipsecctl/ike45.ok
+++ /dev/null
@@ -1,19 +0,0 @@
-C set [General]:Default-phase-2-lifetime=1200 force
-C set [Phase 1]:2.2.2.2=peer-2.2.2.2 force
-C set [peer-2.2.2.2]:Phase=1 force
-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 [IPsec-1.1.1.1-2.2.2.2]:Phase=2 force
-C set [IPsec-1.1.1.1-2.2.2.2]:ISAKMP-peer=peer-2.2.2.2 force
-C set [IPsec-1.1.1.1-2.2.2.2]:Configuration=qm-1.1.1.1-2.2.2.2 force
-C set [IPsec-1.1.1.1-2.2.2.2]:Local-ID=lid-1.1.1.1 force
-C set [IPsec-1.1.1.1-2.2.2.2]:Remote-ID=rid-2.2.2.2 force
-C set [qm-1.1.1.1-2.2.2.2]:EXCHANGE_TYPE=QUICK_MODE force
-C set [qm-1.1.1.1-2.2.2.2]:Suites=QM-ESP-AES-SHA2-256-PFS-GRP15-SUITE force
-C set [lid-1.1.1.1]:ID-type=IPV4_ADDR force
-C set [lid-1.1.1.1]:Address=1.1.1.1 force
-C set [rid-2.2.2.2]:ID-type=IPV4_ADDR force
-C set [rid-2.2.2.2]:Address=2.2.2.2 force
-C add [Phase 2]:Connections=IPsec-1.1.1.1-2.2.2.2
diff --git a/regress/sbin/ipsecctl/ikefail4.in b/regress/sbin/ipsecctl/ikefail4.in
new file mode 100644
index 00000000000..8ad27e31ef7
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikefail4.in
@@ -0,0 +1 @@
+ike from 3ffe::1/24 to 10.1.2.0/24 peer 3ffe::1
diff --git a/regress/sbin/ipsecctl/ikefail4.ok b/regress/sbin/ipsecctl/ikefail4.ok
new file mode 100644
index 00000000000..250d9f5726c
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikefail4.ok
@@ -0,0 +1,2 @@
+stdin: 1: rule expands to no valid combination
+ipsecctl: Syntax error in config file: ipsec rules not loaded
diff --git a/regress/sbin/ipsecctl/ikefail5.in b/regress/sbin/ipsecctl/ikefail5.in
new file mode 100644
index 00000000000..db240853665
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikefail5.in
@@ -0,0 +1 @@
+ike from 10.1.2.0/24 to 3ffe::1/24 peer 3ffe::1
diff --git a/regress/sbin/ipsecctl/ikefail5.ok b/regress/sbin/ipsecctl/ikefail5.ok
new file mode 100644
index 00000000000..250d9f5726c
--- /dev/null
+++ b/regress/sbin/ipsecctl/ikefail5.ok
@@ -0,0 +1,2 @@
+stdin: 1: rule expands to no valid combination
+ipsecctl: Syntax error in config file: ipsec rules not loaded