X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ce25e2982bde749c219357bd5983d2735277919f..1ed8108307b8a10d48aaa094cd661ecdebfa48ee:/test/mail/2102.CALLER

diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index cf3fc103f..aa8a62ad7 100644
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,48 +1,52 @@
-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-RSA-AES256-SHA:xxx)
+From a@test.ex Tue Mar 02 09:44:33 1999
+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>)
-	id 10HmaX-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	(envelope-from <a@test.ex>)
+	id 10HmaX-000000005vi-0000
+	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=
+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]
-	by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
+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 <"name with spaces"@test.ex>)
-	id 10HmaY-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	id 10HmaY-000000005vi-0000
+	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=
+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
-Received: from [ip4.ip4.ip4.ip4]
-	by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
+From b@test.ex Tue Mar 02 09:44:33 1999
+Received: from [ip4.ip4.ip4.ip4] (helo=rhu.barb)
+	by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
 	(Exim x.yz)
-	(envelope-from <CALLER@test.ex>)
-	id 10HmaZ-0005vi-00
-	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+	(envelope-from <b@test.ex>)
+	id 10HmaZ-000000005vi-0000
+	for CALLER@test.ex;
+	Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1
-TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=/CN=server2.example.com
+TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server2.example.com
 
 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)
+From c@test.ex Tue Mar 02 09:44:33 1999
+Received: from [127.0.0.1] (helo=rhu.barb)
+	by myhost.test.ex with esmtps (TLS1.x:ke-ECDSA-AES256-SHAnnn: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
+	(envelope-from <c@test.ex>)
+	id 10HmbA-000000005vi-0000
+	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=
+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.