[exim-cvs] TLS: restore TLS protocol version to default Received: header

Autor: Exim Git Commits Mailing List
Datum:
To: exim-cvs
Betreff: [exim-cvs] TLS: restore TLS protocol version to default Received: header

Gitweb: https://git.exim.org/exim.git/commitdiff/9f125d9fab3f3f3dd2244caa28914c256d01c339

Commit:     9f125d9fab3f3f3dd2244caa28914c256d01c339
Parent:     5b195d6b9592fcef09b0b3b31390e73226deffc9
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Nov 14 22:02:59 2019 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Nov 14 22:05:26 2019 +0000

    TLS: restore TLS protocol version to default Received: header

    Broken-by: f1be21cf0b
---
 doc/doc-docbook/spec.xfpt |  1 +
 src/src/globals.c         |  1 +
 test/mail/2002.CALLER     | 10 +++---
 test/mail/2003.userx      |  2 +-
 test/mail/2008.CALLER     |  4 +--
 test/mail/2008.abcd       |  2 +-
 test/mail/2008.xyz        |  2 +-
 test/mail/2013.usera      |  2 +-
 test/mail/2013.userb      |  2 +-
 test/mail/2013.userc      |  2 +-
 test/mail/2013.userx      |  2 +-
 test/mail/2013.usery      |  2 +-
 test/mail/2013.userz      |  2 +-
 test/mail/2017.userx      |  4 +--
 test/mail/2019.userx      |  4 +--
 test/mail/2027.userx      |  2 +-
 test/mail/2038.userx0     |  2 +-
 test/mail/2038.userx1     |  2 +-
 test/mail/2038.usery0     |  2 +-
 test/mail/2038.usery1     |  2 +-
 test/mail/2038.userz0     |  2 +-
 test/mail/2038.userz1     |  2 +-
 test/mail/2102.CALLER     |  8 ++---
 test/mail/2103.userx      |  2 +-
 test/mail/2108.CALLER     |  4 +--
 test/mail/2108.abcd       |  2 +-
 test/mail/2108.xyz        |  2 +-
 test/mail/2113.usera      |  2 +-
 test/mail/2113.userb      |  2 +-
 test/mail/2113.userc      |  2 +-
 test/mail/2113.userx      |  2 +-
 test/mail/2113.usery      |  2 +-
 test/mail/2113.userz      |  2 +-
 test/mail/2117.userx      |  4 +--
 test/mail/2119.userx      |  4 +--
 test/mail/2127.userx      |  2 +-
 test/mail/2132.CALLER     |  6 ++--
 test/mail/2138.userx0     |  2 +-
 test/mail/2138.userx1     |  2 +-
 test/mail/2138.usery0     |  2 +-
 test/mail/2138.usery1     |  2 +-
 test/mail/2138.userz0     |  2 +-
 test/mail/2138.userz1     |  2 +-
 test/mail/2149.userx      |  2 +-
 test/mail/3451.userx      |  8 ++---
 test/mail/3452.userx      |  4 +--
 test/mail/3461.userx      |  8 ++---
 test/mail/3462.userx      |  4 +--
 test/mail/3700.smtps      |  2 +-
 test/mail/3700.x          |  2 +-
 test/rejectlog/2037       |  2 +-
 test/rejectlog/2137       |  2 +-
 test/runtest              |  1 +
 test/stderr/0402          | 26 +++++++++++-----
 test/stderr/0544          | 26 +++++++++++-----
 test/stderr/5410          | 78 ++++++++++++++++++++++++++++++++---------------
 test/stderr/5420          | 78 ++++++++++++++++++++++++++++++++---------------
 57 files changed, 220 insertions(+), 137 deletions(-)

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index f0b7a62..a93f611 100644
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -16763,6 +16763,7 @@ received_header_text = Received: \
         ${if def:sender_helo_name {(helo=$sender_helo_name)\n\t}}}}\
   by $primary_hostname \
   ${if def:received_protocol {with $received_protocol }}\
