adopt to recent changes and add some more tests

21 files changed, 69 insertions, 20 deletions

diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index f6bcd9aaa4b..229db023afc 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2006/04/13 12:04:34 hshoexer Exp $
+# $OpenBSD: Makefile,v 1.20 2006/04/19 16:13:41 hshoexer Exp $
 
 # TARGETS
 # ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -7,7 +7,7 @@
 # sa:	 same as above, but for SA rules.
 # ike:	 same as above, but for ike rules.
 
-IPSECTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
+IPSECTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
 TCPMD5TESTS=1 2 3
 SATESTS=1 2 3 4 5 6 7 8 9 10 11 12
 SAFAIL=1
diff --git a/regress/sbin/ipsecctl/ipsec1.ok b/regress/sbin/ipsecctl/ipsec1.ok
index c6b6c697983..a819260e4e5 100644
--- a/regress/sbin/ipsecctl/ipsec1.ok
+++ b/regress/sbin/ipsecctl/ipsec1.ok
@@ -1,2 +1,2 @@
 flow esp out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2 type require
-flow esp in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 type use
+flow esp in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 type require
diff --git a/regress/sbin/ipsecctl/ipsec10.ok b/regress/sbin/ipsecctl/ipsec10.ok
index 41f24461738..422f3c183ba 100644
--- a/regress/sbin/ipsecctl/ipsec10.ok
+++ b/regress/sbin/ipsecctl/ipsec10.ok
@@ -1,2 +1,2 @@
 flow ah out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
-flow ah in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
+flow ah in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
diff --git a/regress/sbin/ipsecctl/ipsec11.ok b/regress/sbin/ipsecctl/ipsec11.ok
index 6e66d6da947..3a6c5ac7727 100644
--- a/regress/sbin/ipsecctl/ipsec11.ok
+++ b/regress/sbin/ipsecctl/ipsec11.ok
@@ -1,2 +1,2 @@
 flow ah out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
-flow ah in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
+flow ah in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
diff --git a/regress/sbin/ipsecctl/ipsec12.ok b/regress/sbin/ipsecctl/ipsec12.ok
index 6e66d6da947..3a6c5ac7727 100644
--- a/regress/sbin/ipsecctl/ipsec12.ok
+++ b/regress/sbin/ipsecctl/ipsec12.ok
@@ -1,2 +1,2 @@
 flow ah out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
-flow ah in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
+flow ah in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
diff --git a/regress/sbin/ipsecctl/ipsec13.ok b/regress/sbin/ipsecctl/ipsec13.ok
index 6e6136f6f3a..cc614ebc04e 100644
--- a/regress/sbin/ipsecctl/ipsec13.ok
+++ b/regress/sbin/ipsecctl/ipsec13.ok
@@ -1,2 +1,2 @@
 flow esp out from 1.1.1.1 to 0.0.0.0/0 peer 2.2.2.2 type require
-flow esp in from 0.0.0.0/0 to 1.1.1.1 peer 2.2.2.2 type use
+flow esp in from 0.0.0.0/0 to 1.1.1.1 peer 2.2.2.2 type require
diff --git a/regress/sbin/ipsecctl/ipsec15.ok b/regress/sbin/ipsecctl/ipsec15.ok
index c3b8bf4912a..344a452fb2b 100644
--- a/regress/sbin/ipsecctl/ipsec15.ok
+++ b/regress/sbin/ipsecctl/ipsec15.ok
@@ -1,4 +1,4 @@
 flow esp out from 1.1.1.0/24 to 2.2.2.0/24 local 192.168.0.1 peer 192.168.100.1 type require
-flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1 type use
+flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1 type require
 flow esp out from 1.1.1.0/24 to 2.2.2.0/24 local 192.168.0.1 peer 192.168.100.1 type require
-flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1 type use
+flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1 type require
diff --git a/regress/sbin/ipsecctl/ipsec16.ok b/regress/sbin/ipsecctl/ipsec16.ok
index 3aef68ce19d..c3a0f376786 100644
--- a/regress/sbin/ipsecctl/ipsec16.ok
+++ b/regress/sbin/ipsecctl/ipsec16.ok
@@ -3,4 +3,4 @@ b = "2.2.2.0/24"
 l = "192.168.0.1"
 p = "192.168.100.1"
 flow esp out from 1.1.1.0/24 to 2.2.2.0/24 local 192.168.0.1 peer 192.168.100.1 type require
-flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1 type use
+flow esp in from 2.2.2.0/24 to 1.1.1.0/24 local 192.168.0.1 peer 192.168.100.1 type require
diff --git a/regress/sbin/ipsecctl/ipsec19.ok b/regress/sbin/ipsecctl/ipsec19.ok
index 403e0cb47c2..a24da708f77 100644
--- a/regress/sbin/ipsecctl/ipsec19.ok
+++ b/regress/sbin/ipsecctl/ipsec19.ok
@@ -1,4 +1,4 @@
 flow esp out proto etherip from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2 type require
-flow esp in proto etherip from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 type use
+flow esp in proto etherip from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 type require
 flow esp out proto etherip from 2.2.2.2 to 3.3.3.3 peer 3.3.3.3 type require
-flow esp in proto etherip from 3.3.3.3 to 2.2.2.2 peer 3.3.3.3 type use
+flow esp in proto etherip from 3.3.3.3 to 2.2.2.2 peer 3.3.3.3 type require
diff --git a/regress/sbin/ipsecctl/ipsec2.ok b/regress/sbin/ipsecctl/ipsec2.ok
index 0bbec5dfc7f..f4ab78e7c19 100644
--- a/regress/sbin/ipsecctl/ipsec2.ok
+++ b/regress/sbin/ipsecctl/ipsec2.ok
@@ -1,2 +1,2 @@
 flow esp out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
-flow esp in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
+flow esp in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
diff --git a/regress/sbin/ipsecctl/ipsec20.in b/regress/sbin/ipsecctl/ipsec20.in
new file mode 100644
index 00000000000..cfe05488985
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec20.in
@@ -0,0 +1,7 @@
+flow esp from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3
+flow esp from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type use
+flow esp from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type require
+flow esp from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type acquire
+flow esp from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type dontacq
+flow esp from 192.168.3.3 to 192.168.3.2 type bypass
+flow esp from 192.168.3.3 to 192.168.3.2 type deny
diff --git a/regress/sbin/ipsecctl/ipsec20.ok b/regress/sbin/ipsecctl/ipsec20.ok
new file mode 100644
index 00000000000..1ac49418e17
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec20.ok
@@ -0,0 +1,14 @@
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type require
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type require
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type use
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type use
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type require
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type require
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type acquire
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type acquire
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type dontacq
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type dontacq
+flow esp out from 192.168.3.3 to 192.168.3.2 type bypass
+flow esp in from 192.168.3.2 to 192.168.3.3 type bypass
+flow esp out from 192.168.3.3 to 192.168.3.2 type deny
+flow esp in from 192.168.3.2 to 192.168.3.3 type deny
diff --git a/regress/sbin/ipsecctl/ipsec21.in b/regress/sbin/ipsecctl/ipsec21.in
new file mode 100644
index 00000000000..4b45729abca
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec21.in
@@ -0,0 +1,14 @@
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type use
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type use
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type require
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type require
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type acquire
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type acquire
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type dontacq
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type dontacq
+flow esp out from 192.168.3.3 to 192.168.3.2 type bypass
+flow esp in from 192.168.3.2 to 192.168.3.3 type bypass
+flow esp out from 192.168.3.3 to 192.168.3.2 type deny
+flow esp in from 192.168.3.2 to 192.168.3.3 type deny
diff --git a/regress/sbin/ipsecctl/ipsec21.ok b/regress/sbin/ipsecctl/ipsec21.ok
new file mode 100644
index 00000000000..1ac49418e17
--- /dev/null
+++ b/regress/sbin/ipsecctl/ipsec21.ok
@@ -0,0 +1,14 @@
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type require
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type require
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type use
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type use
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type require
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type require
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type acquire
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type acquire
+flow esp out from 192.168.3.3 to 192.168.3.2 peer 192.168.3.3 type dontacq
+flow esp in from 192.168.3.2 to 192.168.3.3 peer 192.168.3.3 type dontacq
+flow esp out from 192.168.3.3 to 192.168.3.2 type bypass
+flow esp in from 192.168.3.2 to 192.168.3.3 type bypass
+flow esp out from 192.168.3.3 to 192.168.3.2 type deny
+flow esp in from 192.168.3.2 to 192.168.3.3 type deny
diff --git a/regress/sbin/ipsecctl/ipsec3.ok b/regress/sbin/ipsecctl/ipsec3.ok
index 35fcc89dd50..0a510da2cdd 100644
--- a/regress/sbin/ipsecctl/ipsec3.ok
+++ b/regress/sbin/ipsecctl/ipsec3.ok
@@ -1,2 +1,2 @@
 flow esp out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2 type require
