Gitweb:
https://git.exim.org/exim.git/commitdiff/ed1c2748fe762dead160d6c951493808b53934d2
Commit: ed1c2748fe762dead160d6c951493808b53934d2
Parent: e4307860d847c4679adb4735698a31065a392752
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Fri Nov 15 11:19:05 2019 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Fri Nov 15 11:24:46 2019 +0000
Testsuite: fix Recieved: header munging for TLS info
---
test/mail/2002.CALLER | 10 +++++-----
test/mail/2003.userx | 2 +-
test/mail/2008.CALLER | 4 ++--
test/mail/2008.abcd | 2 +-
test/mail/2008.xyz | 2 +-
test/mail/2013.usera | 2 +-
test/mail/2013.userb | 2 +-
test/mail/2013.userc | 2 +-
test/mail/2013.userx | 2 +-
test/mail/2013.usery | 2 +-
test/mail/2013.userz | 2 +-
test/mail/2017.userx | 4 ++--
test/mail/2019.userx | 4 ++--
test/mail/2027.userx | 2 +-
test/mail/2038.userx0 | 2 +-
test/mail/2038.userx1 | 2 +-
test/mail/2038.usery0 | 2 +-
test/mail/2038.usery1 | 2 +-
test/mail/2038.userz0 | 2 +-
test/mail/2038.userz1 | 2 +-
test/mail/2102.CALLER | 8 ++++----
test/mail/2103.userx | 2 +-
test/mail/2108.CALLER | 4 ++--
test/mail/2108.abcd | 2 +-
test/mail/2108.xyz | 2 +-
test/mail/2113.usera | 2 +-
test/mail/2113.userb | 2 +-
test/mail/2113.userc | 2 +-
test/mail/2113.userx | 2 +-
test/mail/2113.usery | 2 +-
test/mail/2113.userz | 2 +-
test/mail/2117.userx | 4 ++--
test/mail/2119.userx | 4 ++--
test/mail/2127.userx | 2 +-
test/mail/2132.CALLER | 6 +++---
test/mail/2138.userx0 | 2 +-
test/mail/2138.userx1 | 2 +-
test/mail/2138.usery0 | 2 +-
test/mail/2138.usery1 | 2 +-
test/mail/2138.userz0 | 2 +-
test/mail/2138.userz1 | 2 +-
test/mail/2149.userx | 2 +-
test/mail/3451.userx | 8 ++++----
test/mail/3452.userx | 4 ++--
test/mail/3461.userx | 8 ++++----
test/mail/3462.userx | 4 ++--
test/mail/3700.smtps | 2 +-
test/mail/3700.x | 2 +-
test/rejectlog/2037 | 2 +-
test/rejectlog/2137 | 2 +-
test/runtest | 11 ++++-------
51 files changed, 77 insertions(+), 80 deletions(-)
diff --git a/test/mail/2002.CALLER b/test/mail/2002.CALLER
index d9d0f0b..dc634d1 100644
--- a/test/mail/2002.CALLER
+++ b/test/mail/2002.CALLER
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x) 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@???>)
id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ This is a test encrypted message.
From "name with spaces"@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x) 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"@???>)
id 10HmaY-0005vi-00
@@ -24,7 +24,7 @@ This is a test encrypted message.
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [ip4.ip4.ip4.ip4]
- by myhost.test.ex with smtps (TLS1.x) 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@???>)
id 10HmaZ-0005vi-00
@@ -36,7 +36,7 @@ This is a test encrypted message from a verified host.
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x) 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@???>)
id 10HmbA-0005vi-00
@@ -49,7 +49,7 @@ It should be sent under the RSA server cert and with an RSA cipher.
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x) 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@???>)
id 10HmbB-0005vi-00
diff --git a/test/mail/2003.userx b/test/mail/2003.userx
index 6322cce..66c128b 100644
--- a/test/mail/2003.userx
+++ b/test/mail/2003.userx
@@ -1,6 +1,6 @@
From userx@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=rhu.barb)
- by myhost.test.ex with smtps (TLS1.x) 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@???>)
id 10HmaX-0005vi-00
diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER
index 47db7a2..f7669bd 100644
--- a/test/mail/2008.CALLER
+++ b/test/mail/2008.CALLER
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message. Contains FF:
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
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 51b951a..8a6aae2 100644
--- a/test/mail/2008.abcd
+++ b/test/mail/2008.abcd
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbB-0005vi-00
diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz
index 7c88c9c..e304d94 100644
--- a/test/mail/2008.xyz
+++ b/test/mail/2008.xyz
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
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 e1d700f..8aac112 100644
--- a/test/mail/2013.usera
+++ b/test/mail/2013.usera
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbG-0005vi-00
diff --git a/test/mail/2013.userb b/test/mail/2013.userb
index 219c068..0a98cd8 100644
--- a/test/mail/2013.userb
+++ b/test/mail/2013.userb
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbI-0005vi-00
diff --git a/test/mail/2013.userc b/test/mail/2013.userc
index 81fd4e7..efb32a6 100644
--- a/test/mail/2013.userc
+++ b/test/mail/2013.userc
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbH-0005vi-00
diff --git a/test/mail/2013.userx b/test/mail/2013.userx
index a3e13af..f720f91 100644
--- a/test/mail/2013.userx
+++ b/test/mail/2013.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/2013.usery b/test/mail/2013.usery
index 6cbc72e..32797e1 100644
--- a/test/mail/2013.usery
+++ b/test/mail/2013.usery
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbC-0005vi-00
diff --git a/test/mail/2013.userz b/test/mail/2013.userz
index aec9bd9..919c86d 100644
--- a/test/mail/2013.userz
+++ b/test/mail/2013.userz
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbB-0005vi-00
diff --git a/test/mail/2017.userx b/test/mail/2017.userx
index b21e1e3..1a86c2a 100644
--- a/test/mail/2017.userx
+++ b/test/mail/2017.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/2019.userx b/test/mail/2019.userx
index 366b788..3b38f9a 100644
--- a/test/mail/2019.userx
+++ b/test/mail/2019.userx
@@ -1,6 +1,6 @@
From userx@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=rhu.barb)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ This is a test encrypted message.
From userx@??? Tue Mar 02 09:44:33 1999
Received: from [ip4.ip4.ip4.ip4]
- by myhost.test.ex with smtp (TLS1.x) 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@???>)
id 10HmaY-0005vi-00
diff --git a/test/mail/2027.userx b/test/mail/2027.userx
index d222887..08f034e 100644
--- a/test/mail/2027.userx
+++ b/test/mail/2027.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmaZ-0005vi-00
diff --git a/test/mail/2038.userx0 b/test/mail/2038.userx0
index bcf6d69..5d80e98 100644
--- a/test/mail/2038.userx0
+++ b/test/mail/2038.userx0
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/2038.userx1 b/test/mail/2038.userx1
index d5cf625..1acf09c 100644
--- a/test/mail/2038.userx1
+++ b/test/mail/2038.userx1
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbB-0005vi-00
diff --git a/test/mail/2038.usery0 b/test/mail/2038.usery0
index 83a8585..6030779 100644
--- a/test/mail/2038.usery0
+++ b/test/mail/2038.usery0
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbE-0005vi-00
diff --git a/test/mail/2038.usery1 b/test/mail/2038.usery1
index cd20363..e1b08c6 100644
--- a/test/mail/2038.usery1
+++ b/test/mail/2038.usery1
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbF-0005vi-00
diff --git a/test/mail/2038.userz0 b/test/mail/2038.userz0
index d0b5e79..9f45587 100644
--- a/test/mail/2038.userz0
+++ b/test/mail/2038.userz0
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbC-0005vi-00
diff --git a/test/mail/2038.userz1 b/test/mail/2038.userz1
index 8187e57..17e3991 100644
--- a/test/mail/2038.userz1
+++ b/test/mail/2038.userz1
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmbD-0005vi-00
diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 729308a..9ca8239 100644
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x) 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@???>)
id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ This is a test encrypted message.
From "name with spaces"@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x) 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"@???>)
id 10HmaY-0005vi-00
@@ -24,7 +24,7 @@ This is a test encrypted message.
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [ip4.ip4.ip4.ip4]
- by myhost.test.ex with smtps (TLS1.x) 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@???>)
id 10HmaZ-0005vi-00
@@ -36,7 +36,7 @@ This is a test encrypted message from a verified host.
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x) 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@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/2103.userx b/test/mail/2103.userx
index 083a93f..66c128b 100644
--- a/test/mail/2103.userx
+++ b/test/mail/2103.userx
@@ -1,6 +1,6 @@
From userx@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=rhu.barb)
- by myhost.test.ex with smtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <userx@???>)
id 10HmaX-0005vi-00
diff --git a/test/mail/2108.CALLER b/test/mail/2108.CALLER
index 1fc14a2..f7669bd 100644
--- a/test/mail/2108.CALLER
+++ b/test/mail/2108.CALLER
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message. Contains FF:
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2108.abcd b/test/mail/2108.abcd
index 7c56070..8a6aae2 100644
--- a/test/mail/2108.abcd
+++ b/test/mail/2108.abcd
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbB-0005vi-00
diff --git a/test/mail/2108.xyz b/test/mail/2108.xyz
index cfc558c..e304d94 100644
--- a/test/mail/2108.xyz
+++ b/test/mail/2108.xyz
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=helo.data.changed)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/mail/2113.usera b/test/mail/2113.usera
index c9afbe7..8aac112 100644
--- a/test/mail/2113.usera
+++ b/test/mail/2113.usera
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbG-0005vi-00
diff --git a/test/mail/2113.userb b/test/mail/2113.userb
index 4a3ed8d..0a98cd8 100644
--- a/test/mail/2113.userb
+++ b/test/mail/2113.userb
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbI-0005vi-00
diff --git a/test/mail/2113.userc b/test/mail/2113.userc
index c6b5375..efb32a6 100644
--- a/test/mail/2113.userc
+++ b/test/mail/2113.userc
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbH-0005vi-00
diff --git a/test/mail/2113.userx b/test/mail/2113.userx
index f0b5558..f720f91 100644
--- a/test/mail/2113.userx
+++ b/test/mail/2113.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/2113.usery b/test/mail/2113.usery
index e3908f2..32797e1 100644
--- a/test/mail/2113.usery
+++ b/test/mail/2113.usery
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbC-0005vi-00
diff --git a/test/mail/2113.userz b/test/mail/2113.userz
index 8b5c139..919c86d 100644
--- a/test/mail/2113.userz
+++ b/test/mail/2113.userz
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbB-0005vi-00
diff --git a/test/mail/2117.userx b/test/mail/2117.userx
index 49d95b4..1a86c2a 100644
--- a/test/mail/2117.userx
+++ b/test/mail/2117.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/2119.userx b/test/mail/2119.userx
index c44613f..e79ed70 100644
--- a/test/mail/2119.userx
+++ b/test/mail/2119.userx
@@ -1,6 +1,6 @@
From userx@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1] (helo=rhu.barb)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <userx@???>)
id 10HmaX-0005vi-00
@@ -11,7 +11,7 @@ This is a test encrypted message.
From userx@??? Tue Mar 02 09:44:33 1999
Received: from [ip4.ip4.ip4.ip4]
- by myhost.test.ex with smtp (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <userx@???>)
id 10HmaY-0005vi-00
diff --git a/test/mail/2127.userx b/test/mail/2127.userx
index 0c0c036..08f034e 100644
--- a/test/mail/2127.userx
+++ b/test/mail/2127.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???>)
id 10HmaZ-0005vi-00
diff --git a/test/mail/2132.CALLER b/test/mail/2132.CALLER
index 42151d1..1edd493 100644
--- a/test/mail/2132.CALLER
+++ b/test/mail/2132.CALLER
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaX-0005vi-00
@@ -12,7 +12,7 @@ This is a test encrypted message.
From "name with spaces"@??? Tue Mar 02 09:44:33 1999
Received: from [127.0.0.1]
- by myhost.test.ex with smtps (TLS1.x) 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"@???>)
id 10HmaY-0005vi-00
@@ -24,7 +24,7 @@ This is a test encrypted message.
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from [ip4.ip4.ip4.ip4]
- by myhost.test.ex with smtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaZ-0005vi-00
diff --git a/test/mail/2138.userx0 b/test/mail/2138.userx0
index e17d93b..5d80e98 100644
--- a/test/mail/2138.userx0
+++ b/test/mail/2138.userx0
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/2138.userx1 b/test/mail/2138.userx1
index 0a86753..1acf09c 100644
--- a/test/mail/2138.userx1
+++ b/test/mail/2138.userx1
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbB-0005vi-00
diff --git a/test/mail/2138.usery0 b/test/mail/2138.usery0
index a752457..6030779 100644
--- a/test/mail/2138.usery0
+++ b/test/mail/2138.usery0
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbE-0005vi-00
diff --git a/test/mail/2138.usery1 b/test/mail/2138.usery1
index d14a0e5..e1b08c6 100644
--- a/test/mail/2138.usery1
+++ b/test/mail/2138.usery1
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1112 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbF-0005vi-00
diff --git a/test/mail/2138.userz0 b/test/mail/2138.userz0
index d690604..9f45587 100644
--- a/test/mail/2138.userz0
+++ b/test/mail/2138.userz0
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbC-0005vi-00
diff --git a/test/mail/2138.userz1 b/test/mail/2138.userz1
index 37b5640..17e3991 100644
--- a/test/mail/2138.userz1
+++ b/test/mail/2138.userz1
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbD-0005vi-00
diff --git a/test/mail/2149.userx b/test/mail/2149.userx
index f11a903..06590b3 100644
--- a/test/mail/2149.userx
+++ b/test/mail/2149.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaY-0005vi-00
diff --git a/test/mail/3451.userx b/test/mail/3451.userx
index ce69f8a..b9df8e5 100644
--- a/test/mail/3451.userx
+++ b/test/mail/3451.userx
@@ -1,12 +1,12 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) 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@???>)
id 10HmbB-0005vi-00
for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) 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@???>)
id 10HmaZ-0005vi-00
@@ -24,13 +24,13 @@ Test message 1
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) 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@???>)
id 10HmbC-0005vi-00
for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) 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@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/3452.userx b/test/mail/3452.userx
index 9b57954..6116a01 100644
--- a/test/mail/3452.userx
+++ b/test/mail/3452.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) 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@???>)
id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) 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@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/3461.userx b/test/mail/3461.userx
index 44682d1..b9df8e5 100644
--- a/test/mail/3461.userx
+++ b/test/mail/3461.userx
@@ -1,12 +1,12 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbB-0005vi-00
for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaZ-0005vi-00
@@ -24,13 +24,13 @@ Test message 1
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbC-0005vi-00
for userx@???; Tue, 2 Mar 1999 09:44:33 +0000
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/3462.userx b/test/mail/3462.userx
index 5eefece..6116a01 100644
--- a/test/mail/3462.userx
+++ b/test/mail/3462.userx
@@ -1,6 +1,6 @@
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmaZ-0005vi-00
@@ -18,7 +18,7 @@ Test message 1
From CALLER@??? Tue Mar 02 09:44:33 1999
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS1.x) tls ke-RSA-AES256-SHAnnn
+ by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <CALLER@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/3700.smtps b/test/mail/3700.smtps
index 7fae0b2..66d2afe 100644
--- a/test/mail/3700.smtps
+++ b/test/mail/3700.smtps
@@ -3,7 +3,7 @@ Authentication-Results: myhost.test.ex;
iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
auth=pass (tls) x509.auth="Phil Pennock"
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS_proto_and_cipher) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+ by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <ok@???>)
id 10HmbA-0005vi-00
diff --git a/test/mail/3700.x b/test/mail/3700.x
index e77cdba..d520cfe 100644
--- a/test/mail/3700.x
+++ b/test/mail/3700.x
@@ -3,7 +3,7 @@ Authentication-Results: myhost.test.ex;
iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
auth=pass (tls) x509.auth="Phil Pennock"
Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtpsa (TLS_proto_and_cipher) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+ by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
(Exim x.yz)
(envelope-from <ok@???>)
id 10HmaZ-0005vi-00
diff --git a/test/rejectlog/2037 b/test/rejectlog/2037
index c8a5a60..e60a0ed 100644
--- a/test/rejectlog/2037
+++ b/test/rejectlog/2037
@@ -6,7 +6,7 @@
Envelope-from: <>
Envelope-to: <data_defer@???>
P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???; Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/rejectlog/2137 b/test/rejectlog/2137
index 3024e8f..e60a0ed 100644
--- a/test/rejectlog/2137
+++ b/test/rejectlog/2137
@@ -6,7 +6,7 @@
Envelope-from: <>
Envelope-to: <data_defer@???>
P Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
- by myhost.test.ex with esmtps (TLS1.x) 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@???; Tue, 2 Mar 1999 09:44:33 +0000
diff --git a/test/runtest b/test/runtest
index 82105ab..1215e61 100755
--- a/test/runtest
+++ b/test/runtest
@@ -554,8 +554,8 @@ RESET_AFTER_EXTRA_LINE_READ:
# element (and no _WITH); insert a spurious "RSA".
# Also in $tls_X_cipher_std reporting.
- s/^\s+by .+ with .+ \K tls TLS_.*?([^_]+)_WITH.+$/(TLS1.x:ke-$1-AES256-SHAnnn:xxx)/;
- s/^\s+by .+ with .+ \K tls TLS_.+$/(TLS1.x:ke-RSA-AES256-SHAnnn:xxx)/;
+ s/^\s+by \S+ with .+ \K \(TLS1(?:\.[0-3])?\) tls TLS_.*?([^_]+)_WITH.+$/(TLS1.x:ke-$1-AES256-SHAnnn:xxx)/;
+ s/^\s+by \S+ with .+ \K \(TLS1(?:\.[0-3])?\) tls TLS_.+$/(TLS1.x:ke-RSA-AES256-SHAnnn:xxx)/;
s/ cipher_ TLS_.*?([^_]+)_WITH.+$/ cipher_ TLS1.x:ke_$1_WITH_ci_mac/;
s/ cipher_ TLS_.*$/ cipher_ TLS1.x:ke_RSA_WITH_ci_mac/;
@@ -655,8 +655,8 @@ RESET_AFTER_EXTRA_LINE_READ:
s/\b(ECDHE-(RSA|ECDSA)-AES256-SHA|DHE-RSA-AES256-SHA256)\b/ke-$2-AES256-SHAnnn/g;
# Separate reporting of TLS version
- s/ver: TLS1(\.[123])?$/ver: TLS1.x/;
- s/ \(TLS1(\.[123])?\) / (TLS1.x) /;
+ s/ver: TLS1(\.[0-3])?$/ver: TLS1.x/;
+ s/ \(TLS1(\.[0-3])?\) / (TLS1.x) /;
# GnuTLS library error message changes
s/(No certificate was found|Certificate is required)/The peer did not send any certificate/g;
@@ -1769,9 +1769,6 @@ $munges =
s! DN="[^,"]*\K,!/!;
',
'rejectlog' => 's/ X=TLS\S+ / X=TLS_proto_and_cipher /',
- 'mail' => 's/^\s+by .+ with .+ \K tls TLS_.+$/(TLS_proto_and_cipher)/;
- s/ \(TLS[^)]*\)/ (TLS_proto_and_cipher)/;
- ',
},
'debug_pid' =>