+  ${if def:tls_ver           { ($tls_ver)}}\
   ${if def:tls_in_cipher_std { tls $tls_in_cipher_std\n\t}}\
   (Exim $version_number)\n\t\
   ${if def:sender_address \
diff --git a/src/src/globals.c b/src/src/globals.c
index b874c46..8162de0 100644
--- a/src/src/globals.c
+++ b/src/src/globals.c
@@ -1233,6 +1233,7 @@ uschar *received_header_text   = US
      "by $primary_hostname "
      "${if def:received_protocol {with $received_protocol }}"
 #ifndef DISABLE_TLS
+     "${if def:tls_in_ver        { ($tls_in_ver)}}"
      "${if def:tls_in_cipher_std { tls $tls_in_cipher_std\n\t}}"
 #endif
      "(Exim $version_number)\n\t"
diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER
index dc634d1..d9d0f0b 100644
--- a/test/mail/2002.CALLER
+++ b/test/mail/2002.CALLER
@@ -1,6 +1,6 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ This is a test encrypted message.

 From "name with spaces"@??? Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <"name with spaces"@???>)
     id 10HmaY-0005vi-00
@@ -24,7 +24,7 @@ This is a test encrypted message.

 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -36,7 +36,7 @@ This is a test encrypted message from a verified host.

 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
@@ -49,7 +49,7 @@ It should be sent under the RSA server cert and with an RSA cipher.

 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-    by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
diff --git a/test/mail/2003.userx b/test/mail/2003.userx
index 66c128b..6322cce 100644
--- a/test/mail/2003.userx
+++ b/test/mail/2003.userx
@@ -1,6 +1,6 @@
 From userx@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER
index f7669bd..47db7a2 100644
--- a/test/mail/2008.CALLER
+++ b/test/mail/2008.CALLER
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message. Contains FF:

 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     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 8a6aae2..51b951a 100644
--- a/test/mail/2008.abcd
+++ b/test/mail/2008.abcd
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz
index e304d94..7c88c9c 100644
--- a/test/mail/2008.xyz
+++ b/test/mail/2008.xyz
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     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 8aac112..e1d700f 100644
--- a/test/mail/2013.usera
+++ b/test/mail/2013.usera
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
diff --git a/test/mail/2013.userb b/test/mail/2013.userb
index 0a98cd8..219c068 100644
--- a/test/mail/2013.userb
+++ b/test/mail/2013.userb
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
diff --git a/test/mail/2013.userc b/test/mail/2013.userc
index efb32a6..81fd4e7 100644
--- a/test/mail/2013.userc
+++ b/test/mail/2013.userc
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbH-0005vi-00
diff --git a/test/mail/2013.userx b/test/mail/2013.userx
index f720f91..a3e13af 100644
--- a/test/mail/2013.userx
+++ b/test/mail/2013.userx
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/2013.usery b/test/mail/2013.usery
index 32797e1..6cbc72e 100644
--- a/test/mail/2013.usery
+++ b/test/mail/2013.usery
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
diff --git a/test/mail/2013.userz b/test/mail/2013.userz
index 919c86d..aec9bd9 100644
--- a/test/mail/2013.userz
+++ b/test/mail/2013.userz
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
diff --git a/test/mail/2017.userx b/test/mail/2017.userx
index 1a86c2a..b21e1e3 100644
--- a/test/mail/2017.userx
+++ b/test/mail/2017.userx
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1

 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/2019.userx b/test/mail/2019.userx
index 3b38f9a..366b788 100644
--- a/test/mail/2019.userx
+++ b/test/mail/2019.userx
@@ -1,6 +1,6 @@
 From userx@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ This is a test encrypted message.

 From userx@??? Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-    by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtp  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaY-0005vi-00
