Testsuite: munge for OpenSSL 3.2.1

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

diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 4f381035621327dbd960bc1c5485af7cd5cb00f6..aa8a62ad741d6f2fbed33d0ec37be4c78584d976 100644 (file)
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,46 +1,50 @@
 From a@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn: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 <a@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: 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 (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
 This is a test encrypted message.
 
 From b@test.ex Tue Mar 02 09:44:33 1999
-Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+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 <b@test.ex>)
-       id 10HmaZ-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: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server2.example.com
 
 This is a test encrypted message from a verified host.
 
 From c@test.ex Tue Mar 02 09:44:33 1999
-Received: from [127.0.0.1]
-       by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
+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 <c@test.ex>)
-       id 10HmbA-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       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-ECDSA-AES256-SHAnnn:xxx peerdn=