test for swapped rules

3 files changed, 96 insertions, 2 deletions

diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index c184648f0aa..9640d7c76ee 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2005/10/30 20:05:24 hshoexer Exp $
+# $OpenBSD: Makefile,v 1.10 2005/11/26 23:27:34 hshoexer Exp $
 
 # TARGETS
 # ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
@@ -9,7 +9,7 @@
 
 IPSECTESTS=1 2 3 4 5 6 7 8 9 10 11 12 13
 TCPMD5TESTS=1 2 3
-SATESTS=1 2 3 4 5 6 7 8
+SATESTS=1 2 3 4 5 6 7 8 9
 IKETESTS=1 2 3 4 5 6 7 8
 
 SHELL=/bin/sh
diff --git a/regress/sbin/ipsecctl/sa9.in b/regress/sbin/ipsecctl/sa9.in
new file mode 100644
index 00000000000..846ddb60c2b
--- /dev/null
+++ b/regress/sbin/ipsecctl/sa9.in
@@ -0,0 +1,42 @@
+esp from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef:0xbeef1ead \
+	authkey file "DIR/ak256:DIR/ak256" \
+	enckey file "DIR/ek160:DIR/ek160"
+esp from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef:0xbeef2ead \
+	enc 3des-cbc \
+	auth hmac-sha1 \
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek192:DIR/ek192"
+esp from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef:0xbeef3ead \
+	enc des-cbc \
+	auth hmac-sha1 \
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek64:DIR/ek64"
+esp from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef:0xbeef4ead \
+	enc aes \
+	auth hmac-sha1 \
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek128:DIR/ek128"
+esp from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef:0xbeef5ead \
+	enc aesctr \
+	auth hmac-sha1 \
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek160:DIR/ek160"
+esp from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef:0xbeef6ead \
+	enc blowfish \
+	auth hmac-sha1 \
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek160:DIR/ek160"
+esp from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef:0xbeef7ead \
+	enc cast128 \
+	auth hmac-sha1 \
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek128:DIR/ek128"
+esp from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef:0xbeef8ead \
+	enc null \
+	auth hmac-sha1 \
+	authkey file "DIR/ak160:DIR/ak160"
+esp from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef:0xbeef9ead \
+	enc skipjack \
+	auth hmac-sha1 \
+	authkey file "DIR/ak160:DIR/ak160" \
+	enckey file "DIR/ek80:DIR/ek80"
diff --git a/regress/sbin/ipsecctl/sa9.ok b/regress/sbin/ipsecctl/sa9.ok
new file mode 100644
index 00000000000..fb7f3253c2e
--- /dev/null
+++ b/regress/sbin/ipsecctl/sa9.ok
@@ -0,0 +1,52 @@
+esp tunnel from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef auth hmac-sha2-256 enc aesctr
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 2.2.2.2 to 1.1.1.1 spi 0xbeef1ead auth hmac-sha2-256 enc aesctr
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef auth hmac-sha1 enc 3des-cbc
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 2.2.2.2 to 1.1.1.2 spi 0xbeef2ead auth hmac-sha1 enc 3des-cbc
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef auth hmac-sha1 enc des-cbc
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeee
+esp tunnel from 2.2.2.2 to 1.1.1.3 spi 0xbeef3ead auth hmac-sha1 enc des-cbc
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeee
+esp tunnel from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef auth hmac-sha1 enc aes
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 2.2.2.2 to 1.1.1.4 spi 0xbeef4ead auth hmac-sha1 enc aes
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef auth hmac-sha1 enc aesctr
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 2.2.2.2 to 1.1.1.5 spi 0xbeef5ead auth hmac-sha1 enc aesctr
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef auth hmac-sha1 enc blowfish
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 2.2.2.2 to 1.1.1.6 spi 0xbeef6ead auth hmac-sha1 enc blowfish
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef auth hmac-sha1 enc cast128
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 2.2.2.2 to 1.1.1.7 spi 0xbeef7ead auth hmac-sha1 enc cast128
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+esp tunnel from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef auth hmac-sha1 enc null
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+esp tunnel from 2.2.2.2 to 1.1.1.8 spi 0xbeef8ead auth hmac-sha1 enc null
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+esp tunnel from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef auth hmac-sha1 enc skipjack
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeee
+esp tunnel from 2.2.2.2 to 1.1.1.9 spi 0xbeef9ead auth hmac-sha1 enc skipjack
+	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	enckey 0xeeeeeeeeeeeeeeeeeeee