diff --git a/test/mail/2027.userx b/test/mail/2027.userx
index 08f034e..d222887 100644
--- a/test/mail/2027.userx
+++ b/test/mail/2027.userx
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
diff --git a/test/mail/2038.userx0 b/test/mail/2038.userx0
index 5d80e98..bcf6d69 100644
--- a/test/mail/2038.userx0
+++ b/test/mail/2038.userx0
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/2038.userx1 b/test/mail/2038.userx1
index 1acf09c..d5cf625 100644
--- a/test/mail/2038.userx1
+++ b/test/mail/2038.userx1
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
diff --git a/test/mail/2038.usery0 b/test/mail/2038.usery0
index 6030779..83a8585 100644
--- a/test/mail/2038.usery0
+++ b/test/mail/2038.usery0
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
diff --git a/test/mail/2038.usery1 b/test/mail/2038.usery1
index e1b08c6..cd20363 100644
--- a/test/mail/2038.usery1
+++ b/test/mail/2038.usery1
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
diff --git a/test/mail/2038.userz0 b/test/mail/2038.userz0
index 9f45587..d0b5e79 100644
--- a/test/mail/2038.userz0
+++ b/test/mail/2038.userz0
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
diff --git a/test/mail/2038.userz1 b/test/mail/2038.userz1
index 17e3991..8187e57 100644
--- a/test/mail/2038.userz1
+++ b/test/mail/2038.userz1
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 9ca8239..729308a 100644
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,6 +1,6 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ This is a test encrypted message.

 From "name with spaces"@??? Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <"name with spaces"@???>)
     id 10HmaY-0005vi-00
@@ -24,7 +24,7 @@ This is a test encrypted message.

 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -36,7 +36,7 @@ This is a test encrypted message from a verified host.

 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-    by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/2103.userx b/test/mail/2103.userx
index 66c128b..083a93f 100644
--- a/test/mail/2103.userx
+++ b/test/mail/2103.userx
@@ -1,6 +1,6 @@
 From userx@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER
index f7669bd..1fc14a2 100644
--- a/test/mail/2108.CALLER
+++ b/test/mail/2108.CALLER
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message. Contains FF:

 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     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 8a6aae2..7c56070 100644
--- a/test/mail/2108.abcd
+++ b/test/mail/2108.abcd
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz
index e304d94..cfc558c 100644
--- a/test/mail/2108.xyz
+++ b/test/mail/2108.xyz
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     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 8aac112..c9afbe7 100644
--- a/test/mail/2113.usera
+++ b/test/mail/2113.usera
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbG-0005vi-00
diff --git a/test/mail/2113.userb b/test/mail/2113.userb
index 0a98cd8..4a3ed8d 100644
--- a/test/mail/2113.userb
+++ b/test/mail/2113.userb
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbI-0005vi-00
diff --git a/test/mail/2113.userc b/test/mail/2113.userc
index efb32a6..c6b5375 100644
--- a/test/mail/2113.userc
+++ b/test/mail/2113.userc
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbH-0005vi-00
diff --git a/test/mail/2113.userx b/test/mail/2113.userx
index f720f91..f0b5558 100644
--- a/test/mail/2113.userx
+++ b/test/mail/2113.userx
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/2113.usery b/test/mail/2113.usery
index 32797e1..e3908f2 100644
--- a/test/mail/2113.usery
+++ b/test/mail/2113.usery
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
diff --git a/test/mail/2113.userz b/test/mail/2113.userz
index 919c86d..8b5c139 100644
--- a/test/mail/2113.userz
+++ b/test/mail/2113.userz
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
diff --git a/test/mail/2117.userx b/test/mail/2117.userx
index 1a86c2a..49d95b4 100644
--- a/test/mail/2117.userx
+++ b/test/mail/2117.userx
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1

 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/2119.userx b/test/mail/2119.userx
index e79ed70..c44613f 100644
--- a/test/mail/2119.userx
+++ b/test/mail/2119.userx
@@ -1,6 +1,6 @@
 From userx@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ This is a test encrypted message.

 From userx@??? Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-    by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtp  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <userx@???>)
     id 10HmaY-0005vi-00
