Fix DKIM verify operation in -bh test mode. Bug 2017

7 files changed, 48 insertions, 0 deletions

diff --git a/test/scripts/0000-Basic/0021 b/test/scripts/0000-Basic/0021
index 16c5c3b80..0df1f0ae6 100644
--- a/test/scripts/0000-Basic/0021
+++ b/test/scripts/0000-Basic/0021
@@ -46,6 +46,7 @@ exim -d-all+acl+lists -odi -bs -oMa 10.9.8.8
 mail from:<ok@test3>
 rcpt to:<x@y>
 data
+
 Some message
 .
 quit
diff --git a/test/scripts/0000-Basic/0022 b/test/scripts/0000-Basic/0022
index 92d955171..dd11aa236 100644
--- a/test/scripts/0000-Basic/0022
+++ b/test/scripts/0000-Basic/0022
@@ -3,6 +3,7 @@ exim -d -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<warn_empty@test.ex>
 data
+
 Testing
 .
 quit
@@ -11,6 +12,7 @@ exim -d -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<warn_log@test.ex>
 data
+
 Testing
 .
 quit
@@ -19,6 +21,7 @@ exim -d -bh V4NET.9.8.7
 mail from:<x@y>
 rcpt to:<warn_user@test.ex>
 data
+
 Testing
 .
 quit
@@ -55,22 +58,26 @@ mail from:<x@y>
 rcpt to:<accept@y>
 rcpt to:<freeze@y>
 data
+
 Testing
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data
+
 Testing 2
 .
 mail from:<x@y>
 rcpt to:<queue_only@y>
 rcpt to:<accept@y>
 data
+
 Testing 3
 .
 mail from:<x@y>
 rcpt to:<accept@y>
 data
+
 Testing 4
 .
 quit
@@ -101,6 +108,7 @@ rcpt to:<freeze@y>
 ??? 250
 data
 ??? 354
+
 Testing
 .
 ??? 250
@@ -110,6 +118,7 @@ rcpt to:<accept@y>
 ??? 250
 data
 ??? 354
+
 Testing 2
 .
 ??? 250
@@ -121,6 +130,7 @@ rcpt to:<accept@y>
 ??? 250
 data
 ??? 354
+
 Testing 3
 .
 ??? 250
@@ -130,6 +140,7 @@ rcpt to:<accept@y>
 ??? 250
 data
 ??? 354
+
 Testing 4
 .
 ??? 250
diff --git a/test/scripts/0000-Basic/0303 b/test/scripts/0000-Basic/0303
index 854206e4a..16e80c866 100644
--- a/test/scripts/0000-Basic/0303
+++ b/test/scripts/0000-Basic/0303
@@ -16,6 +16,7 @@ EHLO [V4NET.2.3.4]
 mail from:<>
 rcpt to:<x@y>
 data
+
 .
 quit
 ****
@@ -24,6 +25,7 @@ EHLO [V4NET.2.3.4]
 mail from:<>
 rcpt to:<x@y>
 data
+
 .
 quit
 ****
diff --git a/test/scripts/0000-Basic/0371 b/test/scripts/0000-Basic/0371
index 2850fc12f..6dc0bca77 100644
--- a/test/scripts/0000-Basic/0371
+++ b/test/scripts/0000-Basic/0371
@@ -4,6 +4,7 @@ ehlo something
 mail from:<x@y>
 rcpt to:<x@y>
 data
+
 .
 vrfy x@y
 mail from:<x@y>
diff --git a/test/scripts/0000-Basic/0386 b/test/scripts/0000-Basic/0386
index 172c8b79a..7adc4fbeb 100644
--- a/test/scripts/0000-Basic/0386
+++ b/test/scripts/0000-Basic/0386
@@ -11,12 +11,14 @@ exim -d -odi -bs -oMa V4NET.11.12.13 userx
 mail from:<x@y>
 rcpt to:<2@b>
 data
+
 Message 1
 .
 rset
 mail from:<x@y>
 rcpt to:<2@b>
 data
+
 Message 2
 .
 quit
diff --git a/test/scripts/0000-Basic/0575 b/test/scripts/0000-Basic/0575
index e4534af9b..302b67f4f 100644
--- a/test/scripts/0000-Basic/0575
+++ b/test/scripts/0000-Basic/0575
@@ -4,6 +4,7 @@ exim -d -bh V4NET.0.0.0
 mail from:<x@y>
 rcpt to:<x@y>
 data
+
 Message.
 .
 quit
diff --git a/test/scripts/4500-DKIM/4507 b/test/scripts/4500-DKIM/4507
new file mode 100644
index 000000000..6a4121fe1
--- /dev/null
+++ b/test/scripts/4500-DKIM/4507
@@ -0,0 +1,30 @@
+# DKIM verify, -bh test mode
+#
+#
+# This should pass.
+#  - sha1, 1024b
+# Mail original in aux-fixed/4500.msg1.txt
+# Sig generated by: perl aux-fixed/dkim/sign.pl --method=simple/simple < aux-fixed/4500.msg1.txt
+exim -DSERVER=server -DNOTDAEMON -bh 127.0.0.1
+HELO xxx
+MAIL FROM:<CALLER@bloggs.com>
+RCPT TO:<a@test.ex>
+DATA
+DKIM-Signature: v=1; a=rsa-sha1; c=simple/simple; d=test.ex; h=from:to
+	:date:message-id:subject; s=sel; bh=OB9dZVu7+5/ufs3TH9leIcEpXSo=; b=
+	PeUA8iBGfStWv+9/BBKkvCEYj/AVMl4e9k+AqWOXKyuEUfHxqAnV+sPnOejpmvT8
+	41kuM4u0bICvK371YvB/yO61vtliRhyqU76Y2e55p2uvMADb3UyDhLyzpco4+yBo
+	1w0AuIxu0VU4TK8UmOLyCw/1hxrh1DcEInbEMEKJ7kI=
+From: mrgus@text.ex
+To: bakawolf@yahoo.com
+Date: Thu, 19 Nov 2015 17:00:07 -0700
+Message-ID: <qwerty1234@disco-zombie.net>
+Subject: simple test
+
+This is a simple test.
+.
+QUIT
+****
+#
+no_stdout_check
+no_msglog_check