summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
authorHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-07-21 12:30:45 +0000
committerHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-07-21 12:30:45 +0000
commitf160b89f7e62a1626d93d447019216da9ddd1889 (patch)
treea40725b39ee5f10442f28b8650a8ec669ef12d5d /regress
parentb9ef3902e368f27af50a22f215f98ea3ba205b33 (diff)
update and enable that test
Diffstat (limited to 'regress')
-rw-r--r--regress/sbin/ipsecctl/Makefile4
-rw-r--r--regress/sbin/ipsecctl/ike47.ok28
2 files changed, 30 insertions, 2 deletions
diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index 6a99256f76a..c2e71e44e5b 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2006/06/20 21:44:30 hshoexer Exp $
+# $OpenBSD: Makefile,v 1.37 2006/07/21 12:30:44 hshoexer Exp $
# TARGETS
# ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -18,7 +18,7 @@ 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
diff --git a/regress/sbin/ipsecctl/ike47.ok b/regress/sbin/ipsecctl/ike47.ok
index acf3ca56e7c..43d908869e6 100644
--- a/regress/sbin/ipsecctl/ike47.ok
+++ b/regress/sbin/ipsecctl/ike47.ok
@@ -3,8 +3,36 @@ C set [peer-default]:Phase=1 force
C set [peer-default]:Configuration=mm-default force
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-PFS-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 force
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-PFS-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