DKIM: signing with t but no x timestamp. Bug 2851

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 24f80d3a42f708a57921dd020d73034d2f97ef5d..45d00f9f8387e9746dc29d51eabfa26a72e2d463 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1073,7 +1073,9 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/250-AUTH ANONYMOUS PLAIN SCRAM-SHA-1\K SCRAM-SHA-256//;
 
     # mailq times change with when the run is done, vs. static-source spoolfiles
-    s/\s*\d*[hd](?=   317 [0-9A-Za-z\-]{23} <nobody\@test.ex>)/DDd/;
+    s/\s*\d*[hd](?=   317 (?:[-0-9A-Za-z]{23}|[-0-9A-Za-z]{16}) <nobody\@test.ex>)/DDd/;
+    # mailq sizes change with caller running the test
+    s/\s[01]m   [34]\d\d(?= (?:[-0-9A-Za-z]{23}|[-0-9A-Za-z]{16}) <CALLER\@the.local.host.name>)/ 1m    396/;
 
     # Not all builds include EXPERIMENTAL_DSN_INFO (1 of 2)
     if (/^X-Exim-Diagnostic:/)
@@ -1563,7 +1565,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if / Berkeley DB error: /;
 
     # CHUNKING: exact sizes depend on hostnames in headers
-    s/(=>.* K C="250- \d)\d+ (byte chunk, total \d)\d+/$1nn $2nn/;
+    s/(=>.* K (?:DKIM=\S+ )?C="250- \d)\d+ (byte chunk, total \d)\d+/$1nn $2nn/;
 
     # OpenSSL version variances
     s/(TLS error on connection [^:]*: error:)[0-9A-F]{8}(:system library):(?:fopen|func\(4095\)|):(No such file or directory)$/$1xxxxxxxx$2:fopen:$3/;
@@ -1592,11 +1594,13 @@ RESET_AFTER_EXTRA_LINE_READ:
     s/ARC: AMS signing: privkey PEM-block import: error:\K[0-9A-F]{8}:PEM routines:PEM_read_bio:no start line$/1E08010C:DECODER routines::unsupported/;
 
     # DKIM timestamps
-    if ( /(DKIM: d=.*) t=([0-9]*) x=([0-9]*) / )
+    if ( /(DKIM: d=.*) t=([0-9]*) x=([0-9]*) \[/ )
       {
       my ($prefix, $t_diff) = ($1, $3 - $2);
       s/DKIM: d=.* t=[0-9]* x=[0-9]* /${prefix} t=T x=T+${t_diff} /;
       }
+    else
+      { s/DKIM: d=.* \Kt=[0-9]* \[/t=T [/; }
     # GnuTLS reports a different keysize vs. OpenSSL, for ed25519 keys
     s/signer: [^ ]* bits:\K 256/ 253/;
     s/public key too short:\K 256 bits/ 253 bits/;
@@ -1639,6 +1643,13 @@ RESET_AFTER_EXTRA_LINE_READ:
       <IN>;
       <IN>;
       }
+    elsif ( /^(\s+)t=([0-9]*); b=[A-Za-z0-9+\/]+$/ )
+      {
+      my $indent = $1;
+      s/.*/${indent}t=T; b=bbbb;/;
+      <IN>;
+      <IN>;
+      }
 
     # Not all builds include EXPERIMENTAL_DSN_INFO (2 of 2)
     if (/^X-Exim-Diagnostic:/)