summaryrefslogtreecommitdiff
path: root/test/mail
diff options
context:
space:
mode:
authorJeremy Harris <jgh146exb@wizmail.org>2017-11-09 21:35:08 +0000
committerJeremy Harris <jgh146exb@wizmail.org>2017-11-09 21:35:08 +0000
commitce25e2982bde749c219357bd5983d2735277919f (patch)
treed13efe62f3256c6a6d302fe383c11fc05244d6ff /test/mail
parentb60b2eea0867313b7d950c1e13bf7067095eb605 (diff)
Testsuite: another go at munging cipher-suite strings
Diffstat (limited to 'test/mail')
-rw-r--r--test/mail/2102.CALLER16
-rw-r--r--test/mail/2103.userx4
-rw-r--r--test/mail/2108.CALLER8
-rw-r--r--test/mail/2108.abcd4
-rw-r--r--test/mail/2108.xyz4
-rw-r--r--test/mail/2113.usera4
-rw-r--r--test/mail/2113.userb4
-rw-r--r--test/mail/2113.userc4
-rw-r--r--test/mail/2113.userx4
-rw-r--r--test/mail/2113.usery4
-rw-r--r--test/mail/2113.userz4
-rw-r--r--test/mail/2117.userx8
-rw-r--r--test/mail/2119.userx8
-rw-r--r--test/mail/2127.userx4
-rw-r--r--test/mail/2132.CALLER12
-rw-r--r--test/mail/2138.userx04
-rw-r--r--test/mail/2138.userx14
-rw-r--r--test/mail/2138.usery04
-rw-r--r--test/mail/2138.usery14
-rw-r--r--test/mail/2138.userz04
-rw-r--r--test/mail/2138.userz14
-rw-r--r--test/mail/2149.userx4
-rw-r--r--test/mail/3461.userx8
-rw-r--r--test/mail/3462.userx8
24 files changed, 68 insertions, 68 deletions
diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index dde10d5fd..cf3fc103f 100644
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,48 +1,48 @@
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-SHAxxx: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
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx: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-SHAxxx:256)
+ 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-SHAxxx:256 peerdn=
+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]
- by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA: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
tls-certificate-verified: 1
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=/CN=server2.example.com
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA: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-SHAxxx:256)
+ 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-SHAxxx:256 peerdn=
+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.
diff --git a/test/mail/2103.userx b/test/mail/2103.userx
index 63cc79e91..4a195cb3d 100644
--- a/test/mail/2103.userx
+++ b/test/mail/2103.userx
@@ -1,11 +1,11 @@
From userx@test.ex Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=rhu.barb)
- by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <userx@test.ex>)
id 10HmaX-0005vi-00
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
This is a test encrypted message.
diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER
index 2a8ef65d0..c7ede6127 100644
--- a/test/mail/2108.CALLER
+++ b/test/mail/2108.CALLER
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message. Contains FF: ÿ
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
@@ -28,7 +28,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message to two different hosts
diff --git a/test/mail/2108.abcd b/test/mail/2108.abcd
index 659e192ba..174bf2f12 100644
--- a/test/mail/2108.abcd
+++ b/test/mail/2108.abcd
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbB-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message to two different hosts
diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz
index 27f6b1502..7d2082272 100644
--- a/test/mail/2108.xyz
+++ b/test/mail/2108.xyz
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
@@ -10,7 +10,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message to two different hosts
diff --git a/test/mail/2113.usera b/test/mail/2113.usera
index 3ac0f6eb9..99cf1e7ae 100644
--- a/test/mail/2113.usera
+++ b/test/mail/2113.usera
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbG-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 1
diff --git a/test/mail/2113.userb b/test/mail/2113.userb
index 4fae78071..8dec46dad 100644
--- a/test/mail/2113.userb
+++ b/test/mail/2113.userb
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbI-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 2
diff --git a/test/mail/2113.userc b/test/mail/2113.userc
index 3f8bc1dc1..33b93919e 100644
--- a/test/mail/2113.userc
+++ b/test/mail/2113.userc
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbH-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 3
diff --git a/test/mail/2113.userx b/test/mail/2113.userx
index 60810ec07..d9d76947d 100644
--- a/test/mail/2113.userx
+++ b/test/mail/2113.userx
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbA-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 1
diff --git a/test/mail/2113.usery b/test/mail/2113.usery
index 0f9a46248..451c49956 100644
--- a/test/mail/2113.usery
+++ b/test/mail/2113.usery
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbC-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 2
diff --git a/test/mail/2113.userz b/test/mail/2113.userz
index 32889da65..1db17b1d3 100644
--- a/test/mail/2113.userz
+++ b/test/mail/2113.userz
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbB-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 3
diff --git a/test/mail/2117.userx b/test/mail/2117.userx
index 329be639b..e0db1544e 100644
--- a/test/mail/2117.userx
+++ b/test/mail/2117.userx
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 1
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 2
diff --git a/test/mail/2119.userx b/test/mail/2119.userx
index 6aa5d9748..a336ee1e2 100644
--- a/test/mail/2119.userx
+++ b/test/mail/2119.userx
@@ -1,22 +1,22 @@
From userx@test.ex Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=rhu.barb)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <userx@test.ex>)
id 10HmaX-0005vi-00
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
This is a test encrypted message.
From userx@test.ex Tue Mar 02 09:44:33 1999
Received: from [ip4.ip4.ip4.ip4]
- by myhost.test.ex with smtp (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with smtp (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <userx@test.ex>)
id 10HmaY-0005vi-00
for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
This is a test encrypted message from a verified host.
diff --git a/test/mail/2127.userx b/test/mail/2127.userx
index 3edda5271..ad75397b0 100644
--- a/test/mail/2127.userx
+++ b/test/mail/2127.userx
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmaZ-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message
diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index a1d080855..eb9eedeb4 100644
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -1,36 +1,36 @@
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-SHAxxx: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
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx: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-SHAxxx:256)
+ 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-SHAxxx:256 peerdn=
+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]
- by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHA: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
tls-certificate-verified: 1
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=/CN=server1.example.com
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=/CN=server1.example.com
This is a test encrypted message from a verified host.
diff --git a/test/mail/2138.userx0 b/test/mail/2138.userx0
index 1958a1781..0182b2207 100644
--- a/test/mail/2138.userx0
+++ b/test/mail/2138.userx0
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbA-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 1
diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1
index ead4a92af..7edb740a2 100644
--- a/test/mail/2138.userx1
+++ b/test/mail/2138.userx1
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbB-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 1
diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0
index 39b2cf9f9..9add7407e 100644
--- a/test/mail/2138.usery0
+++ b/test/mail/2138.usery0
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbE-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 2
diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1
index f9c35c18a..aa90dc626 100644
--- a/test/mail/2138.usery1
+++ b/test/mail/2138.usery1
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbF-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 2
diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0
index e59087c64..b8831947d 100644
--- a/test/mail/2138.userz0
+++ b/test/mail/2138.userz0
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbC-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 3
diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1
index 0bab36453..66df6b941 100644
--- a/test/mail/2138.userz1
+++ b/test/mail/2138.userz1
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbD-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 3
diff --git a/test/mail/2149.userx b/test/mail/2149.userx
index 1e7209c08..c785585c5 100644
--- a/test/mail/2149.userx
+++ b/test/mail/2149.userx
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmaY-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message
diff --git a/test/mail/3461.userx b/test/mail/3461.userx
index a2e7998d6..3e6b082c2 100644
--- a/test/mail/3461.userx
+++ b/test/mail/3461.userx
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 1
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 2
diff --git a/test/mail/3462.userx b/test/mail/3462.userx
index a2e7998d6..3e6b082c2 100644
--- a/test/mail/3462.userx
+++ b/test/mail/3462.userx
@@ -1,6 +1,6 @@
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 1
From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxxx:256)
+ by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHA:xxx)
(Exim x.yz)
(envelope-from <CALLER@myhost.test.ex>)
id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
From: CALLER_NAME <CALLER@myhost.test.ex>
Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLSv1:ke-RSA-AES256-SHAxxx:256 peerdn=
+TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx peerdn=
Test message 2