From ba86e143c7aeb0d70ea4c9d73a617a98f06f6baa Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 7 Nov 2017 16:09:28 +0000 Subject: TLS: support multiple certificate files in server. Bug 2092 --- test/mail/2002.CALLER | 38 ++++++++++++++++++++++++++++++++------ test/mail/2003.userx | 4 ++-- test/mail/2008.CALLER | 8 ++++---- test/mail/2008.abcd | 4 ++-- test/mail/2008.xyz | 4 ++-- test/mail/2013.usera | 4 ++-- test/mail/2013.userb | 4 ++-- test/mail/2013.userc | 4 ++-- test/mail/2013.userx | 4 ++-- test/mail/2013.usery | 4 ++-- test/mail/2013.userz | 4 ++-- test/mail/2017.userx | 8 ++++---- test/mail/2019.userx | 8 ++++---- test/mail/2027.userx | 4 ++-- test/mail/2038.userx0 | 4 ++-- test/mail/2038.userx1 | 4 ++-- test/mail/2038.usery0 | 4 ++-- test/mail/2038.usery1 | 4 ++-- test/mail/2038.userz0 | 4 ++-- test/mail/2038.userz1 | 4 ++-- test/mail/2102.CALLER | 25 +++++++++++++++++++------ test/mail/2103.userx | 4 ++-- test/mail/2108.CALLER | 8 ++++---- test/mail/2108.abcd | 4 ++-- test/mail/2108.xyz | 4 ++-- test/mail/2113.usera | 4 ++-- test/mail/2113.userb | 4 ++-- test/mail/2113.userc | 4 ++-- test/mail/2113.userx | 4 ++-- test/mail/2113.usery | 4 ++-- test/mail/2113.userz | 4 ++-- test/mail/2117.userx | 8 ++++---- test/mail/2119.userx | 8 ++++---- test/mail/2127.userx | 4 ++-- test/mail/2132.CALLER | 12 ++++++------ test/mail/2138.userx0 | 4 ++-- test/mail/2138.userx1 | 4 ++-- test/mail/2138.usery0 | 4 ++-- test/mail/2138.usery1 | 4 ++-- test/mail/2138.userz0 | 4 ++-- test/mail/2138.userz1 | 4 ++-- test/mail/2149.userx | 4 ++-- test/mail/3451.userx | 8 ++++---- test/mail/3452.userx | 8 ++++---- test/mail/3461.userx | 8 ++++---- test/mail/3462.userx | 8 ++++---- 46 files changed, 163 insertions(+), 124 deletions(-) (limited to 'test/mail') diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER index 23b5f61a5..766a8373c 100644 --- a/test/mail/2002.CALLER +++ b/test/mail/2002.CALLER @@ -1,36 +1,62 @@ 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 tls-certificate-verified: 0 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (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:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 tls-certificate-verified: 1 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=CN=server2.example.com +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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) + (Exim x.yz) + (envelope-from ) + 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= + +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) + (Exim x.yz) + (envelope-from ) + 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= + +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 2862ffa2a..960b4f2b2 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= This is a test encrypted message. diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER index 213ed889a..4cabd4afa 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) 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: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message to two different hosts diff --git a/test/mail/2008.abcd b/test/mail/2008.abcd index edbb0b8c4..c92af5469 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message to two different hosts diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz index c144d9726..daac14920 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) 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: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message to two different hosts diff --git a/test/mail/2013.usera b/test/mail/2013.usera index 8e17aeefc..3dda5a8dd 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 1 diff --git a/test/mail/2013.userb b/test/mail/2013.userb index 556fb35e8..1d6476b93 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 2 diff --git a/test/mail/2013.userc b/test/mail/2013.userc index 818aafb5e..a2f0e0c1e 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbH-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 3 diff --git a/test/mail/2013.userx b/test/mail/2013.userx index 0d421f497..b6359a012 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 1 diff --git a/test/mail/2013.usery b/test/mail/2013.usery index 70e5f37fb..d3170ce10 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 2 diff --git a/test/mail/2013.userz b/test/mail/2013.userz index f7b8e9c1d..0c0a49ba0 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 3 diff --git a/test/mail/2017.userx b/test/mail/2017.userx index 0e0d96571..885709a7a 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 2 diff --git a/test/mail/2019.userx b/test/mail/2019.userx index 7408ad7f9..abb9e7c3c 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with smtp (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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 96b609820..e8a41a452 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message diff --git a/test/mail/2038.userx0 b/test/mail/2038.userx0 index 4acc59105..3da6908c6 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 1 diff --git a/test/mail/2038.userx1 b/test/mail/2038.userx1 index 2d4691e52..846e2f424 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 1 diff --git a/test/mail/2038.usery0 b/test/mail/2038.usery0 index 0959b777b..7dcb5f643 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 2 diff --git a/test/mail/2038.usery1 b/test/mail/2038.usery1 index 0aaf2a5ff..6c6e34d6e 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 2 diff --git a/test/mail/2038.userz0 b/test/mail/2038.userz0 index dac74adae..c13d81d35 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 3 diff --git a/test/mail/2038.userz1 b/test/mail/2038.userz1 index 4797ffdf8..b90ad2c98 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtps (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 3 diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER index 42c189f78..a518a665c 100644 --- a/test/mail/2102.CALLER +++ b/test/mail/2102.CALLER @@ -1,36 +1,49 @@ 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) + by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 tls-certificate-verified: 0 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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:AES256-SHA:256) + by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxx:256) (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:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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:AES256-SHA:256) + by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 tls-certificate-verified: 1 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn=/CN=server2.example.com +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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-SHAxx:256) + (Exim x.yz) + (envelope-from ) + 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-SHAxx:256 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 ac3b90ea3..01d0311f0 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:AES256-SHA:256) + by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= This is a test encrypted message. diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER index 6c2f220b0..5c1d425ab 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) 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: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message to two different hosts diff --git a/test/mail/2108.abcd b/test/mail/2108.abcd index 5a6128532..ffb02d37a 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message to two different hosts diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz index 4004e8dce..a72885aba 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) 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: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message to two different hosts diff --git a/test/mail/2113.usera b/test/mail/2113.usera index 43e950776..6e84f4699 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbG-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 1 diff --git a/test/mail/2113.userb b/test/mail/2113.userb index d93f45f7c..805f6f732 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbI-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 2 diff --git a/test/mail/2113.userc b/test/mail/2113.userc index 5bc9043fb..c20ed1a3f 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbH-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 3 diff --git a/test/mail/2113.userx b/test/mail/2113.userx index 247218ae0..a49dbda78 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 1 diff --git a/test/mail/2113.usery b/test/mail/2113.usery index 78402a324..fa354c206 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 2 diff --git a/test/mail/2113.userz b/test/mail/2113.userz index 0d8210281..d73a6ab90 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 3 diff --git a/test/mail/2117.userx b/test/mail/2117.userx index bc7668ef1..1bba267ae 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 2 diff --git a/test/mail/2119.userx b/test/mail/2119.userx index 313fd6fa8..d0edb3545 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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:AES256-SHA:256) + by myhost.test.ex with smtp (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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 5f0a48734..a2a47d5ef 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER index 21b5e2c66..5bc4c80da 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:AES256-SHA:256) + by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaX-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 tls-certificate-verified: 0 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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:AES256-SHA:256) + by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxx:256) (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:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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:AES256-SHA:256) + by myhost.test.ex with smtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 tls-certificate-verified: 1 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn=/CN=server1.example.com +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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 952a4546f..5d9ddb542 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 1 diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1 index a6f4b9762..3e7abf7da 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbB-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 1 diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0 index d0c8c270f..6817ec2a8 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbE-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 2 diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1 index b7d4c665e..455487912 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbF-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 2 diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0 index 4a0f92398..86aaf4af6 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbC-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 3 diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1 index 5aca0f53a..47ac1370a 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbD-0005vi-00 @@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 3 diff --git a/test/mail/2149.userx b/test/mail/2149.userx index c74b8ded8..2f193f9fe 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:AES256-SHA:256) + by myhost.test.ex with esmtps (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaY-0005vi-00 @@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message diff --git a/test/mail/3451.userx b/test/mail/3451.userx index 17957a9a2..b2e058317 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 2 diff --git a/test/mail/3452.userx b/test/mail/3452.userx index 17957a9a2..b2e058317 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 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:xxxxRSA_AES_256_CBC_SHAnnn:256) + by myhost.test.ex with esmtpsa (TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn= +TLS: cipher=TLS1.x:ke_RSA_AES_256_CBC_SHAnnn:256 peerdn= Test message 2 diff --git a/test/mail/3461.userx b/test/mail/3461.userx index bab082ede..ec7ad309f 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:AES256-SHA:256) + by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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:AES256-SHA:256) + by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 2 diff --git a/test/mail/3462.userx b/test/mail/3462.userx index bab082ede..ec7ad309f 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:AES256-SHA:256) + by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmaZ-0005vi-00 @@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 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:AES256-SHA:256) + by myhost.test.ex with esmtpsa (TLSv1:ke-RSA-AES256-SHAxx:256) (Exim x.yz) (envelope-from ) id 10HmbA-0005vi-00 @@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz) Message-Id: From: CALLER_NAME Date: Tue, 2 Mar 1999 09:44:33 +0000 -TLS: cipher=TLSv1:AES256-SHA:256 peerdn= +TLS: cipher=TLSv1:ke-RSA-AES256-SHAxx:256 peerdn= Test message 2 -- cgit v1.2.3