appendfile: tidying

[users/jgh/exim.git] / test / scripts / 4560-ARC / 4562

diff --git a/test/scripts/4560-ARC/4562 b/test/scripts/4560-ARC/4562
index 3f21e1ebd98afcec1fbc31f452dd068604769966..96efd7761f3de3e1306ffa772eae3b12d09c7171 100644 (file)
--- a/test/scripts/4560-ARC/4562
+++ b/test/scripts/4560-ARC/4562
@@ -1,27 +1,48 @@
-# ARC sign, DKIM header interactions
+# ARC verify, sequential messages on connection

 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
 #

-# Random-ish input message, having a DKIM header
+# A two-message connection. First should pass ARC.
+# Mail original in aux-fixed/4560.msg1.txt
+# Sig generated by: perl aux-fixed/dkim/sign_arc.pl < aux-fixed/4560.msg1.txt

 client 127.0.0.1 PORT_D
 ??? 220
 HELO xxx
 ??? 250
 client 127.0.0.1 PORT_D
 ??? 220
 HELO xxx
 ??? 250

-MAIL FROM:<CALLER@bloggs.com>
+MAIL FROM:<has_arc@bloggs.com>

 ??? 250
 ??? 250

-RCPT TO:<za@test.ex>
+RCPT TO:<a@test.ex>
+??? 250
+DATA
+??? 354
+ARC-Seal: i=1; a=rsa-sha256; cv=none; d=test.ex; s=sel; t=1521752658; b=
+        xcIN0OEpAc3s8riODm31Q6JgmIECch3iVd1LXWwsypGpCY2UFFuo5HhCEf4a043q
+        YZ+zn/MbFFkvwIqleeQkJ7S5UcvfM8dv/V4YnwAe+JD8r79glh/FRq6uKlc0ixLS
+        CllJMwj98J1P1K9+gwmO5TrD1eTZV68caZj77P+X2kw=
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=test.ex;
+         h=from:to:date:message-id:subject; s=sel; bh=3UbbJTudPxmejzh7U1
+        Zg33U3QT+16kfV2eOTvMeiEis=; b=WgE+YWSm48w/P448gPlBBNCKt2SJ4gosPx
+        0JQ98aZJhun2RaVcUO3INc+kZv8YOijofMzFqJxVn1cgMjoU8/QSHIyyt40FzkQB
+        oSGmSrCjtRnzS8pbp491NX3kGuetidaWE5muPSdOystg6mm1rBnl9sqVrwaynCmr
+        fu2jTuUfw=
+ARC-Authentication-Results: i=1; test.ex; arc=none
+Authentication-Results: test.ex; arc=none
+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.
+.
+??? 250
+MAIL FROM:<no_arc@bloggs.com>
+??? 250
+RCPT TO:<a@test.ex>

 ??? 250
 DATA
 ??? 354
 ??? 250
 DATA
 ??? 354

-DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
-       d=example.com; s=sel; h=List-Archive;
-        bh=47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=; b=uslVEq1LzHDR2ACoSTiErsGhe
-       GcuqL5no/4XYjsEJOIXkKFp4FFTj7QTcblHqyqsjgd5Dgs7zuFV4U3lwU9jSZtqJNQI+BtYZ5dS48
-       sjr9PbLiguw8rAv5eDXBQKi5XcNCnZlUnWEjl10OXEgJZ9UXdKToWHpSfWEw1nFvOlKAfPBfkznnA
-       EOQXSTJOTanLpr7EZ4Yw5LWE+9BWJfnl6snn6W0mmJl4tbfEXEV1ZzOxdQF1rwjJqmojoCG36Z+v5
-       sWKswl7HgSlKo2GKgxh9zIIhoxg5+7zfmHdKUQ2/6zuR8nqjDAjl3bSdOMgZVM0L6G6EMxQP6Sj6f
-       oEr6ePt9A==;

 From: mrgus@text.ex
 To: bakawolf@yahoo.com
 Date: Thu, 19 Nov 2015 17:00:07 -0700
 From: mrgus@text.ex
 To: bakawolf@yahoo.com
 Date: Thu, 19 Nov 2015 17:00:07 -0700


@@ -36,10 +57,6 @@ QUIT
 ****
 exim -DSERVER=server -DNOTDAEMON -q
 ****
 ****
 exim -DSERVER=server -DNOTDAEMON -q
 ****

-exim -DSERVER=server -DNOTDAEMON -q
-****
-#
-#

 #
 #
 #
 #
 #
 #