Testsuite: munge recorded TLS version &c in output to permit awkward test-host installations.

9 files changed, 30 insertions, 30 deletions

diff --git a/test/mail/2008.CALLER b/test/mail/2008.CALLER
index f252ccf9e..213ed889a 100644
--- a/test/mail/2008.CALLER
+++ b/test/mail/2008.CALLER
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=helo.data.changed)
-	by myhost.test.ex with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 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.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
@@ -28,7 +28,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 Test message to two different hosts
 
diff --git a/test/mail/2008.abcd b/test/mail/2008.abcd
index 7be67212f..edbb0b8c4 100644
--- a/test/mail/2008.abcd
+++ b/test/mail/2008.abcd
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from the.local.host.name ([ip4.ip4.ip4.ip4] helo=myhost.test.ex)
-	by myhost.test.ex with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbB-0005vi-00
@@ -11,7 +11,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 Test message to two different hosts
 
diff --git a/test/mail/2008.xyz b/test/mail/2008.xyz
index a1658ba41..c144d9726 100644
--- a/test/mail/2008.xyz
+++ b/test/mail/2008.xyz
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from [127.0.0.1] (helo=helo.data.changed)
-	by myhost.test.ex with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
@@ -10,7 +10,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 Test message to two different hosts
 
diff --git a/test/mail/2013.userx b/test/mail/2013.userx
index 4c9a25d24..def44beae 100644
--- a/test/mail/2013.userx
+++ b/test/mail/2013.userx
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1]:1111 helo=myhost.test.ex)
-	by myhost.test.ex with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 Test message 1
 
 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.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 Test message 2
 
diff --git a/test/mail/2017.userx b/test/mail/2017.userx
index 7acd1b2eb..0e0d96571 100644
--- a/test/mail/2017.userx
+++ b/test/mail/2017.userx
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-	by myhost.test.ex with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 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.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 Test message 2
 
diff --git a/test/mail/2019.userx b/test/mail/2019.userx
index 6ac2073a3..7408ad7f9 100644
--- a/test/mail/2019.userx
+++ b/test/mail/2019.userx
@@ -1,22 +1,22 @@
 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.0:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaX-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.0:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 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.0:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with smtp (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <userx@test.ex>)
 	id 10HmaY-0005vi-00
 	for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.0:RSA_AES_256_CBC_SHA1:256 peerdn=C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=C=UK,O=The Exim Maintainers,OU=Test Suite,CN=Phil Pennock
 
 This is a test encrypted message from a verified host.
 
diff --git a/test/mail/2027.userx b/test/mail/2027.userx
index 41809d912..96b609820 100644
--- a/test/mail/2027.userx
+++ b/test/mail/2027.userx
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-	by myhost.test.ex with esmtps (TLS1.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtps (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
@@ -12,7 +12,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 Test message
 
diff --git a/test/mail/3451.userx b/test/mail/3451.userx
index 31b3cdd7c..17957a9a2 100644
--- a/test/mail/3451.userx
+++ b/test/mail/3451.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.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtpsa (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 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.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtpsa (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 Test message 2
 
diff --git a/test/mail/3452.userx b/test/mail/3452.userx
index 31b3cdd7c..17957a9a2 100644
--- a/test/mail/3452.userx
+++ b/test/mail/3452.userx
@@ -1,6 +1,6 @@
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
-	by myhost.test.ex with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtpsa (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmaZ-0005vi-00
@@ -12,13 +12,13 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 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.2:RSA_AES_256_CBC_SHA1:256)
+	by myhost.test.ex with esmtpsa (TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256)
 	(Exim x.yz)
 	(envelope-from <CALLER@myhost.test.ex>)
 	id 10HmbA-0005vi-00
@@ -30,7 +30,7 @@ Received: from CALLER by myhost.test.ex with local (Exim x.yz)
 Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
-TLS: cipher=TLS1.2:RSA_AES_256_CBC_SHA1:256 peerdn=
+TLS: cipher=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 peerdn=
 
 Test message 2