diff options
Diffstat (limited to 'test')
51 files changed, 77 insertions, 80 deletions
diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER index d9d0f0b8c..dc634d1e9 100644 --- a/test/mail/2002.CALLER +++ b/test/mail/2002.CALLER @@ -1,6 +1,6 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -12,7 +12,7 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -24,7 +24,7 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -36,7 +36,7 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -49,7 +49,7 @@ 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) tls TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2003.userx b/test/mail/2003.userx index 6322ccebb..66c128b68 100644 --- a/test/mail/2003.userx +++ b/test/mail/2003.userx @@ -1,6 +1,6 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER index 47db7a2a8..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -18,7 +18,7 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2008.abcd b/test/mail/2008.abcd index 51b951aa3..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz index 7c88c9c7f..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2013.usera b/test/mail/2013.usera index e1d700f11..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2013.userb b/test/mail/2013.userb index 219c06817..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2013.userc b/test/mail/2013.userc index 81fd4e727..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2013.userx b/test/mail/2013.userx index a3e13af42..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2013.usery b/test/mail/2013.usery index 6cbc72e8f..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2013.userz b/test/mail/2013.userz index aec9bd92f..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2017.userx b/test/mail/2017.userx index b21e1e382..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -18,7 +18,7 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2019.userx b/test/mail/2019.userx index 366b78801..3b38f9a48 100644 --- a/test/mail/2019.userx +++ b/test/mail/2019.userx @@ -1,6 +1,6 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -11,7 +11,7 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2027.userx b/test/mail/2027.userx index d222887f9..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2038.userx0 b/test/mail/2038.userx0 index bcf6d69cf..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2038.userx1 b/test/mail/2038.userx1 index d5cf625cc..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2038.usery0 b/test/mail/2038.usery0 index 83a8585f9..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2038.usery1 b/test/mail/2038.usery1 index cd20363ba..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2038.userz0 b/test/mail/2038.userz0 index d0b5e7931..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2038.userz1 b/test/mail/2038.userz1 index 8187e572b..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER index 729308a9f..9ca82395f 100644 --- a/test/mail/2102.CALLER +++ b/test/mail/2102.CALLER @@ -1,6 +1,6 @@ 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) tls TLS_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -12,7 +12,7 @@ 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) tls TLS_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -24,7 +24,7 @@ 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) tls TLS_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -36,7 +36,7 @@ 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) tls TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2103.userx b/test/mail/2103.userx index 083a93f85..66c128b68 100644 --- a/test/mail/2103.userx +++ b/test/mail/2103.userx @@ -1,6 +1,6 @@ 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) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER index 1fc14a286..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 @@ -18,7 +18,7 @@ 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) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2108.abcd b/test/mail/2108.abcd index 7c560703b..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz index cfc558ce8..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2113.usera b/test/mail/2113.usera index c9afbe7b3..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2113.userb b/test/mail/2113.userb index 4a3ed8d89..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2113.userc b/test/mail/2113.userc index c6b53751b..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2113.userx b/test/mail/2113.userx index f0b5558db..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2113.usery b/test/mail/2113.usery index e3908f2c1..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2113.userz b/test/mail/2113.userz index 8b5c139c0..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2117.userx b/test/mail/2117.userx index 49d95b4dd..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 @@ -18,7 +18,7 @@ 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) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2119.userx b/test/mail/2119.userx index c44613fa0..e79ed70b4 100644 --- a/test/mail/2119.userx +++ b/test/mail/2119.userx @@ -1,6 +1,6 @@ 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) tls ke-RSA-AES256-SHAnnn + 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 @@ -11,7 +11,7 @@ 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) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2127.userx b/test/mail/2127.userx index 0c0c036e8..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 (TLS1.x) tls TLS_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER index 42151d143..1edd49384 100644 --- a/test/mail/2132.CALLER +++ b/test/mail/2132.CALLER @@ -1,6 +1,6 @@ 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) tls ke-RSA-AES256-SHAnnn + 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 @@ -12,7 +12,7 @@ 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) tls ke-RSA-AES256-SHAnnn + 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 @@ -24,7 +24,7 @@ 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) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2138.userx0 b/test/mail/2138.userx0 index e17d93bc7..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1 index 0a8675343..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0 index a752457b3..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1 index d14a0e5ae..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0 index d6906043a..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1 index 37b5640f7..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/2149.userx b/test/mail/2149.userx index f11a903ca..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/3451.userx b/test/mail/3451.userx index ce69f8a19..b9df8e528 100644 --- a/test/mail/3451.userx +++ b/test/mail/3451.userx @@ -1,12 +1,12 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -24,13 +24,13 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/3452.userx b/test/mail/3452.userx index 9b579541f..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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 @@ -18,7 +18,7 @@ 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + 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 diff --git a/test/mail/3461.userx b/test/mail/3461.userx index 44682d114..b9df8e528 100644 --- a/test/mail/3461.userx +++ b/test/mail/3461.userx @@ -1,12 +1,12 @@ 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) tls ke-RSA-AES256-SHAnnn + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) id 10HmbB-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 @@ -24,13 +24,13 @@ 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) tls ke-RSA-AES256-SHAnnn + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) (envelope-from <CALLER@myhost.test.ex>) id 10HmbC-0005vi-00 for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/3462.userx b/test/mail/3462.userx index 5eefecefa..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 (TLS1.x) tls ke-RSA-AES256-SHAnnn + 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 @@ -18,7 +18,7 @@ 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) tls ke-RSA-AES256-SHAnnn + 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 diff --git a/test/mail/3700.smtps b/test/mail/3700.smtps index 7fae0b273..66d2afe48 100644 --- a/test/mail/3700.smtps +++ b/test/mail/3700.smtps @@ -3,7 +3,7 @@ Authentication-Results: myhost.test.ex; iprev=pass (localhost) smtp.remote-ip=127.0.0.1; auth=pass (tls) x509.auth="Phil Pennock" Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLS_proto_and_cipher) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) (envelope-from <ok@test.ex>) id 10HmbA-0005vi-00 diff --git a/test/mail/3700.x b/test/mail/3700.x index e77cdbae8..d520cfe15 100644 --- a/test/mail/3700.x +++ b/test/mail/3700.x @@ -3,7 +3,7 @@ Authentication-Results: myhost.test.ex; iprev=pass (localhost) smtp.remote-ip=127.0.0.1; auth=pass (tls) x509.auth="Phil Pennock" Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtpsa (TLS_proto_and_cipher) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) (envelope-from <ok@test.ex>) id 10HmaZ-0005vi-00 diff --git a/test/rejectlog/2037 b/test/rejectlog/2037 index c8a5a606b..e60a0edd5 100644 --- a/test/rejectlog/2037 +++ b/test/rejectlog/2037 @@ -6,7 +6,7 @@ Envelope-from: <> Envelope-to: <data_defer@test.ex> P Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) id 10HmaX-0005vi-00 for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/rejectlog/2137 b/test/rejectlog/2137 index 3024e8fbc..e60a0edd5 100644 --- a/test/rejectlog/2137 +++ b/test/rejectlog/2137 @@ -6,7 +6,7 @@ Envelope-from: <> Envelope-to: <data_defer@test.ex> P Received: from localhost ([127.0.0.1] helo=myhost.test.ex) - by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn + by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx) (Exim x.yz) id 10HmaX-0005vi-00 for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000 diff --git a/test/runtest b/test/runtest index 82105abe8..1215e6165 100755 --- a/test/runtest +++ b/test/runtest @@ -554,8 +554,8 @@ RESET_AFTER_EXTRA_LINE_READ: # element (and no _WITH); insert a spurious "RSA". # Also in $tls_X_cipher_std reporting. - s/^\s+by .+ with .+ \K tls TLS_.*?([^_]+)_WITH.+$/(TLS1.x:ke-$1-AES256-SHAnnn:xxx)/; - s/^\s+by .+ with .+ \K tls TLS_.+$/(TLS1.x:ke-RSA-AES256-SHAnnn:xxx)/; + s/^\s+by \S+ with .+ \K \(TLS1(?:\.[0-3])?\) tls TLS_.*?([^_]+)_WITH.+$/(TLS1.x:ke-$1-AES256-SHAnnn:xxx)/; + s/^\s+by \S+ with .+ \K \(TLS1(?:\.[0-3])?\) tls TLS_.+$/(TLS1.x:ke-RSA-AES256-SHAnnn:xxx)/; s/ cipher_ TLS_.*?([^_]+)_WITH.+$/ cipher_ TLS1.x:ke_$1_WITH_ci_mac/; s/ cipher_ TLS_.*$/ cipher_ TLS1.x:ke_RSA_WITH_ci_mac/; @@ -655,8 +655,8 @@ RESET_AFTER_EXTRA_LINE_READ: s/\b(ECDHE-(RSA|ECDSA)-AES256-SHA|DHE-RSA-AES256-SHA256)\b/ke-$2-AES256-SHAnnn/g; # Separate reporting of TLS version - s/ver: TLS1(\.[123])?$/ver: TLS1.x/; - s/ \(TLS1(\.[123])?\) / (TLS1.x) /; + s/ver: TLS1(\.[0-3])?$/ver: TLS1.x/; + s/ \(TLS1(\.[0-3])?\) / (TLS1.x) /; # GnuTLS library error message changes s/(No certificate was found|Certificate is required)/The peer did not send any certificate/g; @@ -1769,9 +1769,6 @@ $munges = s! DN="[^,"]*\K,!/!; ', 'rejectlog' => 's/ X=TLS\S+ / X=TLS_proto_and_cipher /', - 'mail' => 's/^\s+by .+ with .+ \K tls TLS_.+$/(TLS_proto_and_cipher)/; - s/ \(TLS[^)]*\)/ (TLS_proto_and_cipher)/; - ', }, 'debug_pid' => |