X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/75fe387d4b7dd458b79fc22d593095cd84ca8ea4..37dd1b19b4304fd3f0b8a3bf2019f435bd7bfb18:/test/runtest diff --git a/test/runtest b/test/runtest index 6418d8d3f..84bdc04dc 100755 --- 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;