Avoid manually-counted long strings

[users/heiko/exim.git] / test / scripts / 4500-DKIM / 4520

diff --git a/test/scripts/4500-DKIM/4520 b/test/scripts/4500-DKIM/4520
index f7fafb3e4bc03a8f28e7d4f5ae849d725fe613cf..f073be9d368638dd04df51901c427d35bfde9003 100644 (file)
--- a/test/scripts/4500-DKIM/4520
+++ b/test/scripts/4500-DKIM/4520
@@ -11,8 +11,8 @@ From: second@example.com
 content
 ****
 #
 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
 From: nobody@example.com
 
 content


@@ -63,16 +63,30 @@ content
 exim -d-all+acl -DOPT=From -DSELECTOR=sel_bad -odf d@test.ex
 From: nobody@example.com
 
 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
 content
 ****
 #
 # check that an empty dkim_privatekey overrides dkim_strict

-exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf a@test.ex
+exim -DOPT=From -DSTRICT=true -DSELECTOR=none -odf e@test.ex

 From: nobody@example.com
 
 content
 ****
 #
 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
 millisleep 500
 killdaemon
 no_msglog_check