Attempt (2) egrep compat for Solaris vs. Linux

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

diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 21b5e2c66bbe6f5acfbeb0536003bc8e5a5bd71e..a6568522b05174b5ee4f70f7f163d6079a967d8e 100644 (file)
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -1,36 +1,39 @@
 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 (TLSv1:AES256-SHA:256)
+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>)
        (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=TLSv1:AES256-SHA: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
 
 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:AES256-SHA:256)
+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>)
        (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-certificate-verified: 0

-TLS: cipher=TLSv1:AES256-SHA:256 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
 
 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)
+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 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-certificate-verified: 1

-TLS: cipher=TLSv1:AES256-SHA:256 peerdn=/CN=server1.example.com
+TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server1.example.com

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