From f4d3edd65d6af48c77a133047cccdd9c005c726b Mon Sep 17 00:00:00 2001 From: Hans-Joerg Hoexer Date: Tue, 9 Aug 2005 14:58:11 +0000 Subject: Make tests more readable by using predefined keyfiles. Add test for tcpmd5 using a key from a file. --- regress/sbin/ipsecctl/Makefile | 4 ++-- regress/sbin/ipsecctl/ak128 | 1 + regress/sbin/ipsecctl/ak160 | 1 + regress/sbin/ipsecctl/ak256 | 1 + regress/sbin/ipsecctl/ak384 | 1 + regress/sbin/ipsecctl/ak512 | 1 + regress/sbin/ipsecctl/ek128 | 1 + regress/sbin/ipsecctl/ek160 | 1 + regress/sbin/ipsecctl/ek192 | 1 + regress/sbin/ipsecctl/ek64 | 1 + regress/sbin/ipsecctl/ek80 | 1 + regress/sbin/ipsecctl/sa5.in | 18 +++++++++--------- regress/sbin/ipsecctl/sa6.in | 34 +++++++++++++++++----------------- regress/sbin/ipsecctl/sa6.ok | 4 ++-- regress/sbin/ipsecctl/tcpmd53.in | 1 + regress/sbin/ipsecctl/tcpmd53.ok | 2 ++ 16 files changed, 43 insertions(+), 30 deletions(-) create mode 100644 regress/sbin/ipsecctl/ak128 create mode 100644 regress/sbin/ipsecctl/ak160 create mode 100644 regress/sbin/ipsecctl/ak256 create mode 100644 regress/sbin/ipsecctl/ak384 create mode 100644 regress/sbin/ipsecctl/ak512 create mode 100644 regress/sbin/ipsecctl/ek128 create mode 100644 regress/sbin/ipsecctl/ek160 create mode 100644 regress/sbin/ipsecctl/ek192 create mode 100644 regress/sbin/ipsecctl/ek64 create mode 100644 regress/sbin/ipsecctl/ek80 create mode 100644 regress/sbin/ipsecctl/tcpmd53.in create mode 100644 regress/sbin/ipsecctl/tcpmd53.ok diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile index 1d6bd37abbe..91e3d12096f 100644 --- a/regress/sbin/ipsecctl/Makefile +++ b/regress/sbin/ipsecctl/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2005/08/09 12:45:56 hshoexer Exp $ +# $OpenBSD: Makefile,v 1.5 2005/08/09 14:58:09 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. IPSECTESTS=1 2 3 4 5 6 7 8 9 10 11 12 -TCPMD5TESTS=1 2 +TCPMD5TESTS=1 2 3 SATESTS=1 2 3 4 5 6 SHELL=/bin/sh diff --git a/regress/sbin/ipsecctl/ak128 b/regress/sbin/ipsecctl/ak128 new file mode 100644 index 00000000000..2abac58e66d --- /dev/null +++ b/regress/sbin/ipsecctl/ak128 @@ -0,0 +1 @@ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/regress/sbin/ipsecctl/ak160 b/regress/sbin/ipsecctl/ak160 new file mode 100644 index 00000000000..f26486d27ad --- /dev/null +++ b/regress/sbin/ipsecctl/ak160 @@ -0,0 +1 @@ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/regress/sbin/ipsecctl/ak256 b/regress/sbin/ipsecctl/ak256 new file mode 100644 index 00000000000..93f308c87c1 --- /dev/null +++ b/regress/sbin/ipsecctl/ak256 @@ -0,0 +1 @@ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/regress/sbin/ipsecctl/ak384 b/regress/sbin/ipsecctl/ak384 new file mode 100644 index 00000000000..d06c50ec0ca --- /dev/null +++ b/regress/sbin/ipsecctl/ak384 @@ -0,0 +1 @@ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/regress/sbin/ipsecctl/ak512 b/regress/sbin/ipsecctl/ak512 new file mode 100644 index 00000000000..fc0b63bcb2f --- /dev/null +++ b/regress/sbin/ipsecctl/ak512 @@ -0,0 +1 @@ +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/regress/sbin/ipsecctl/ek128 b/regress/sbin/ipsecctl/ek128 new file mode 100644 index 00000000000..62231ac9ba8 --- /dev/null +++ b/regress/sbin/ipsecctl/ek128 @@ -0,0 +1 @@ +eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/ek160 b/regress/sbin/ipsecctl/ek160 new file mode 100644 index 00000000000..9d0eb86bc70 --- /dev/null +++ b/regress/sbin/ipsecctl/ek160 @@ -0,0 +1 @@ +eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/ek192 b/regress/sbin/ipsecctl/ek192 new file mode 100644 index 00000000000..d7e715e4b67 --- /dev/null +++ b/regress/sbin/ipsecctl/ek192 @@ -0,0 +1 @@ +eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/ek64 b/regress/sbin/ipsecctl/ek64 new file mode 100644 index 00000000000..8ad64c89e15 --- /dev/null +++ b/regress/sbin/ipsecctl/ek64 @@ -0,0 +1 @@ +eeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/ek80 b/regress/sbin/ipsecctl/ek80 new file mode 100644 index 00000000000..24af6639391 --- /dev/null +++ b/regress/sbin/ipsecctl/ek80 @@ -0,0 +1 @@ +eeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/sa5.in b/regress/sbin/ipsecctl/sa5.in index 658802f13d4..ae9032fa8f2 100644 --- a/regress/sbin/ipsecctl/sa5.in +++ b/regress/sbin/ipsecctl/sa5.in @@ -1,18 +1,18 @@ ah from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef:0xbeef1ead \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak256:ak256" ah from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef:0xbeef2ead auth hmac-md5 \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak128:ak128" ah from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef:0xbeef3ead auth hmac-ripemd160 \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak160:ak160" ah from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef:0xbeef4ead auth hmac-sha1 \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak160:ak160" ah from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef:0xbeef5ead auth hmac-sha2-256 \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak256:ak256" ah from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef:0xbeef6ead auth hmac-sha2-384 \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak384:ak384" ah from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef:0xbeef7ead auth hmac-sha2-512 \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak512:ak512" ah from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef:0xbeef8ead auth md5 \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak128:ak128" ah from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef:0xbeef9ead auth sha1 \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak160:ak160" diff --git a/regress/sbin/ipsecctl/sa6.in b/regress/sbin/ipsecctl/sa6.in index dea66ce5c75..46d0ec17ade 100644 --- a/regress/sbin/ipsecctl/sa6.in +++ b/regress/sbin/ipsecctl/sa6.in @@ -1,34 +1,34 @@ esp from 1.1.1.1 to 2.2.2.2 spi 0x1eadbeef:0xbeef1ead \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + authkey file "ak256:ak256" \ + enckey file "ek160:ek160" esp from 1.1.1.2 to 2.2.2.2 spi 0x2eadbeef:0xbeef2ead auth hmac-sha1 \ enc 3des-cbc \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + authkey file "ak160:ak160" \ + enckey file "ek192:ek192" esp from 1.1.1.3 to 2.2.2.2 spi 0x3eadbeef:0xbeef3ead auth hmac-sha1 \ enc des-cbc \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeee + authkey file "ak160:ak160" \ + enckey file "ek64:ek64" esp from 1.1.1.4 to 2.2.2.2 spi 0x4eadbeef:0xbeef4ead auth hmac-sha1 \ enc aes \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + authkey file "ak160:ak160" \ + enckey file "ek128:ek128" esp from 1.1.1.5 to 2.2.2.2 spi 0x5eadbeef:0xbeef5ead auth hmac-sha1 \ enc aesctr \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + authkey file "ak160:ak160" \ + enckey file "ek160:ek160" esp from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef:0xbeef6ead auth hmac-sha1 \ enc blowfish \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeee + authkey file "ak160:ak160" \ + enckey file "ek160:ek160" esp from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef:0xbeef7ead auth hmac-sha1 \ enc cast128 \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee + authkey file "ak160:ak160" \ + enckey file "ek128:ek128" esp from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef:0xbeef8ead auth hmac-sha1 \ enc null \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + authkey file "ak160:ak160" esp from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef:0xbeef9ead auth hmac-sha1 \ enc skipjack \ - authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa:0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \ - enckey 0xeeeeeeeeeeeeeeeeeeee:0xeeeeeeeeeeeeeeeeeeee + authkey file "ak160:ak160" \ + enckey file "ek80:ek80" diff --git a/regress/sbin/ipsecctl/sa6.ok b/regress/sbin/ipsecctl/sa6.ok index 18d6576d9ac..2c34597fd27 100644 --- a/regress/sbin/ipsecctl/sa6.ok +++ b/regress/sbin/ipsecctl/sa6.ok @@ -30,10 +30,10 @@ esp from 2.2.2.2 to 1.1.1.5 spi 0xbeef5ead auth hmac-sha1 enc aesctr enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp from 1.1.1.6 to 2.2.2.2 spi 0x6eadbeef auth hmac-sha1 enc blowfish authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - enckey 0xeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp from 2.2.2.2 to 1.1.1.6 spi 0xbeef6ead auth hmac-sha1 enc blowfish authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa - enckey 0xeeeeeeeeeeeeeeee + enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee esp from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef auth hmac-sha1 enc cast128 authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa enckey 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee diff --git a/regress/sbin/ipsecctl/tcpmd53.in b/regress/sbin/ipsecctl/tcpmd53.in new file mode 100644 index 00000000000..ca037ab4a25 --- /dev/null +++ b/regress/sbin/ipsecctl/tcpmd53.in @@ -0,0 +1 @@ +tcpmd5 from 1.1.1.1 to 2.2.2.2 spi 0x2000:0x2001 authkey file "ak160:ak160" diff --git a/regress/sbin/ipsecctl/tcpmd53.ok b/regress/sbin/ipsecctl/tcpmd53.ok new file mode 100644 index 00000000000..90ecabfcb74 --- /dev/null +++ b/regress/sbin/ipsecctl/tcpmd53.ok @@ -0,0 +1,2 @@ +tcpmd5 from 1.1.1.1 to 2.2.2.2 spi 0x00002000 authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa +tcpmd5 from 2.2.2.2 to 1.1.1.1 spi 0x00002001 authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -- cgit v1.2.3