diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2019-02-03 21:00:37 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2019-02-11 00:16:41 +0000 |
| commit | 826cb8c29cb1947cfc8f0e1b4e96c97e10a0e18a (patch) | |
| tree | 00f6a4fa10ceaf714333788060be434431f9db21 /test/mail | |
| parent | 8238bc7b7f52da726b6b5cfc92e388c5feab9050 (diff) | |
Testsuite: munge GnuTLS and OpenSSL ciphersuite strings to be more similar
(cherry picked from commit 25d5d9f98ebb30acc8b269c6594f4bc1e1abe654)
Diffstat (limited to 'test/mail')
46 files changed, 130 insertions, 130 deletions
diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER index 766a8373c..dc634d1e9 100644 --- a/test/mail/2002.CALLER +++ b/test/mail/2002.CALLER @@ -1,61 +1,61 @@ From CALLER@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_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (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 tls-certificate-verified: 0 -TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn: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 Received: from [127.0.0.1] - by myhost.test.ex with smtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (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 tls-certificate-verified: 0 -TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn: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 Received: from [ip4.ip4.ip4.ip4] - by myhost.test.ex with smtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (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 tls-certificate-verified: 1 -TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (TLS1.x:ke-RSA-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 tls-certificate-verified: 0 -TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= This is a test encrypted message. It should be sent under the RSA server cert and with an RSA cipher. From CALLER@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_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx) (Exim x.yz) (envelope-from <CALLER@test.ex>) id 10HmbB-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 tls-certificate-verified: 0 -TLS: cipher=TLS1.x:ke_ECDSA_AES_256_CBC_SHAnnn:256 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. diff --git a/test/mail/2003.userx b/test/mail/2003.userx index 960b4f2b2..66c128b68 100644 --- a/test/mail/2003.userx +++ b/test/mail/2003.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= This is a test encrypted message. diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER index 4cabd4afa..f7669bdbc 100644 --- a/test/mail/2008.CALLER +++ b/test/mail/2008.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message to two different hosts diff --git a/test/mail/2008.abcd b/test/mail/2008.abcd index c92af5469..8a6aae2cc 100644 --- a/test/mail/2008.abcd +++ b/test/mail/2008.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message to two different hosts diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz index daac14920..e304d943c 100644 --- a/test/mail/2008.xyz +++ b/test/mail/2008.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message to two different hosts diff --git a/test/mail/2013.usera b/test/mail/2013.usera index 3dda5a8dd..8aac112ac 100644 --- a/test/mail/2013.usera +++ b/test/mail/2013.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 1 diff --git a/test/mail/2013.userb b/test/mail/2013.userb index 1d6476b93..0a98cd802 100644 --- a/test/mail/2013.userb +++ b/test/mail/2013.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2013.userc b/test/mail/2013.userc index a2f0e0c1e..efb32a668 100644 --- a/test/mail/2013.userc +++ b/test/mail/2013.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 3 diff --git a/test/mail/2013.userx b/test/mail/2013.userx index b6359a012..f720f911a 100644 --- a/test/mail/2013.userx +++ b/test/mail/2013.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 1 diff --git a/test/mail/2013.usery b/test/mail/2013.usery index d3170ce10..32797e12f 100644 --- a/test/mail/2013.usery +++ b/test/mail/2013.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2013.userz b/test/mail/2013.userz index 0c0a49ba0..919c86d23 100644 --- a/test/mail/2013.userz +++ b/test/mail/2013.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 3 diff --git a/test/mail/2017.userx b/test/mail/2017.userx index 885709a7a..1a86c2aa7 100644 --- a/test/mail/2017.userx +++ b/test/mail/2017.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2019.userx b/test/mail/2019.userx index abb9e7c3c..3b38f9a48 100644 --- a/test/mail/2019.userx +++ b/test/mail/2019.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn=C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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/2027.userx b/test/mail/2027.userx index e8a41a452..08f034e29 100644 --- a/test/mail/2027.userx +++ b/test/mail/2027.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message diff --git a/test/mail/2038.userx0 b/test/mail/2038.userx0 index 3da6908c6..5d80e9866 100644 --- a/test/mail/2038.userx0 +++ b/test/mail/2038.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 1 diff --git a/test/mail/2038.userx1 b/test/mail/2038.userx1 index 846e2f424..1acf09c8f 100644 --- a/test/mail/2038.userx1 +++ b/test/mail/2038.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 1 diff --git a/test/mail/2038.usery0 b/test/mail/2038.usery0 index 7dcb5f643..6030779c8 100644 --- a/test/mail/2038.usery0 +++ b/test/mail/2038.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2038.usery1 b/test/mail/2038.usery1 index 6c6e34d6e..e1b08c6ad 100644 --- a/test/mail/2038.usery1 +++ b/test/mail/2038.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2038.userz0 b/test/mail/2038.userz0 index c13d81d35..9f4558735 100644 --- a/test/mail/2038.userz0 +++ b/test/mail/2038.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 3 diff --git a/test/mail/2038.userz1 b/test/mail/2038.userz1 index b90ad2c98..17e3991b0 100644 --- a/test/mail/2038.userz1 +++ b/test/mail/2038.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 3 diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER index cf3fc103f..9ca82395f 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-SHA:xxx) + by myhost.test.ex with smtps (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 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) + by myhost.test.ex with smtps (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 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) + by myhost.test.ex with smtps (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 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) + by myhost.test.ex with smtps (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 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. diff --git a/test/mail/2103.userx b/test/mail/2103.userx index 4a195cb3d..66c128b68 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-SHA:xxx) + by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= This is a test encrypted message. diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER index c7ede6127..f7669bdbc 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message to two different hosts diff --git a/test/mail/2108.abcd b/test/mail/2108.abcd index 174bf2f12..8a6aae2cc 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message to two different hosts diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz index 7d2082272..e304d943c 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message to two different hosts diff --git a/test/mail/2113.usera b/test/mail/2113.usera index 99cf1e7ae..8aac112ac 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 1 diff --git a/test/mail/2113.userb b/test/mail/2113.userb index 8dec46dad..0a98cd802 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2113.userc b/test/mail/2113.userc index 33b93919e..efb32a668 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 3 diff --git a/test/mail/2113.userx b/test/mail/2113.userx index d9d76947d..f720f911a 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 1 diff --git a/test/mail/2113.usery b/test/mail/2113.usery index 451c49956..32797e12f 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2113.userz b/test/mail/2113.userz index 1db17b1d3..919c86d23 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 3 diff --git a/test/mail/2117.userx b/test/mail/2117.userx index e0db1544e..1a86c2aa7 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2119.userx b/test/mail/2119.userx index a336ee1e2..e79ed70b4 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx) + by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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 ad75397b0..08f034e29 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER index eb9eedeb4..1edd49384 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-SHA:xxx) + by myhost.test.ex with smtps (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 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) + by myhost.test.ex with smtps (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 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) + by myhost.test.ex with smtps (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 tls-certificate-verified: 1 -TLS: cipher=TLSv1:ke-RSA-AES256-SHA:xxx 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. diff --git a/test/mail/2138.userx0 b/test/mail/2138.userx0 index 0182b2207..5d80e9866 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 1 diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1 index 7edb740a2..1acf09c8f 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 1 diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0 index 9add7407e..6030779c8 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1 index aa90dc626..e1b08c6ad 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0 index b8831947d..9f4558735 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 3 diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1 index 66df6b941..17e3991b0 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 3 diff --git a/test/mail/2149.userx b/test/mail/2149.userx index c785585c5..06590b3e7 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-SHA:xxx) + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message diff --git a/test/mail/3451.userx b/test/mail/3451.userx index b2e058317..6116a01db 100644 --- a/test/mail/3451.userx +++ b/test/mail/3451.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/3452.userx b/test/mail/3452.userx index b2e058317..6116a01db 100644 --- a/test/mail/3452.userx +++ b/test/mail/3452.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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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 (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn: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=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/3461.userx b/test/mail/3461.userx index 3e6b082c2..6116a01db 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-SHA:xxx) + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx) + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 diff --git a/test/mail/3462.userx b/test/mail/3462.userx index 3e6b082c2..6116a01db 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-SHA:xxx) + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx) + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn: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-SHA:xxx peerdn= +TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn= Test message 2 |