diff --git a/test/mail/2127.userx b/test/mail/2127.userx
index 08f034e..0c0c036 100644
--- a/test/mail/2127.userx
+++ b/test/mail/2127.userx
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 1edd493..42151d1 100644
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -1,6 +1,6 @@
 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ This is a test encrypted message.

 From "name with spaces"@??? Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <"name with spaces"@???>)
     id 10HmaY-0005vi-00
@@ -24,7 +24,7 @@ This is a test encrypted message.

 From CALLER@??? Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-    by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with smtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
diff --git a/test/mail/2138.userx0 b/test/mail/2138.userx0
index 5d80e98..e17d93b 100644
--- a/test/mail/2138.userx0
+++ b/test/mail/2138.userx0
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1
index 1acf09c..0a86753 100644
--- a/test/mail/2138.userx1
+++ b/test/mail/2138.userx1
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0
index 6030779..a752457 100644
--- a/test/mail/2138.usery0
+++ b/test/mail/2138.usery0
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbE-0005vi-00
diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1
index e1b08c6..d14a0e5 100644
--- a/test/mail/2138.usery1
+++ b/test/mail/2138.usery1
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbF-0005vi-00
diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0
index 9f45587..d690604 100644
--- a/test/mail/2138.userz0
+++ b/test/mail/2138.userz0
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1
index 17e3991..37b5640 100644
--- a/test/mail/2138.userz1
+++ b/test/mail/2138.userz1
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbD-0005vi-00
diff --git a/test/mail/2149.userx b/test/mail/2149.userx
index 06590b3..f11a903 100644
--- a/test/mail/2149.userx
+++ b/test/mail/2149.userx
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaY-0005vi-00
diff --git a/test/mail/3451.userx b/test/mail/3451.userx
index b9df8e5..ce69f8a 100644
--- a/test/mail/3451.userx
+++ b/test/mail/3451.userx
@@ -1,12 +1,12 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
     for userx@???; 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:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -24,13 +24,13 @@ Test message 1

 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
     for userx@???; 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:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/3452.userx b/test/mail/3452.userx
index 6116a01..9b57954 100644
--- a/test/mail/3452.userx
+++ b/test/mail/3452.userx
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1

 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/3461.userx b/test/mail/3461.userx
index b9df8e5..44682d1 100644
--- a/test/mail/3461.userx
+++ b/test/mail/3461.userx
@@ -1,12 +1,12 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbB-0005vi-00
     for userx@???; 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:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -24,13 +24,13 @@ Test message 1

 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbC-0005vi-00
     for userx@???; 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:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/3462.userx b/test/mail/3462.userx
index 6116a01..5eefece 100644
--- a/test/mail/3462.userx
+++ b/test/mail/3462.userx
@@ -1,6 +1,6 @@
 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1

 From CALLER@??? 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-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     (envelope-from <CALLER@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/3700.smtps b/test/mail/3700.smtps
index 700d681..7fae0b2 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)
+    by myhost.test.ex with esmtpsa  (TLS_proto_and_cipher) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <ok@???>)
     id 10HmbA-0005vi-00
diff --git a/test/mail/3700.x b/test/mail/3700.x
index 8b589be..e77cdba 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)
+    by myhost.test.ex with esmtpsa  (TLS_proto_and_cipher) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     (envelope-from <ok@???>)
     id 10HmaZ-0005vi-00
diff --git a/test/rejectlog/2037 b/test/rejectlog/2037
index e60a0ed..c8a5a60 100644
--- a/test/rejectlog/2037
+++ b/test/rejectlog/2037
@@ -6,7 +6,7 @@
 Envelope-from: <>
 Envelope-to: <data_defer@???>
 P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-    by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
     (Exim x.yz)
     id 10HmaX-0005vi-00
     for data_defer@???; Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index e60a0ed..3024e8f 100644
