Testsuite: fix Recieved: header munging for TLS info

[users/jgh/exim.git] / test / stdout / 5840

diff --git a/test/stdout/5840 b/test/stdout/5840
index 36a3bd158101d483db97d41bce26dba1841dbdff..00c6cdc4e44e077142caf16cf9c9daa4c4fb6d01 100644 (file)
--- a/test/stdout/5840
+++ b/test/stdout/5840
@@ -1,5 +1,5 @@
-### TLSA (3 1 1)
-### TLSA (3 1 2)
+### TLSA (3 1 1) (DANE-EE SPKI SHA2-256)
+### TLSA (3 1 2) (            SHA2-512)

 ### Recipient callout
 
 **** SMTP testing session as if from host 127.0.0.1
 ### Recipient callout
 
 **** SMTP testing session as if from host 127.0.0.1


@@ -10,7 +10,7 @@
 250 OK\r
 250 Accepted\r
 421 myhost.test.ex lost input connection\r
 250 OK\r
 250 Accepted\r
 421 myhost.test.ex lost input connection\r

-### TLSA (2 0 1)
+### TLSA (2 0 1) (DANE-TA CERT SHA2-256)

 ### TLSA (2 1 1)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA
 ### TLSA (2 1 1)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA


@@ -20,17 +20,22 @@
 ### A server where the A is dnssec and the TLSA lookup _fails_ (delivery should defer)
 ### A server securely saying "no TLSA records here", dane required (delivery should fail)
 ### A server securely saying "no TLSA records here", dane requested only (should deliver)
 ### A server where the A is dnssec and the TLSA lookup _fails_ (delivery should defer)
 ### A server securely saying "no TLSA records here", dane required (delivery should fail)
 ### A server securely saying "no TLSA records here", dane requested only (should deliver)

+Message 10HmbJ-0005vi-00 has been removed
+Message 10HmbM-0005vi-00 has been removed

 ### A server securely serving a wrong TLSA record, dane requested only (delivery should fail)
 ### A server insecurely serving a good TLSA record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good TLSA record, dane required (delivery should fail)
 ### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good A record, dane required (delivery should fail)
 ### A server securely serving a wrong TLSA record, dane requested only (delivery should fail)
 ### A server insecurely serving a good TLSA record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good TLSA record, dane required (delivery should fail)
 ### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good A record, dane required (delivery should fail)

+### A server with a name not matching the cert.  TA-mode; should fail
+### A server with a name not matching the cert.  EE-mode; should deliver and claim DANE mode
+### A server securely serving a wrong TLSA record, dane not requested (delivery should work non-dane)

 
 ******** SERVER ********
 
 ******** SERVER ********

-### TLSA (3 1 1)
-### TLSA (3 1 2)
+### TLSA (3 1 1) (DANE-EE SPKI SHA2-256)
+### TLSA (3 1 2) (            SHA2-512)

 ### Recipient callout
 ### Recipient callout

-### TLSA (2 0 1)
+### TLSA (2 0 1) (DANE-TA CERT SHA2-256)

 ### TLSA (2 1 1)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA
 ### TLSA (2 1 1)
 ### A server with a nonverifying cert and no TLSA
 ### A server with a verifying cert and no TLSA


@@ -45,3 +50,6 @@
 ### A server insecurely serving a good TLSA record, dane required (delivery should fail)
 ### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good A record, dane required (delivery should fail)
 ### A server insecurely serving a good TLSA record, dane required (delivery should fail)
 ### A server insecurely serving a good A record, dane requested only (should deliver, non-DANE)
 ### A server insecurely serving a good A record, dane required (delivery should fail)

+### A server with a name not matching the cert.  TA-mode; should fail
+### A server with a name not matching the cert.  EE-mode; should deliver and claim DANE mode
+### A server securely serving a wrong TLSA record, dane not requested (delivery should work non-dane)