unbreak test: s/log_write/logwrite/

[users/heiko/exim.git] / test / mail / 2102.CALLER

diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 0a2adcf1c64a8b3e1061bc7695969238bf187007..cf3fc103ff520c23be723407f6a92eb40ccbeb8b 100644 (file)
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,24 +1,49 @@
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]

-       by myhost.test.ex with smtps (TLSv1:AES256-SHA:256)
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)

        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0

-TLS: cipher=TLSv1:AES256-SHA:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA: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]
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
+       (Exim x.yz)
+       (envelope-from <"name with spaces"@test.ex>)
+       id 10HmaY-0005vi-00
+       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+tls-certificate-verified: 0
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=

 
 This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
 
 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 (TLSv1:AES256-SHA:256)
+       by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)

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

-       id 10HmaY-0005vi-00
+       id 10HmaZ-0005vi-00

        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1

-TLS: cipher=TLSv1:AES256-SHA:256 peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA: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]
+       by myhost.test.ex with smtps (TLSv1:ke-ECDSA-AES256-SHA:xxx)
+       (Exim x.yz)
+       (envelope-from <CALLER@test.ex>)
+       id 10HmbA-0005vi-00
+       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+tls-certificate-verified: 0
+TLS: cipher=TLSv1:ke-ECDSA-AES256-SHA:xxx peerdn=
+
+This is a test encrypted message.
+It should be sent under the EC server cert and with an ECDSA cipher.
+