-flow esp in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 type use
+flow esp in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 type require
diff --git a/regress/sbin/ipsecctl/ipsec4.ok b/regress/sbin/ipsecctl/ipsec4.ok
index bbf4d76ed60..9e7d8286a82 100644
--- a/regress/sbin/ipsecctl/ipsec4.ok
+++ b/regress/sbin/ipsecctl/ipsec4.ok
@@ -1,2 +1,2 @@
 flow esp out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
-flow esp in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
+flow esp in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
diff --git a/regress/sbin/ipsecctl/ipsec5.ok b/regress/sbin/ipsecctl/ipsec5.ok
index 7d38398585b..33b661e68b4 100644
--- a/regress/sbin/ipsecctl/ipsec5.ok
+++ b/regress/sbin/ipsecctl/ipsec5.ok
@@ -1,2 +1,2 @@
 flow esp out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
-flow esp in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
+flow esp in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
diff --git a/regress/sbin/ipsecctl/ipsec6.ok b/regress/sbin/ipsecctl/ipsec6.ok
index 7d38398585b..33b661e68b4 100644
--- a/regress/sbin/ipsecctl/ipsec6.ok
+++ b/regress/sbin/ipsecctl/ipsec6.ok
@@ -1,2 +1,2 @@
 flow esp out from 4.4.0.0/16 to 3.3.3.0/24 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
-flow esp in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
+flow esp in from 3.3.3.0/24 to 4.4.0.0/16 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
diff --git a/regress/sbin/ipsecctl/ipsec7.ok b/regress/sbin/ipsecctl/ipsec7.ok
index 136afbbae75..f3da1c9de92 100644
--- a/regress/sbin/ipsecctl/ipsec7.ok
+++ b/regress/sbin/ipsecctl/ipsec7.ok
@@ -1,2 +1,2 @@
 flow ah out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2 type require
-flow ah in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 type use
+flow ah in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 type require
diff --git a/regress/sbin/ipsecctl/ipsec8.ok b/regress/sbin/ipsecctl/ipsec8.ok
index fa8d3ded8f7..183c383c83b 100644
--- a/regress/sbin/ipsecctl/ipsec8.ok
+++ b/regress/sbin/ipsecctl/ipsec8.ok
@@ -1,2 +1,2 @@
 flow ah out from 1.1.1.1 to 2.2.2.2 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
-flow ah in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type use
+flow ah in from 2.2.2.2 to 1.1.1.1 peer 2.2.2.2 srcid host1.one.net dstid host2.two.net type require
diff --git a/regress/sbin/ipsecctl/ipsec9.ok b/regress/sbin/ipsecctl/ipsec9.ok
index 61c7a697cb3..2b4699be2a3 100644
--- a/regress/sbin/ipsecctl/ipsec9.ok
+++ b/regress/sbin/ipsecctl/ipsec9.ok
@@ -1,2 +1,2 @@
 flow ah out from 1.1.1.1 to 3.3.3.0/24 peer 2.2.2.2 type require
-flow ah in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 type use
+flow ah in from 3.3.3.0/24 to 1.1.1.1 peer 2.2.2.2 type require