--- a/test/rejectlog/2137
+++ b/test/rejectlog/2137
@@ -6,7 +6,7 @@
 Envelope-from: <>
 Envelope-to: <data_defer@???>
 P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-    by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+    by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
     (Exim x.yz)
     id 10HmaX-0005vi-00
     for data_defer@???; Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/runtest b/test/runtest
index 3fd125c..82105ab 100755
--- a/test/runtest
+++ b/test/runtest
@@ -656,6 +656,7 @@ RESET_AFTER_EXTRA_LINE_READ:

   # Separate reporting of TLS version
   s/ver:    TLS1(\.[123])?$/ver:    TLS1.x/;
+  s/ \(TLS1(\.[123])?\) / (TLS1.x) /;

   # GnuTLS library error message changes
   s/(No certificate was found|Certificate is required)/The peer did not send any certificate/g;
diff --git a/test/stderr/0402 b/test/stderr/0402
index 1d81d84..314a8ba 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -41,7 +41,7 @@ Data file written for message 10HmaX-0005vi-00
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -50,7 +50,7 @@ Data file written for message 10HmaX-0005vi-00
  ├─────result: false
   ╭───scanning: from $sender_rcvhost
       }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -61,7 +61,7 @@ Data file written for message 10HmaX-0005vi-00

   ╰───skipping: result is not used
   ╭considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -69,13 +69,13 @@ Data file written for message 10HmaX-0005vi-00
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ╎╭considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
    ╎    }}(Exim $version_number)
    ╎    ${if def:sender_address {(envelope-from <$sender_address>)
    ╎    }}id $message_exim_id${if def:received_for {
@@ -87,7 +87,7 @@ Data file written for message 10HmaX-0005vi-00
   ├──condition: def:sender_helo_name
   ├─────result: false
    ╭───scanning: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -102,13 +102,23 @@ Data file written for message 10HmaX-0005vi-00
   ╰─────result: from CALLER 
  ├──condition: def:received_protocol
  ├─────result: true
-  ╭considering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  ╭considering: with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
       for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local 
+ ├──condition: def:tls_in_ver
+ ├─────result: false
+  ╭───scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}(Exim $version_number)
+      ${if def:sender_address {(envelope-from <$sender_address>)
+      }}id $message_exim_id${if def:received_for {
+      for $received_for}}
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning:  tls $tls_in_cipher_std
@@ -141,7 +151,7 @@ Data file written for message 10HmaX-0005vi-00
   ╰───skipping: result is not used
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
diff --git a/test/stderr/0544 b/test/stderr/0544
index cce0311..4d05db6 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -6,7 +6,7 @@ admin user
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -15,7 +15,7 @@ admin user
  ├─────result: false
   ╭───scanning: from $sender_rcvhost
       }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -26,7 +26,7 @@ admin user

   ╰───skipping: result is not used
   ╭considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -34,13 +34,13 @@ admin user
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ╎╭considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
    ╎    }}(Exim $version_number)
    ╎    ${if def:sender_address {(envelope-from <$sender_address>)
    ╎    }}id $message_exim_id${if def:received_for {
@@ -52,7 +52,7 @@ admin user
   ├──condition: def:sender_helo_name
   ├─────result: false
    ╭───scanning: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -67,13 +67,23 @@ admin user
   ╰─────result: from CALLER 
  ├──condition: def:received_protocol
  ├─────result: true
-  ╭considering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  ╭considering: with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
       for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local 
+ ├──condition: def:tls_in_ver
+ ├─────result: false
+  ╭───scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}(Exim $version_number)
+      ${if def:sender_address {(envelope-from <$sender_address>)
+      }}id $message_exim_id${if def:received_for {
+      for $received_for}}
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning:  tls $tls_in_cipher_std
@@ -106,7 +116,7 @@ admin user
   ╰───skipping: result is not used
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
diff --git a/test/stderr/5410 b/test/stderr/5410
index a554fd9..5fc3c82 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -140,7 +140,7 @@ end of inline ACL: ACCEPT
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -149,7 +149,7 @@ end of inline ACL: ACCEPT
  ├─────result: false
   ╭───scanning: from $sender_rcvhost
       }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -160,7 +160,7 @@ end of inline ACL: ACCEPT

   ╰───skipping: result is not used
   ╭considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -168,13 +168,13 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ╎╭considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
    ╎    }}(Exim $version_number)
    ╎    ${if def:sender_address {(envelope-from <$sender_address>)
    ╎    }}id $message_exim_id${if def:received_for {
@@ -186,7 +186,7 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_helo_name
   ├─────result: true
    ╭considering: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -203,13 +203,23 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──condition: def:received_protocol
  ├─────result: true
-  ╭considering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  ╭considering: with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
       for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local-esmtp 
+ ├──condition: def:tls_in_ver
+ ├─────result: false
+  ╭───scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}(Exim $version_number)
+      ${if def:sender_address {(envelope-from <$sender_address>)
+      }}id $message_exim_id${if def:received_for {
+      for $received_for}}
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning:  tls $tls_in_cipher_std
@@ -242,7 +252,7 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -383,7 +393,7 @@ end of inline ACL: ACCEPT
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -392,7 +402,7 @@ end of inline ACL: ACCEPT
  ├─────result: false
   ╭───scanning: from $sender_rcvhost
       }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -403,7 +413,7 @@ end of inline ACL: ACCEPT

   ╰───skipping: result is not used
   ╭considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -411,13 +421,13 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ╎╭considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
    ╎    }}(Exim $version_number)
    ╎    ${if def:sender_address {(envelope-from <$sender_address>)
    ╎    }}id $message_exim_id${if def:received_for {
@@ -429,7 +439,7 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_helo_name
   ├─────result: true
    ╭considering: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -446,13 +456,23 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──condition: def:received_protocol
  ├─────result: true
-  ╭considering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  ╭considering: with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
       for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local-esmtp 
+ ├──condition: def:tls_in_ver
+ ├─────result: false
+  ╭───scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}(Exim $version_number)
+      ${if def:sender_address {(envelope-from <$sender_address>)
+      }}id $message_exim_id${if def:received_for {
+      for $received_for}}
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning:  tls $tls_in_cipher_std
@@ -485,7 +505,7 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -626,7 +646,7 @@ end of inline ACL: ACCEPT
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -635,7 +655,7 @@ end of inline ACL: ACCEPT
  ├─────result: false
   ╭───scanning: from $sender_rcvhost
       }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -646,7 +666,7 @@ end of inline ACL: ACCEPT

   ╰───skipping: result is not used
   ╭considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -654,13 +674,13 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ╎╭considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
    ╎    }}(Exim $version_number)
    ╎    ${if def:sender_address {(envelope-from <$sender_address>)
    ╎    }}id $message_exim_id${if def:received_for {
@@ -672,7 +692,7 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_helo_name
   ├─────result: true
    ╭considering: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -689,13 +709,23 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──condition: def:received_protocol
  ├─────result: true
-  ╭considering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  ╭considering: with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
       for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local-esmtp 
+ ├──condition: def:tls_in_ver
+ ├─────result: false
+  ╭───scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}(Exim $version_number)
+      ${if def:sender_address {(envelope-from <$sender_address>)
+      }}id $message_exim_id${if def:received_for {
+      for $received_for}}
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning:  tls $tls_in_cipher_std
@@ -728,7 +758,7 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
diff --git a/test/stderr/5420 b/test/stderr/5420
index 9aefc24..e8ea2bc 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -141,7 +141,7 @@ end of inline ACL: ACCEPT
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -150,7 +150,7 @@ end of inline ACL: ACCEPT
  ├─────result: false
   ╭───scanning: from $sender_rcvhost
       }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -161,7 +161,7 @@ end of inline ACL: ACCEPT

   ╰───skipping: result is not used
   ╭considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -169,13 +169,13 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ╎╭considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
    ╎    }}(Exim $version_number)
    ╎    ${if def:sender_address {(envelope-from <$sender_address>)
    ╎    }}id $message_exim_id${if def:received_for {
@@ -187,7 +187,7 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_helo_name
   ├─────result: true
    ╭considering: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -204,13 +204,23 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──condition: def:received_protocol
  ├─────result: true
-  ╭considering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  ╭considering: with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
       for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local-esmtp 
+ ├──condition: def:tls_in_ver
+ ├─────result: false
+  ╭───scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}(Exim $version_number)
+      ${if def:sender_address {(envelope-from <$sender_address>)
+      }}id $message_exim_id${if def:received_for {
+      for $received_for}}
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning:  tls $tls_in_cipher_std
@@ -243,7 +253,7 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -384,7 +394,7 @@ end of inline ACL: ACCEPT
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -393,7 +403,7 @@ end of inline ACL: ACCEPT
  ├─────result: false
   ╭───scanning: from $sender_rcvhost
       }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -404,7 +414,7 @@ end of inline ACL: ACCEPT

   ╰───skipping: result is not used
   ╭considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -412,13 +422,13 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ╎╭considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
    ╎    }}(Exim $version_number)
    ╎    ${if def:sender_address {(envelope-from <$sender_address>)
    ╎    }}id $message_exim_id${if def:received_for {
@@ -430,7 +440,7 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_helo_name
   ├─────result: true
    ╭considering: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -447,13 +457,23 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──condition: def:received_protocol
  ├─────result: true
-  ╭considering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  ╭considering: with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
       for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local-esmtp 
+ ├──condition: def:tls_in_ver
+ ├─────result: false
+  ╭───scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}(Exim $version_number)
+      ${if def:sender_address {(envelope-from <$sender_address>)
+      }}id $message_exim_id${if def:received_for {
+      for $received_for}}
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning:  tls $tls_in_cipher_std
@@ -486,7 +506,7 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -627,7 +647,7 @@ end of inline ACL: ACCEPT
  ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ╭considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {
@@ -636,7 +656,7 @@ end of inline ACL: ACCEPT
  ├─────result: false
   ╭───scanning: from $sender_rcvhost
       }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -647,7 +667,7 @@ end of inline ACL: ACCEPT

   ╰───skipping: result is not used
   ╭considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
@@ -655,13 +675,13 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ╎╭considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   ╎    }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
    ╎    }}(Exim $version_number)
    ╎    ${if def:sender_address {(envelope-from <$sender_address>)
    ╎    }}id $message_exim_id${if def:received_for {
@@ -673,7 +693,7 @@ end of inline ACL: ACCEPT
   ├──condition: def:sender_helo_name
   ├─────result: true
    ╭considering: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -690,13 +710,23 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──condition: def:received_protocol
  ├─────result: true
-  ╭considering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  ╭considering: with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
       }}(Exim $version_number)
       ${if def:sender_address {(envelope-from <$sender_address>)
       }}id $message_exim_id${if def:received_for {
       for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local-esmtp 
+ ├──condition: def:tls_in_ver
+ ├─────result: false
+  ╭───scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+      }}(Exim $version_number)
+      ${if def:sender_address {(envelope-from <$sender_address>)
+      }}id $message_exim_id${if def:received_for {
+      for $received_for}}
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning:  tls $tls_in_cipher_std
@@ -729,7 +759,7 @@ end of inline ACL: ACCEPT
              ╰──(tainted)
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
      }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+     }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
      }}(Exim $version_number)
      ${if def:sender_address {(envelope-from <$sender_address>)
      }}id $message_exim_id${if def:received_for {

Diese Nachricht ist Teil des folgenden Threads:
	Der komplette Thread sortiert nach Datum
	Exim Git Commits Mailing List am

[exim-cvs] TLS: restore TLS protocol version to default Rece…