TLS: restore TLS protocol version to default Received: header

Broken-by: f1be21cf0b

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index f0b7a626defd434e1533dc79d19f2a23bffabf19..a93f611825df6d24e3590450db79fc250093d8a5 100644 (file)
--- 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 b874c466909bb108a332ef54797d3513eb362910..8162de0c4d215368ecf660ddfe9fa2e0c2c1029f 100644 (file)
--- 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 dc634d1e994f6afab427f65868d286021db0ff90..d9d0f0b8c4c0fc79da020733ec8109b9f86491d3 100644 (file)
--- 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: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@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: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"@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: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@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: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@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: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@test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2003.userx b/test/mail/2003.userx
index 66c128b6825515ce94f03d25876c9f279937a4fc..6322ccebb65143be8e3aaafd0147bb847692c7d0 100644 (file)
--- 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: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@test.ex>)
        id 10HmaX-0005vi-00

diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER
index f7669bdbc2fec629b587a8fe33b7537df358a76c..47db7a2a8e82c3993857a9c804e8d1f0308715f5 100644 (file)
--- a/test/mail/2008.CALLER
+++ b/test/mail/2008.CALLER
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=helo.data.changed)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@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: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@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 8a6aae2ccffc41d79e93e2ab5828ab4cdaba21ea..51b951aa3b4d2be29f6a21a9e524168be9912ba6 100644 (file)
--- a/test/mail/2008.abcd
+++ b/test/mail/2008.abcd
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz
index e304d943c900f7eec7a2e0515ee8d6f2d509d216..7c88c9c7f0757254b6ead99bc8e8a9c73252e093 100644 (file)
--- a/test/mail/2008.xyz
+++ b/test/mail/2008.xyz
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=helo.data.changed)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@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 8aac112ac3f9b0c9771ff32c571d820a7814e7b4..e1d700f110d0724216ed9667d135758d77f32e39 100644 (file)
--- a/test/mail/2013.usera
+++ b/test/mail/2013.usera
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbG-0005vi-00

diff --git a/test/mail/2013.userb b/test/mail/2013.userb
index 0a98cd802b65d536f0216f32f75b7a00aed3e92a..219c068172588855d806b31cd187a2f464b82cba 100644 (file)
--- a/test/mail/2013.userb
+++ b/test/mail/2013.userb
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbI-0005vi-00

diff --git a/test/mail/2013.userc b/test/mail/2013.userc
index efb32a668bd1ec1f258225faa73d88b7947172c2..81fd4e7270aa47e62f81caa4fc1077e80e3e012e 100644 (file)
--- a/test/mail/2013.userc
+++ b/test/mail/2013.userc
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbH-0005vi-00

diff --git a/test/mail/2013.userx b/test/mail/2013.userx
index f720f911a5798600898ca0ef531d842978af3b6b..a3e13af4233d41889be426eb616059103479bcf1 100644 (file)
--- a/test/mail/2013.userx
+++ b/test/mail/2013.userx
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2013.usery b/test/mail/2013.usery
index 32797e12f9b6c2db90548edd50f9f9a4889d3505..6cbc72e8f98744b36ef179e5d1ddd122507941af 100644 (file)
--- a/test/mail/2013.usery
+++ b/test/mail/2013.usery
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbC-0005vi-00

diff --git a/test/mail/2013.userz b/test/mail/2013.userz
index 919c86d235f6931afd2ca56e5b97d6086220644f..aec9bd92f5efe1f032c0e343e609c57f91b53d5c 100644 (file)
--- a/test/mail/2013.userz
+++ b/test/mail/2013.userz
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2017.userx b/test/mail/2017.userx
index 1a86c2aa7594111048f85a9a72278e546b152a1e..b21e1e3825c4b0204b6c568e16f4de9153b8937b 100644 (file)
--- a/test/mail/2017.userx
+++ b/test/mail/2017.userx
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@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: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@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2019.userx b/test/mail/2019.userx
index 3b38f9a48672c68323566559b2e28870b2c7e542..366b78801bca063822ae1bb00b829c1704dc1a08 100644 (file)
--- 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: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@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: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@test.ex>)
        id 10HmaY-0005vi-00

