summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-06-02 00:25:00 +0000
committerHans-Joerg Hoexer <hshoexer@cvs.openbsd.org>2006-06-02 00:25:00 +0000
commitca82df47d3c57652f46a26373a03638f404f8607 (patch)
tree844cccbc034cbd79afd0c94fd2862b9071774768
parentde79c9dc0be22543519cc63dae34eee1dec4a19c (diff)
fix this tests. Enable a bunch of new sa tests
-rw-r--r--regress/sbin/ipsecctl/Makefile6
-rw-r--r--regress/sbin/ipsecctl/ipsecfail1.in2
-rw-r--r--regress/sbin/ipsecctl/ipsecfail2.in1
-rw-r--r--regress/sbin/ipsecctl/ipsecfail2.ok2
4 files changed, 4 insertions, 7 deletions
diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index 0f662305c16..cf250e2f5f0 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2006/05/31 11:34:24 todd Exp $
+# $OpenBSD: Makefile,v 1.24 2006/06/02 00:24:59 hshoexer Exp $
# TARGETS
# ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -11,9 +11,9 @@ IPSECTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
IPSECTESTS+=25 26 27 28 29 30 31 32 33 34 35 36 37 38 40 41 42 43 44
#IPSECTESTS+=39
TCPMD5TESTS=1 2 3
-SATESTS=1 2 3 4 5 6 7 8 9 10 11 12
+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
+IPSECFAIL=1
IKEFAIL=1
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 24
diff --git a/regress/sbin/ipsecctl/ipsecfail1.in b/regress/sbin/ipsecctl/ipsecfail1.in
index d66603ff651..df5904574b9 100644
--- a/regress/sbin/ipsecctl/ipsecfail1.in
+++ b/regress/sbin/ipsecctl/ipsecfail1.in
@@ -1 +1 @@
-flow esp from 3ffe:2::1 to any peer 3ffe::2
+flow from 3ffe::1 to 1.1.1.1
diff --git a/regress/sbin/ipsecctl/ipsecfail2.in b/regress/sbin/ipsecctl/ipsecfail2.in
deleted file mode 100644
index df5904574b9..00000000000
--- a/regress/sbin/ipsecctl/ipsecfail2.in
+++ /dev/null
@@ -1 +0,0 @@
-flow from 3ffe::1 to 1.1.1.1
diff --git a/regress/sbin/ipsecctl/ipsecfail2.ok b/regress/sbin/ipsecctl/ipsecfail2.ok
deleted file mode 100644
index 250d9f5726c..00000000000
--- a/regress/sbin/ipsecctl/ipsecfail2.ok
+++ /dev/null
@@ -1,2 +0,0 @@
-stdin: 1: rule expands to no valid combination
-ipsecctl: Syntax error in config file: ipsec rules not loaded