diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-09-20 18:31:36 +0100 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-09-20 22:30:13 +0100 |
commit | 9e9ad3eea16e14e8a6c96cde6ddc5c0051e0fd83 (patch) | |
tree | 7042d41aa45200cbe82ae1ef8ae26af9d8ba6028 /test/runtest | |
parent | 8442641ee685d02b15ccfdc7290dda2674b8472e (diff) |
Testsuite: handle OpenSSL 1.1.1
Diffstat (limited to 'test/runtest')
-rwxr-xr-x | test/runtest | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/test/runtest b/test/runtest index 7921c5bee..d6bc7b03d 100755 --- a/test/runtest +++ b/test/runtest @@ -538,6 +538,9 @@ RESET_AFTER_EXTRA_LINE_READ: # Test machines might have various different TLS library versions supporting # different protocols; can't rely upon TLS 1.2's AES256-GCM-SHA384, so we # treat the standard algorithms the same. + # + # TLSversion : KeyExchange? - Authentication/Signature - C_iph_er - MAC : ??? + # # So far, have seen: # TLSv1:AES128-GCM-SHA256:128 # TLSv1:AES256-SHA:256 @@ -559,8 +562,12 @@ RESET_AFTER_EXTRA_LINE_READ: s/((EC)?DHE-)?(RSA|ECDSA)-AES(128|256)-(GCM-SHA(256|384)|SHA):(128|256)/ke-$3-AES256-SHA:xxx/g; # OpenSSL TLSv1.3 - unsure what to do about the authentication-variant testcases now, - # as it seems the protocol no longer supports a user choice. - s/TLS_AES(_256)_GCM_SHA384:256/TLS-AES256-SHA:xxx/g; + # as it seems the protocol no longer supports a user choice. Replace the "TLS" field with "RSA". + # Also insert a key-exchange field for back-compat, even though 1.3 doesn't do that. + # + # TLSversion : "TLS" - C_iph_er - MAC : ??? + # + s/:TLS_AES(_256)_GCM_SHA384:256/:ke-RSA-AES256-SHA:xxx/g; # LibreSSL # TLSv1:AES256-GCM-SHA384:256 |