Testsuite: munge for error message sizes in retry records

[exim.git] / test / mail / 2002.CALLER

diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER
index cc606bb0ea455c6be0aaa163a74d103d601e7852..9544fe0db6321bbff8194236a37fb9930ae98ad6 100644 (file)
--- a/test/mail/2002.CALLER
+++ b/test/mail/2002.CALLER
@@ -1,24 +1,67 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
+Received: from [127.0.0.1] (helo=rhu.barb)
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

-       id 10HmaX-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaX-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 tls-certificate-verified: 0
 tls-certificate-verified: 0

-TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
+TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
+
+This is a test encrypted message.
+
+From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
+Received: from [127.0.0.1] (helo=test)
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+       (Exim x.yz)
+       (envelope-from <"name with spaces"@test.ex>)
+       id 10HmaY-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+tls-certificate-verified: 0
+TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=

 
 This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 
 This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999

-Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
+Received: from [ip4.ip4.ip4.ip4] (helo=test)
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

-       id 10HmaY-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaZ-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 tls-certificate-verified: 1
 tls-certificate-verified: 1

-TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock
+TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=CN=server2.example.com

 
 This is a test encrypted message from a verified host.
 
 
 This is a test encrypted message from a verified host.
 

+From CALLER@test.ex Tue Mar 02 09:44:33 1999
+Received: from [127.0.0.1] (helo=test)
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+       (Exim x.yz)
+       (envelope-from <CALLER@test.ex>)
+       id 10HmbA-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+tls-certificate-verified: 0
+TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
+
+This is a test encrypted message.
+It should be sent under the RSA server cert and with an RSA cipher.
+
+From CALLER@test.ex Tue Mar 02 09:44:33 1999
+Received: from [127.0.0.1] (helo=test)
+       by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
+       (Exim x.yz)
+       (envelope-from <CALLER@test.ex>)
+       id 10HmbB-000000005vi-0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+tls-certificate-verified: 0
+TLS: cipher=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx peerdn=
+
+This is a test encrypted message.
+It should be sent under the EC server cert and with an ECDSA cipher.
+