X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/2a27d0e4e61c2eecbb9557e8ad5d0a55077ee4ff..HEAD:/test/scripts/4500-DKIM/4520?ds=sidebyside

diff --git a/test/scripts/4500-DKIM/4520 b/test/scripts/4500-DKIM/4520
index 6efe3545a..f073be9d3 100644
--- a/test/scripts/4500-DKIM/4520
+++ b/test/scripts/4500-DKIM/4520
@@ -11,27 +11,82 @@ From: second@example.com
 content
 ****
 #
-# single header, oversigned
-exim -DOPT=From:From -odf b@test.ex
+# single header, oversigned, with timestamps
+exim -DOPT=From:From -DTIMES=10 -odf b@test.ex
 From: nobody@example.com
 
 content
 ****
 #
-# default header set
-exim -DHEADERS_MAXSIZE=y -odf c@test.ex
+# 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 -DHEADERS_MAXSIZE=y -DSELECTOR=sel_bad -odf d@test.ex
+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