Testsuite: fix Recieved: header munging for TLS info

diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER
index d9d0f0b8c4c0fc79da020733ec8109b9f86491d3..dc634d1e994f6afab427f65868d286021db0ff90 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-       by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <"name with spaces"@test.ex>)
        id 10HmaY-0005vi-00
@@ -24,7 +24,7 @@ This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
@@ -36,7 +36,7 @@ This is a test encrypted message from a verified host.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-       by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00
@@ -49,7 +49,7 @@ It should be sent under the RSA server cert and with an RSA cipher.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-       by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2003.userx b/test/mail/2003.userx
index 6322ccebb65143be8e3aaafd0147bb847692c7d0..66c128b6825515ce94f03d25876c9f279937a4fc 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaX-0005vi-00

diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER
index 47db7a2a8e82c3993857a9c804e8d1f0308715f5..f7669bdbc2fec629b587a8fe33b7537df358a76c 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message. Contains FF: 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=helo.data.changed)
-       by myhost.test.ex with esmtps  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/2008.abcd b/test/mail/2008.abcd
index 51b951aa3b4d2be29f6a21a9e524168be9912ba6..8a6aae2ccffc41d79e93e2ab5828ab4cdaba21ea 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz
index 7c88c9c7f0757254b6ead99bc8e8a9c73252e093..e304d943c900f7eec7a2e0515ee8d6f2d509d216 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/2013.usera b/test/mail/2013.usera
index e1d700f110d0724216ed9667d135758d77f32e39..8aac112ac3f9b0c9771ff32c571d820a7814e7b4 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbG-0005vi-00

diff --git a/test/mail/2013.userb b/test/mail/2013.userb
index 219c068172588855d806b31cd187a2f464b82cba..0a98cd802b65d536f0216f32f75b7a00aed3e92a 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbI-0005vi-00

diff --git a/test/mail/2013.userc b/test/mail/2013.userc
index 81fd4e7270aa47e62f81caa4fc1077e80e3e012e..efb32a668bd1ec1f258225faa73d88b7947172c2 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbH-0005vi-00

diff --git a/test/mail/2013.userx b/test/mail/2013.userx
index a3e13af4233d41889be426eb616059103479bcf1..f720f911a5798600898ca0ef531d842978af3b6b 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2013.usery b/test/mail/2013.usery
index 6cbc72e8f98744b36ef179e5d1ddd122507941af..32797e12f9b6c2db90548edd50f9f9a4889d3505 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbC-0005vi-00

diff --git a/test/mail/2013.userz b/test/mail/2013.userz
index aec9bd92f5efe1f032c0e343e609c57f91b53d5c..919c86d235f6931afd2ca56e5b97d6086220644f 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00

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

diff --git a/test/mail/2019.userx b/test/mail/2019.userx
index 366b78801bca063822ae1bb00b829c1704dc1a08..3b38f9a48672c68323566559b2e28870b2c7e542 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ This is a test encrypted message.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtp  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00

diff --git a/test/mail/2027.userx b/test/mail/2027.userx
index d222887f9d42b97cf664ef79805a433d7bff5be1..08f034e29c002dd3cb44a7a80a6d439cf6f96939 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00

diff --git a/test/mail/2038.userx0 b/test/mail/2038.userx0
index bcf6d69cf28cf715d3c7ffbda2c5f32c878ab222..5d80e9866f7cc065079f4819f02a9c47a84d2ee9 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2038.userx1 b/test/mail/2038.userx1
index d5cf625cc66bf2e013ef5191520fd3b46ad94eb3..1acf09c8f5dd1f4f8f71aca36078e30c0fecccda 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2038.usery0 b/test/mail/2038.usery0
index 83a8585f9460831397b72c6f748627500515592d..6030779c83dfffb7536a4d4ea0ea1100239d658c 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbE-0005vi-00

diff --git a/test/mail/2038.usery1 b/test/mail/2038.usery1
index cd20363babdd8cf7fdef9139dc50781bd386476d..e1b08c6adf4ad2fcfdd65bcdd0a67711d8d2b2f5 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00

diff --git a/test/mail/2038.userz0 b/test/mail/2038.userz0
index d0b5e7931d7e947ab6e17ed1ef268cfb0c55639f..9f4558735486001d25a22c94e189e34cc776388c 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbC-0005vi-00

diff --git a/test/mail/2038.userz1 b/test/mail/2038.userz1
index 8187e572b6780b3bdeb656fa34e609adcab3d581..17e3991b0c03502187737959b53cd4ede6f5af92 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbD-0005vi-00

diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 729308a9f16297f86a529ffd665d913a4a52c970..9ca82395f6fc427654c35a1fbc65820f5440aa42 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) tls TLS_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-       by myhost.test.ex with smtps  (TLS1.x) tls TLS_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <"name with spaces"@test.ex>)
        id 10HmaY-0005vi-00
