diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2012-05-20 01:04:24 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2012-05-20 01:16:23 +0100 |
| commit | bc9a5bcb2bfcf0d1ee282aae8a4574501634d70d (patch) | |
| tree | c248b44d6f8853bd2314d7b71b24273f2a857a3d /test/runtest | |
| parent | 81f916832dd855953f614ca86a6e4ad898161564 (diff) | |
Testsuite: munge recorded TLS version &c in output to permit awkward test-host installations.
Diffstat (limited to 'test/runtest')
| -rwxr-xr-x | test/runtest | 4 |
1 files changed, 3 insertions, 1 deletions
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; |