From 5078e5337323159ff8c293e7ae335a974fd0371e Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 10 Aug 2021 15:24:48 +0100 Subject: Testsuite: testcase shuffling --- test/scripts/4500-DKIM/4510 | 92 ++++++++++++++++++++++++++++++++++++ test/scripts/4500-DKIM/4511 | 111 ++++++++++++++++++++++++++++++++++++++++++++ test/scripts/4500-DKIM/4512 | 85 +++++++++++++++++++++++++++++++++ test/scripts/4500-DKIM/4513 | 15 ++++++ test/scripts/4500-DKIM/4514 | 14 ++++++ test/scripts/4500-DKIM/4515 | 54 +++++++++++++++++++++ test/scripts/4500-DKIM/4519 | 68 +++++++++++++++++++++++++++ test/scripts/4500-DKIM/4520 | 92 ------------------------------------ test/scripts/4500-DKIM/4521 | 111 -------------------------------------------- test/scripts/4500-DKIM/4522 | 85 --------------------------------- test/scripts/4500-DKIM/4523 | 15 ------ test/scripts/4500-DKIM/4524 | 14 ------ test/scripts/4500-DKIM/4525 | 54 --------------------- test/scripts/4500-DKIM/4530 | 68 --------------------------- 14 files changed, 439 insertions(+), 439 deletions(-) create mode 100644 test/scripts/4500-DKIM/4510 create mode 100644 test/scripts/4500-DKIM/4511 create mode 100644 test/scripts/4500-DKIM/4512 create mode 100644 test/scripts/4500-DKIM/4513 create mode 100644 test/scripts/4500-DKIM/4514 create mode 100644 test/scripts/4500-DKIM/4515 create mode 100644 test/scripts/4500-DKIM/4519 delete mode 100644 test/scripts/4500-DKIM/4520 delete mode 100644 test/scripts/4500-DKIM/4521 delete mode 100644 test/scripts/4500-DKIM/4522 delete mode 100644 test/scripts/4500-DKIM/4523 delete mode 100644 test/scripts/4500-DKIM/4524 delete mode 100644 test/scripts/4500-DKIM/4525 delete mode 100644 test/scripts/4500-DKIM/4530 (limited to 'test/scripts') diff --git a/test/scripts/4500-DKIM/4510 b/test/scripts/4500-DKIM/4510 new file mode 100644 index 000000000..f073be9d3 --- /dev/null +++ b/test/scripts/4500-DKIM/4510 @@ -0,0 +1,92 @@ +# DKIM signing +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# single header signed +exim -DOPT=From -odf a@test.ex +From: nobody@example.com +From: second@example.com + +content +**** +# +# single header, oversigned, with timestamps +exim -DOPT=From:From -DTIMES=10 -odf b@test.ex +From: nobody@example.com + +content +**** +# +# no header, multi-sign +exim -DOPT=From:=X-Mine -odf b10@test.ex +From: nobody@example.com + +content +**** +# +# double header, multi-sign +exim -DOPT=From:=X-Mine -odf b12@test.ex +From: nobody@example.com +X-mine: one +X-mine: two + +content +**** +# +# +# no header, always-oversign +exim -DOPT=+X-Mine -odf b20@test.ex +From: nobody@example.com + +content +**** +# +# double header, always-oversign +exim -DOPT=+X-Mine -odf b22@test.ex +From: nobody@example.com +X-mine: one +X-mine: two + +content +**** +# +## default header set +# cannot test that as it includes Date: so results in a varying signature +#exim -DHEADERS_MAXSIZE=y -odf c@test.ex +#From: nobody@example.com +# +#content +#**** +## +# check that on signing we warn in debug mode about verify problems +exim -d-all+acl -DOPT=From -DSELECTOR=sel_bad -odf d@test.ex +From: nobody@example.com + +content +**** +# +# check dkim_strict results in a defer (even with an expansion) +exim -DOPT=From '-DSTRICT=${if ={1}{1}{true}}' '-DTIMES=${bogus}' -odf '-f<>' e0@test.ex +From: nobody@example.com + +content +**** +# +# check that an empty dkim_privatekey overrides dkim_strict +exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf e@test.ex +From: nobody@example.com + +content +**** +# +# single header signed, body line starting with dot +exim -DOPT=From -odf f@test.ex +From: nobody@example.com + +..content +**** +# +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4511 b/test/scripts/4500-DKIM/4511 new file mode 100644 index 000000000..3a78b020d --- /dev/null +++ b/test/scripts/4500-DKIM/4511 @@ -0,0 +1,111 @@ +# DKIM signing, with CHUNKING +# +exim -bd -DSERVER=server -oX PORT_S +**** +# +# single header signed, short message +exim -DSRV=dkim -DLIST=From -odf -oMt sender -f sender a@test.ex +From: nobody@example.com +From: second@example.com + +content +**** +# +# single header signed, long message +exim -DSRV=dkim -DLIST=From -odf -oMt sender -f sender b@test.ex +From: nobody@example.com +From: second@example.com + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 +0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 + +The very last line +**** +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4512 b/test/scripts/4500-DKIM/4512 new file mode 100644 index 000000000..e8924b84e --- /dev/null +++ b/test/scripts/4500-DKIM/4512 @@ -0,0 +1,85 @@ +# DKIM signing, with CHUNKING, smtp/tcp +# +exim -bd -DSERVER=server -oX PORT_S +**** +# +# This should pass. +### sha256, 1024b + message in 1 chunk +# Mail original in aux-fixed/4500.msg2.txt +# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha256 \ +# --method=simple/simple < aux-fixed/4500.msg2.txt +client 127.0.0.1 PORT_S +??? 220 +EHLO xxx +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 +MAIL FROM: +??? 250 +RCPT TO: +??? 250 +BDAT 557 LAST +DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to + :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC + +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU + L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD + owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= +From: mrgus@text.ex +To: bakawolf@yahoo.com +Date: Thu, 19 Nov 2015 17:00:07 -0700 +Message-ID: +Subject: simple test + +Line 1: This is a simple test. +Line 2: This is a simple test. +??? 250- 557 +??? 250 +QUIT +??? 221 +**** +# +# This should pass. +### sha256, 1024b + message in 2 chunks +# Mail original in aux-fixed/4500.msg2.txt +# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha256 \ +# --method=simple/simple < aux-fixed/4500.msg2.txt +client 127.0.0.1 PORT_S +??? 220 +EHLO xxx +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 +MAIL FROM: +??? 250 +RCPT TO: +??? 250 +BDAT 525 +DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to + :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC + +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU + L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD + owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= +From: mrgus@text.ex +To: bakawolf@yahoo.com +Date: Thu, 19 Nov 2015 17:00:07 -0700 +Message-ID: +Subject: simple test + +Line 1: This is a simple test. +??? 250 525 +BDAT 32 LAST +Line 2: This is a simple test. +??? 250- 32 +??? 250 +QUIT +??? 221 +**** +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4513 b/test/scripts/4500-DKIM/4513 new file mode 100644 index 000000000..246d0d06b --- /dev/null +++ b/test/scripts/4500-DKIM/4513 @@ -0,0 +1,15 @@ +# DKIM signing, sha512 +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# default header set +exim -DOPT=+From -DVALUE=sha512 -odf a@test.ex +From: nobody@example.com + +content +**** +# +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4514 b/test/scripts/4500-DKIM/4514 new file mode 100644 index 000000000..4076f10d5 --- /dev/null +++ b/test/scripts/4500-DKIM/4514 @@ -0,0 +1,14 @@ +# DKIM signing, multiple +# +exim -bd -DSERVER=server -DFAKE=test.dkim.dom.ain -oX PORT_D +**** +# +exim -DSELECTOR=ses:sel -DOPT=From:To:Subject -odf c@test.ex +From: nobody@example.com + +content +**** +# +millisleep 500 +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4515 b/test/scripts/4500-DKIM/4515 new file mode 100644 index 000000000..dced4ae46 --- /dev/null +++ b/test/scripts/4500-DKIM/4515 @@ -0,0 +1,54 @@ +# DKIM signing, with transport_filter +# +exim -bd -DSERVER=server -oX PORT_D +**** +# +# baseline (no transport_filter) +exim -DOPT=From -odf a@test.ex +From: nobody@example.com + +content +**** +millisleep 500 +# +# +# with transport_filter +exim -DOPT=From -DFILTER=y -odf b@test.ex +From: nobody@example.com + +content +**** +millisleep 500 +# with transport_filter and CHUNKING +exim -DOPT=From -DFILTER=y -DALLOW=y -odf c@test.ex +From: nobody@example.com + +content +**** +millisleep 500 +# +# for comparison, mails that should get identical sigs, though not using a transport_filter +exim -DOPT=From -odf b@test.ex +From: nobody@example.com + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- +**** +millisleep 500 +exim -DOPT=From -DALLOW=y -odf c@test.ex +From: nobody@example.com + +content + +-- +This is a generic mailinglist footer, using a traditional .sig-separator line +---- +**** +millisleep 500 +# +# +killdaemon +no_msglog_check diff --git a/test/scripts/4500-DKIM/4519 b/test/scripts/4500-DKIM/4519 new file mode 100644 index 000000000..fb98e5564 --- /dev/null +++ b/test/scripts/4500-DKIM/4519 @@ -0,0 +1,68 @@ +# DKIM, CHUNKING, wireformat-spoolfile +# +exim -bd -DSERVER=server -DOPT=dkim -DLIST=Subject -oX PORT_S:PORT_D +**** +# +# 1: non-CHUNKING injection; will not be stored as wireformat therefore +# onward-send will not use sendfile. Should still be signed, and verify correctly. +client 127.0.0.1 PORT_S +??? 220 +EHLO xxx +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 +MAIL FROM: +??? 250 +RCPT TO: +??? 250 +DATA +??? 354 +Subject: simple test + +Line 1: This is a simple test. +Line 2: This is a simple test. +..Line 3 has a leading dot +last line: 4 +. +??? 250 +QUIT +??? 221 +**** +sleep 1 +# +# 2: CHUNKING injection; should be stored as wireformat therefore +# onward-send should not use sendfile. Should still be signed, and verify correctly. +client 127.0.0.1 PORT_S +??? 220 +EHLO xxx +??? 250- +??? 250- +??? 250- +??? 250- +??? 250- +??? 250 +MAIL FROM: +??? 250 +RCPT TO: +??? 250 +BDAT 129 LAST +Subject: simple test + +Line 1: This is a simple test. +Line 2: This is a simple test. +.Line 3 has a leading dot +last line: 4 +??? 250- +??? 250 +QUIT +??? 221 +**** +sleep 1 +# +killdaemon +exim -q +**** +no_msglog_check diff --git a/test/scripts/4500-DKIM/4520 b/test/scripts/4500-DKIM/4520 deleted file mode 100644 index f073be9d3..000000000 --- a/test/scripts/4500-DKIM/4520 +++ /dev/null @@ -1,92 +0,0 @@ -# DKIM signing -# -exim -bd -DSERVER=server -oX PORT_D -**** -# -# single header signed -exim -DOPT=From -odf a@test.ex -From: nobody@example.com -From: second@example.com - -content -**** -# -# single header, oversigned, with timestamps -exim -DOPT=From:From -DTIMES=10 -odf b@test.ex -From: nobody@example.com - -content -**** -# -# no header, multi-sign -exim -DOPT=From:=X-Mine -odf b10@test.ex -From: nobody@example.com - -content -**** -# -# double header, multi-sign -exim -DOPT=From:=X-Mine -odf b12@test.ex -From: nobody@example.com -X-mine: one -X-mine: two - -content -**** -# -# -# no header, always-oversign -exim -DOPT=+X-Mine -odf b20@test.ex -From: nobody@example.com - -content -**** -# -# double header, always-oversign -exim -DOPT=+X-Mine -odf b22@test.ex -From: nobody@example.com -X-mine: one -X-mine: two - -content -**** -# -## default header set -# cannot test that as it includes Date: so results in a varying signature -#exim -DHEADERS_MAXSIZE=y -odf c@test.ex -#From: nobody@example.com -# -#content -#**** -## -# check that on signing we warn in debug mode about verify problems -exim -d-all+acl -DOPT=From -DSELECTOR=sel_bad -odf d@test.ex -From: nobody@example.com - -content -**** -# -# check dkim_strict results in a defer (even with an expansion) -exim -DOPT=From '-DSTRICT=${if ={1}{1}{true}}' '-DTIMES=${bogus}' -odf '-f<>' e0@test.ex -From: nobody@example.com - -content -**** -# -# check that an empty dkim_privatekey overrides dkim_strict -exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf e@test.ex -From: nobody@example.com - -content -**** -# -# single header signed, body line starting with dot -exim -DOPT=From -odf f@test.ex -From: nobody@example.com - -..content -**** -# -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4521 b/test/scripts/4500-DKIM/4521 deleted file mode 100644 index 3a78b020d..000000000 --- a/test/scripts/4500-DKIM/4521 +++ /dev/null @@ -1,111 +0,0 @@ -# DKIM signing, with CHUNKING -# -exim -bd -DSERVER=server -oX PORT_S -**** -# -# single header signed, short message -exim -DSRV=dkim -DLIST=From -odf -oMt sender -f sender a@test.ex -From: nobody@example.com -From: second@example.com - -content -**** -# -# single header signed, long message -exim -DSRV=dkim -DLIST=From -odf -oMt sender -f sender b@test.ex -From: nobody@example.com -From: second@example.com - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 - -The very last line -**** -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4522 b/test/scripts/4500-DKIM/4522 deleted file mode 100644 index e8924b84e..000000000 --- a/test/scripts/4500-DKIM/4522 +++ /dev/null @@ -1,85 +0,0 @@ -# DKIM signing, with CHUNKING, smtp/tcp -# -exim -bd -DSERVER=server -oX PORT_S -**** -# -# This should pass. -### sha256, 1024b + message in 1 chunk -# Mail original in aux-fixed/4500.msg2.txt -# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha256 \ -# --method=simple/simple < aux-fixed/4500.msg2.txt -client 127.0.0.1 PORT_S -??? 220 -EHLO xxx -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -MAIL FROM: -??? 250 -RCPT TO: -??? 250 -BDAT 557 LAST -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to - :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC - +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU - L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD - owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= -From: mrgus@text.ex -To: bakawolf@yahoo.com -Date: Thu, 19 Nov 2015 17:00:07 -0700 -Message-ID: -Subject: simple test - -Line 1: This is a simple test. -Line 2: This is a simple test. -??? 250- 557 -??? 250 -QUIT -??? 221 -**** -# -# This should pass. -### sha256, 1024b + message in 2 chunks -# Mail original in aux-fixed/4500.msg2.txt -# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha256 \ -# --method=simple/simple < aux-fixed/4500.msg2.txt -client 127.0.0.1 PORT_S -??? 220 -EHLO xxx -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -MAIL FROM: -??? 250 -RCPT TO: -??? 250 -BDAT 525 -DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=test.ex; h=from:to - :date:message-id:subject; s=sel; bh=ZS4D3qDAC7osugrdWUTQc9HUuaSC - +ScH3/NkwGGOlT0=; b=ncPDYKtCsFuFA7wXHxagsZUh3Rpu0dK6Dl7FbkGykEwU - L/MoAe0D+Aynz+yO0k3d4vGZ6Q2sEJ4MaOZI27ezOSBsBnEhw+0uOaxE6HZew5VD - owfSxfXTkyfJd0CHdtYoXT0OqngTBOtAv87u1T4aLRDY1yAqasVuvLV7V80d4tQ= -From: mrgus@text.ex -To: bakawolf@yahoo.com -Date: Thu, 19 Nov 2015 17:00:07 -0700 -Message-ID: -Subject: simple test - -Line 1: This is a simple test. -??? 250 525 -BDAT 32 LAST -Line 2: This is a simple test. -??? 250- 32 -??? 250 -QUIT -??? 221 -**** -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4523 b/test/scripts/4500-DKIM/4523 deleted file mode 100644 index 246d0d06b..000000000 --- a/test/scripts/4500-DKIM/4523 +++ /dev/null @@ -1,15 +0,0 @@ -# DKIM signing, sha512 -# -exim -bd -DSERVER=server -oX PORT_D -**** -# -# default header set -exim -DOPT=+From -DVALUE=sha512 -odf a@test.ex -From: nobody@example.com - -content -**** -# -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4524 b/test/scripts/4500-DKIM/4524 deleted file mode 100644 index 4076f10d5..000000000 --- a/test/scripts/4500-DKIM/4524 +++ /dev/null @@ -1,14 +0,0 @@ -# DKIM signing, multiple -# -exim -bd -DSERVER=server -DFAKE=test.dkim.dom.ain -oX PORT_D -**** -# -exim -DSELECTOR=ses:sel -DOPT=From:To:Subject -odf c@test.ex -From: nobody@example.com - -content -**** -# -millisleep 500 -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4525 b/test/scripts/4500-DKIM/4525 deleted file mode 100644 index dced4ae46..000000000 --- a/test/scripts/4500-DKIM/4525 +++ /dev/null @@ -1,54 +0,0 @@ -# DKIM signing, with transport_filter -# -exim -bd -DSERVER=server -oX PORT_D -**** -# -# baseline (no transport_filter) -exim -DOPT=From -odf a@test.ex -From: nobody@example.com - -content -**** -millisleep 500 -# -# -# with transport_filter -exim -DOPT=From -DFILTER=y -odf b@test.ex -From: nobody@example.com - -content -**** -millisleep 500 -# with transport_filter and CHUNKING -exim -DOPT=From -DFILTER=y -DALLOW=y -odf c@test.ex -From: nobody@example.com - -content -**** -millisleep 500 -# -# for comparison, mails that should get identical sigs, though not using a transport_filter -exim -DOPT=From -odf b@test.ex -From: nobody@example.com - -content - --- -This is a generic mailinglist footer, using a traditional .sig-separator line ----- -**** -millisleep 500 -exim -DOPT=From -DALLOW=y -odf c@test.ex -From: nobody@example.com - -content - --- -This is a generic mailinglist footer, using a traditional .sig-separator line ----- -**** -millisleep 500 -# -# -killdaemon -no_msglog_check diff --git a/test/scripts/4500-DKIM/4530 b/test/scripts/4500-DKIM/4530 deleted file mode 100644 index fb98e5564..000000000 --- a/test/scripts/4500-DKIM/4530 +++ /dev/null @@ -1,68 +0,0 @@ -# DKIM, CHUNKING, wireformat-spoolfile -# -exim -bd -DSERVER=server -DOPT=dkim -DLIST=Subject -oX PORT_S:PORT_D -**** -# -# 1: non-CHUNKING injection; will not be stored as wireformat therefore -# onward-send will not use sendfile. Should still be signed, and verify correctly. -client 127.0.0.1 PORT_S -??? 220 -EHLO xxx -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -MAIL FROM: -??? 250 -RCPT TO: -??? 250 -DATA -??? 354 -Subject: simple test - -Line 1: This is a simple test. -Line 2: This is a simple test. -..Line 3 has a leading dot -last line: 4 -. -??? 250 -QUIT -??? 221 -**** -sleep 1 -# -# 2: CHUNKING injection; should be stored as wireformat therefore -# onward-send should not use sendfile. Should still be signed, and verify correctly. -client 127.0.0.1 PORT_S -??? 220 -EHLO xxx -??? 250- -??? 250- -??? 250- -??? 250- -??? 250- -??? 250 -MAIL FROM: -??? 250 -RCPT TO: -??? 250 -BDAT 129 LAST -Subject: simple test - -Line 1: This is a simple test. -Line 2: This is a simple test. -.Line 3 has a leading dot -last line: 4 -??? 250- -??? 250 -QUIT -??? 221 -**** -sleep 1 -# -killdaemon -exim -q -**** -no_msglog_check -- cgit v1.2.3