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

[exim.git] / test / runtest

diff --git a/test/runtest b/test/runtest
index 6418d8d3f01d14e87e44f0c4f8545e785b338a79..84bdc04dc176973db7a5b33cc65de7f251d62fcd 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -499,13 +499,15 @@ RESET_AFTER_EXTRA_LINE_READ:
   #   TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128
   #
   #   X=TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256
+  #   X=TLS1.2:RSA_AES_256_CBC_SHA1:256
+  #   X=TLS1.1:RSA_AES_256_CBC_SHA1:256
   #   X=TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256
   # and as stand-alone cipher:
   #   DHE-RSA-AES256-SHA256
   #   DHE-RSA-AES256-SHA
   # picking latter as canonical simply because regex easier that way.
   s/\bDHE_RSA_AES_128_CBC_SHA1:128/RSA_AES_256_CBC_SHA1:256/g;
-  s/X=TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256/X=TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256/g;
+  s/TLS1.[012]:(DHE_)?RSA_AES_256_CBC_SHA(1|256):256/TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256/g;
   s/\bDHE-RSA-AES256-SHA256\b/DHE-RSA-AES256-SHA/g;