@@ -24,7 +24,7 @@ This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtps  (TLS1.x) tls TLS_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00
@@ -36,7 +36,7 @@ This is a test encrypted message from a verified host.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-       by myhost.test.ex with smtps  (TLS1.x) tls TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2103.userx b/test/mail/2103.userx
index 083a93f850e7ca6ebe1a059861f82cb02e439887..66c128b6825515ce94f03d25876c9f279937a4fc 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaX-0005vi-00

diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER
index 1fc14a2860f391c9ab4310d26d721a13008e0b55..f7669bdbc2fec629b587a8fe33b7537df358a76c 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message. Contains FF: 
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=helo.data.changed)
-       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/2108.abcd b/test/mail/2108.abcd
index 7c560703b85fc9220604557f3f14d96d53b36f98..8a6aae2ccffc41d79e93e2ab5828ab4cdaba21ea 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz
index cfc558ce8bca6b57e13a536ae16e8900e6d7cf73..e304d943c900f7eec7a2e0515ee8d6f2d509d216 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/mail/2113.usera b/test/mail/2113.usera
index c9afbe7b3b7c9b504366700d64dfcc42ba860cd6..8aac112ac3f9b0c9771ff32c571d820a7814e7b4 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbG-0005vi-00

diff --git a/test/mail/2113.userb b/test/mail/2113.userb
index 4a3ed8d8982c5ac5e411b93ef970ad5c362411e2..0a98cd802b65d536f0216f32f75b7a00aed3e92a 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbI-0005vi-00

diff --git a/test/mail/2113.userc b/test/mail/2113.userc
index c6b53751ba15a767ba1b713277b5330f63e0d328..efb32a668bd1ec1f258225faa73d88b7947172c2 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbH-0005vi-00

diff --git a/test/mail/2113.userx b/test/mail/2113.userx
index f0b5558db1b36ac5b9b46187e8b944acb1c2ae15..f720f911a5798600898ca0ef531d842978af3b6b 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2113.usery b/test/mail/2113.usery
index e3908f2c1fa4c65738a71d445cfcab9c453d9553..32797e12f9b6c2db90548edd50f9f9a4889d3505 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbC-0005vi-00

diff --git a/test/mail/2113.userz b/test/mail/2113.userz
index 8b5c139c0eddd203f7e724d174536fe90ba34296..919c86d235f6931afd2ca56e5b97d6086220644f 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2117.userx b/test/mail/2117.userx
index 49d95b4dde3b475a30e3e7b14e8741887fabe700..1a86c2aa7594111048f85a9a72278e546b152a1e 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2119.userx b/test/mail/2119.userx
index c44613fa057aeab5919181b704caf8f1ef8b5969..e79ed70b47ccc9c287032ac6a08dbcee248e37c0 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ This is a test encrypted message.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtp  (TLS1.x) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        id 10HmaY-0005vi-00

diff --git a/test/mail/2127.userx b/test/mail/2127.userx
index 0c0c036e85d1cf826a89bb65a6dcdae51a78c58c..08f034e29c002dd3cb44a7a80a6d439cf6f96939 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) tls TLS_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00

diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 42151d1437747649740a101e94710cfded69b5af..1edd49384fcffc19feb7e98c4a03a46ca617fdfd 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ This is a test encrypted message.
 
 From "name with spaces"@test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1]
-       by myhost.test.ex with smtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <"name with spaces"@test.ex>)
        id 10HmaY-0005vi-00
@@ -24,7 +24,7 @@ This is a test encrypted message.
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtps  (TLS1.x) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaZ-0005vi-00

diff --git a/test/mail/2138.userx0 b/test/mail/2138.userx0
index e17d93bc79f259ee224c4b83b9761a7b0150da8f..5d80e9866f7cc065079f4819f02a9c47a84d2ee9 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1
index 0a86753436e3097e46db909e928e7a977bfe7b6f..1acf09c8f5dd1f4f8f71aca36078e30c0fecccda 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00

diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0
index a752457b3b73350c01f793bb31e5aa980edfe3f2..6030779c83dfffb7536a4d4ea0ea1100239d658c 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbE-0005vi-00

diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1
index d14a0e5aedb2fe4aee73b0e9a2504f691fb4a089..e1b08c6adf4ad2fcfdd65bcdd0a67711d8d2b2f5 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbF-0005vi-00

diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0
index d6906043a1245ed2d4a94a10602ccc635fb69f17..9f4558735486001d25a22c94e189e34cc776388c 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbC-0005vi-00

diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1
index 37b5640f736bbf506ee4c38721cc4262e8eceb1d..17e3991b0c03502187737959b53cd4ede6f5af92 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbD-0005vi-00

diff --git a/test/mail/2149.userx b/test/mail/2149.userx
index f11a903ca864e86daa432a49e18ae396e10f0c28..06590b3e7e62bd05c6b2ce17602ec1857e1cfb85 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaY-0005vi-00

