diff options
| author | Ingela Anderton Andin <[email protected]> | 2019-07-31 16:30:44 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2019-08-19 16:52:42 +0200 |
| commit | a736bc204c7cf6defa386d226516043d037b4e4b (patch) | |
| tree | 54f84cf17a6913f76c98b3ad02dd32eadd2b8f18 /lib | |
| parent | 477d94eac263ad903dea019c8a9db27e8a1592a8 (diff) | |
| download | otp-a736bc204c7cf6defa386d226516043d037b4e4b.tar.gz otp-a736bc204c7cf6defa386d226516043d037b4e4b.tar.bz2 otp-a736bc204c7cf6defa386d226516043d037b4e4b.zip | |
ssl: Add OpenSSL renegotiate sanity check
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/test/openssl_renegotiate_SUITE.erl | 5 | ||||
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/lib/ssl/test/openssl_renegotiate_SUITE.erl b/lib/ssl/test/openssl_renegotiate_SUITE.erl index 91a8175ac6..787b5208b8 100644 --- a/lib/ssl/test/openssl_renegotiate_SUITE.erl +++ b/lib/ssl/test/openssl_renegotiate_SUITE.erl @@ -104,8 +104,9 @@ init_per_group(GroupName, Config) -> true -> case ssl_test_lib:check_sane_openssl_version(GroupName) of true -> - ssl_test_lib:init_tls_version(GroupName, Config); - false -> + ssl_test_lib:check_sane_openssl_renegotaite(ssl_test_lib:init_tls_version(GroupName, Config), + GroupName); + false -> {skip, openssl_does_not_support_version} end; false -> diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index 7dd27fb5cb..5dd5fc45af 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -2187,6 +2187,13 @@ check_sane_openssl_renegotaite(Config, Version) when Version == 'tlsv1.1'; _ -> check_sane_openssl_renegotaite(Config) end; +check_sane_openssl_renegotaite(Config, 'sslv3') -> + case os:cmd("openssl version") of + "OpenSSL 1" ++ _ -> + {skip, "Known renegotiation bug with sslv3 in OpenSSL"}; + _ -> + check_sane_openssl_renegotaite(Config) + end; check_sane_openssl_renegotaite(Config, _) -> check_sane_openssl_renegotaite(Config). |