Cutthrough: fix for port-number defined by router. Bug 2229

[exim.git] / test / scripts / 4500-DKIM / 4503

diff --git a/test/scripts/4500-DKIM/4503 b/test/scripts/4500-DKIM/4503
index 6efe3545aa7a614a6ac1b29a35e7620c81a58948..aca19583bc3d8f2f0417de9c89330701283494e3 100644 (file)
--- a/test/scripts/4500-DKIM/4503
+++ b/test/scripts/4500-DKIM/4503
@@ -1,37 +1,45 @@
-# DKIM signing
+# DKIM verify, sha512
 #
-exim -bd -DSERVER=server -oX PORT_D
+exim -DSERVER=server -bd -oX PORT_D
 ****
 #
-# single header signed
-exim -DOPT=From -odf a@test.ex
-From: nobody@example.com
-From: second@example.com
-
-content
-****
+# This should pass, only Mail::DKIM::Signer does not handle rsa-sha512.
+#  - sha512, 1024b
+# Mail original in aux-fixed/4500.msg1.txt
+# Sig generated by: perl aux-fixed/dkim/sign.pl --algorithm=rsa-sha512 \
+#                      --method=simple/simple < aux-fixed/4500.msg1.txt
 #
-# single header, oversigned
-exim -DOPT=From:From -odf b@test.ex
-From: nobody@example.com
-
-content
-****
-#
-# default header set
-exim -DHEADERS_MAXSIZE=y -odf c@test.ex
-From: nobody@example.com
-
-content
-****
+# TODO - until we have that we can only test internal consistency,
+# signing vs. verification.
 #
-# 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
-From: nobody@example.com
+client 127.0.0.1 PORT_D
+??? 220
+HELO xxx
+??? 250
+MAIL FROM:<CALLER@bloggs.com>
+??? 250
+RCPT TO:<a@test.ex>
+??? 250
+DATA
+??? 354
+DKIM-Signature: v=1; a=rsa-sha512; c=simple/simple; d=test.ex; h=from:to
+       :date:message-id:subject; s=sel; bh=3UbbJTudPxmejzh7U1Zg33U3QT+1
+       6kfV2eOTvMeiEis=; b=xQSD/JMqz0C+xKf0A1NTkPTbkDuDdJbpBuyjjT9iYvyP
+       Zez+xl0TkoPobFGVa6EN8+ZeYV18zjifhtWYLSsNmPinUtcpKQLG1zxAKmmS0JEh
+       +qihlWbeGJ5+tK588ugUzXHPj+4JBW0H6kxHvdH0l2SlQE5xs/cdggnx5QX5USY=
+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
 
-content
+This is a simple test.
+.
+??? 250
+QUIT
+??? 221
 ****
 #
-millisleep 500
 killdaemon
+no_stdout_check
 no_msglog_check