diff --git a/test/mail/3451.userx b/test/mail/3451.userx
index ce69f8a1962baa9dc9cd1adfff2e3c8e0a0521c8..b9df8e528342e902ef524f74ba3794d4522110a7 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
@@ -24,13 +24,13 @@ Test message 1
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa  (TLS1.x) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00

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

diff --git a/test/mail/3461.userx b/test/mail/3461.userx
index 44682d1148e1af4b6537fe412e0fe75ae18ea73d..b9df8e528342e902ef524f74ba3794d4522110a7 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
@@ -24,13 +24,13 @@ Test message 1
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbC-0005vi-00
        for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/3462.userx b/test/mail/3462.userx
index 5eefecefa5e7d7c9a0d242204968d80ce49f6240..6116a01db62337860164324674b9910510161a2e 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1
 
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-       by myhost.test.ex with esmtpsa  (TLS1.x) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/3700.smtps b/test/mail/3700.smtps
index 7fae0b2738cfb62c1928bbea770388d61837c45a..66d2afe480f2ab52c492f0a5d9eb687c141b1ebf 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <ok@test.ex>)
        id 10HmbA-0005vi-00

diff --git a/test/mail/3700.x b/test/mail/3700.x
index e77cdbae8d1b46687f581a1c8f1ed7044f981f69..d520cfe15b6b628f8e85d98bfdd28eb66152e2e0 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <ok@test.ex>)
        id 10HmaZ-0005vi-00

diff --git a/test/rejectlog/2037 b/test/rejectlog/2037
index c8a5a606b9beaf617f6531dd3e5d26d97d37b38f..e60a0edd59090573290a3f84a1c6c33f044d6512 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) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        id 10HmaX-0005vi-00
        for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index 3024e8fbc2530294dfb928fe0e9c2b62fe0ff84e..e60a0edd59090573290a3f84a1c6c33f044d6512 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) tls ke-RSA-AES256-SHAnnn
+       by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        id 10HmaX-0005vi-00
        for data_defer@test.ex; Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/runtest b/test/runtest
index 82105abe8d701c670a127ccf5b17e5c8b229d641..1215e616564c6ec76885da858597452e20ff8884 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -554,8 +554,8 @@ RESET_AFTER_EXTRA_LINE_READ:
   # element (and no _WITH); insert a spurious "RSA".
   # Also in $tls_X_cipher_std reporting.
 
-  s/^\s+by .+ with .+ \K tls TLS_.*?([^_]+)_WITH.+$/(TLS1.x:ke-$1-AES256-SHAnnn:xxx)/;
-  s/^\s+by .+ with .+ \K tls TLS_.+$/(TLS1.x:ke-RSA-AES256-SHAnnn:xxx)/;
+  s/^\s+by \S+ with .+ \K \(TLS1(?:\.[0-3])?\) tls TLS_.*?([^_]+)_WITH.+$/(TLS1.x:ke-$1-AES256-SHAnnn:xxx)/;
+  s/^\s+by \S+ with .+ \K \(TLS1(?:\.[0-3])?\) tls TLS_.+$/(TLS1.x:ke-RSA-AES256-SHAnnn:xxx)/;
 
   s/ cipher_ TLS_.*?([^_]+)_WITH.+$/ cipher_ TLS1.x:ke_$1_WITH_ci_mac/;
   s/ cipher_ TLS_.*$/ cipher_ TLS1.x:ke_RSA_WITH_ci_mac/;
@@ -655,8 +655,8 @@ RESET_AFTER_EXTRA_LINE_READ:
   s/\b(ECDHE-(RSA|ECDSA)-AES256-SHA|DHE-RSA-AES256-SHA256)\b/ke-$2-AES256-SHAnnn/g;
 
   # Separate reporting of TLS version
-  s/ver:    TLS1(\.[123])?$/ver:    TLS1.x/;
-  s/ \(TLS1(\.[123])?\) / (TLS1.x) /;
+  s/ver:    TLS1(\.[0-3])?$/ver:    TLS1.x/;
+  s/ \(TLS1(\.[0-3])?\) / (TLS1.x) /;
 
   # GnuTLS library error message changes
   s/(No certificate was found|Certificate is required)/The peer did not send any certificate/g;
@@ -1769,9 +1769,6 @@ $munges =
                      s! DN="[^,"]*\K,!/!;
                     ',
       'rejectlog' => 's/ X=TLS\S+ / X=TLS_proto_and_cipher /',
-      'mail'      => 's/^\s+by .+ with .+ \K tls TLS_.+$/(TLS_proto_and_cipher)/;
-                     s/ \(TLS[^)]*\)/ (TLS_proto_and_cipher)/;
-                    ',
     },
 
     'debug_pid' =>