diff --git a/test/mail/2027.userx b/test/mail/2027.userx
index 08f034e29c002dd3cb44a7a80a6d439cf6f96939..d222887f9d42b97cf664ef79805a433d7bff5be1 100644 (file)
--- a/test/mail/2027.userx
+++ b/test/mail/2027.userx
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmaZ-0005vi-00

diff --git a/test/mail/2038.userx0 b/test/mail/2038.userx0
index 5d80e9866f7cc065079f4819f02a9c47a84d2ee9..bcf6d69cf28cf715d3c7ffbda2c5f32c878ab222 100644 (file)
--- a/test/mail/2038.userx0
+++ b/test/mail/2038.userx0
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2038.userx1 b/test/mail/2038.userx1
index 1acf09c8f5dd1f4f8f71aca36078e30c0fecccda..d5cf625cc66bf2e013ef5191520fd3b46ad94eb3 100644 (file)
--- a/test/mail/2038.userx1
+++ b/test/mail/2038.userx1
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2038.usery0 b/test/mail/2038.usery0
index 6030779c83dfffb7536a4d4ea0ea1100239d658c..83a8585f9460831397b72c6f748627500515592d 100644 (file)
--- a/test/mail/2038.usery0
+++ b/test/mail/2038.usery0
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbE-0005vi-00

diff --git a/test/mail/2038.usery1 b/test/mail/2038.usery1
index e1b08c6adf4ad2fcfdd65bcdd0a67711d8d2b2f5..cd20363babdd8cf7fdef9139dc50781bd386476d 100644 (file)
--- a/test/mail/2038.usery1
+++ b/test/mail/2038.usery1
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbF-0005vi-00

diff --git a/test/mail/2038.userz0 b/test/mail/2038.userz0
index 9f4558735486001d25a22c94e189e34cc776388c..d0b5e7931d7e947ab6e17ed1ef268cfb0c55639f 100644 (file)
--- a/test/mail/2038.userz0
+++ b/test/mail/2038.userz0
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbC-0005vi-00

diff --git a/test/mail/2038.userz1 b/test/mail/2038.userz1
index 17e3991b0c03502187737959b53cd4ede6f5af92..8187e572b6780b3bdeb656fa34e609adcab3d581 100644 (file)
--- a/test/mail/2038.userz1
+++ b/test/mail/2038.userz1
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-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@myhost.test.ex>)
        id 10HmbD-0005vi-00

diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 9ca82395f6fc427654c35a1fbc65820f5440aa42..729308a9f16297f86a529ffd665d913a4a52c970 100644 (file)
--- 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: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@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: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"@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: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@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: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@test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2103.userx b/test/mail/2103.userx
index 66c128b6825515ce94f03d25876c9f279937a4fc..083a93f850e7ca6ebe1a059861f82cb02e439887 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with smtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 f7669bdbc2fec629b587a8fe33b7537df358a76c..1fc14a2860f391c9ab4310d26d721a13008e0b55 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 8a6aae2ccffc41d79e93e2ab5828ab4cdaba21ea..7c560703b85fc9220604557f3f14d96d53b36f98 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 e304d943c900f7eec7a2e0515ee8d6f2d509d216..cfc558ce8bca6b57e13a536ae16e8900e6d7cf73 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 8aac112ac3f9b0c9771ff32c571d820a7814e7b4..c9afbe7b3b7c9b504366700d64dfcc42ba860cd6 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 0a98cd802b65d536f0216f32f75b7a00aed3e92a..4a3ed8d8982c5ac5e411b93ef970ad5c362411e2 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 efb32a668bd1ec1f258225faa73d88b7947172c2..c6b53751ba15a767ba1b713277b5330f63e0d328 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 f720f911a5798600898ca0ef531d842978af3b6b..f0b5558db1b36ac5b9b46187e8b944acb1c2ae15 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 32797e12f9b6c2db90548edd50f9f9a4889d3505..e3908f2c1fa4c65738a71d445cfcab9c453d9553 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 919c86d235f6931afd2ca56e5b97d6086220644f..8b5c139c0eddd203f7e724d174536fe90ba34296 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 1a86c2aa7594111048f85a9a72278e546b152a1e..49d95b4dde3b475a30e3e7b14e8741887fabe700 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 e79ed70b47ccc9c287032ac6a08dbcee248e37c0..c44613fa057aeab5919181b704caf8f1ef8b5969 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with smtp  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 08f034e29c002dd3cb44a7a80a6d439cf6f96939..0c0c036e85d1cf826a89bb65a6dcdae51a78c58c 100644 (file)
--- 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: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@myhost.test.ex>)
        id 10HmaZ-0005vi-00

diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 1edd49384fcffc19feb7e98c4a03a46ca617fdfd..42151d1437747649740a101e94710cfded69b5af 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with smtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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: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"@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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with smtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 5d80e9866f7cc065079f4819f02a9c47a84d2ee9..e17d93bc79f259ee224c4b83b9761a7b0150da8f 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 1acf09c8f5dd1f4f8f71aca36078e30c0fecccda..0a86753436e3097e46db909e928e7a977bfe7b6f 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 6030779c83dfffb7536a4d4ea0ea1100239d658c..a752457b3b73350c01f793bb31e5aa980edfe3f2 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 e1b08c6adf4ad2fcfdd65bcdd0a67711d8d2b2f5..d14a0e5aedb2fe4aee73b0e9a2504f691fb4a089 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 9f4558735486001d25a22c94e189e34cc776388c..d6906043a1245ed2d4a94a10602ccc635fb69f17 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 17e3991b0c03502187737959b53cd4ede6f5af92..37b5640f736bbf506ee4c38721cc4262e8eceb1d 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 06590b3e7e62bd05c6b2ce17602ec1857e1cfb85..f11a903ca864e86daa432a49e18ae396e10f0c28 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 b9df8e528342e902ef524f74ba3794d4522110a7..ce69f8a1962baa9dc9cd1adfff2e3c8e0a0521c8 100644 (file)
--- 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: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@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: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@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: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@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: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@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/3452.userx b/test/mail/3452.userx
index 6116a01db62337860164324674b9910510161a2e..9b579541f57cea19c26278f050e5c900ae426831 100644 (file)
--- a/test/mail/3452.userx
+++ b/test/mail/3452.userx
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-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@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: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@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/3461.userx b/test/mail/3461.userx
index b9df8e528342e902ef524f74ba3794d4522110a7..44682d1148e1af4b6537fe412e0fe75ae18ea73d 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 6116a01db62337860164324674b9910510161a2e..5eefecefa5e7d7c9a0d242204968d80ce49f6240 100644 (file)
--- 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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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:ke-RSA-AES256-SHAnnn:xxx)
+       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
        (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 700d68128ac121f3e6e2fa45542e3274c9c26302..7fae0b2738cfb62c1928bbea770388d61837c45a 100644 (file)
--- 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@test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/3700.x b/test/mail/3700.x
index 8b589be7aab2da1e362b10d499bdfb51c7bdcafc..e77cdbae8d1b46687f581a1c8f1ed7044f981f69 100644 (file)
--- 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@test.ex>)
        id 10HmaZ-0005vi-00

diff --git a/test/rejectlog/2037 b/test/rejectlog/2037
index e60a0edd59090573290a3f84a1c6c33f044d6512..c8a5a606b9beaf617f6531dd3e5d26d97d37b38f 100644 (file)
--- 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: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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index e60a0edd59090573290a3f84a1c6c33f044d6512..3024e8fbc2530294dfb928fe0e9c2b62fe0ff84e 100644 (file)
--- 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: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@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/runtest b/test/runtest
index 3fd125cc098080c7f9679831744708947f704848..82105abe8d701c670a127ccf5b17e5c8b229d641 100755 (executable)
--- 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 1d81d845ca63bade52b4c52e371cb14a51e541e2..314a8ba3ae9f403259411609006dac2226b38e19 100644 (file)
--- 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 cce0311012460e32b186a8da6707fde4936bc880..4d05db641c3e82aaf77efeec5f9883d611ff4f8e 100644 (file)
--- 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 a554fd953e6a010a39fff0df54d0a6414f30c55a..5fc3c82eaa8347788402f93c515399e13defbf50 100644 (file)
--- 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 9aefc2431b68eb7376694bd2b6eb110fe793f3ee..e8ea2bcf479dbfb912237862cd2817893f5414df 100644 (file)
--- 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 {