diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-07-03 09:35:21 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-07-03 09:35:21 +0200 |
| commit | 51668da86a591681f230e76e4947249e318522a1 (patch) | |
| tree | 8ab40386866a52430ec87e3c2e410b56b7e8aced /lib/ssl/test/ssl_test_lib.erl | |
| parent | 92a0cf0cafb20181982554d9a95247c86f9db4e4 (diff) | |
| parent | 37c12e0025c69bbcd19c4fa149a4c088c2181eed (diff) | |
| download | otp-51668da86a591681f230e76e4947249e318522a1.tar.gz otp-51668da86a591681f230e76e4947249e318522a1.tar.bz2 otp-51668da86a591681f230e76e4947249e318522a1.zip | |
Merge branch 'ia/ssl/tune-tests' into maint
* ia/ssl/tune-tests:
ssl: Exclude broken OpenSSL version from ECC test
ssl: Tune timeouts
Diffstat (limited to 'lib/ssl/test/ssl_test_lib.erl')
| -rw-r--r-- | lib/ssl/test/ssl_test_lib.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/ssl/test/ssl_test_lib.erl b/lib/ssl/test/ssl_test_lib.erl index da744f7368..8317148aa5 100644 --- a/lib/ssl/test/ssl_test_lib.erl +++ b/lib/ssl/test/ssl_test_lib.erl @@ -1076,6 +1076,9 @@ is_sane_ecc(openssl) -> "OpenSSL 1.0.0" ++ _ -> % Known bug in openssl %% manifests as SSL_CHECK_SERVERHELLO_TLSEXT:tls invalid ecpointformat list false; + "OpenSSL 1.0.1l" ++ _ -> + %% Breaks signature verification + false; "OpenSSL 0.9.8" ++ _ -> % Does not support ECC false; "OpenSSL 0.9.7" ++ _ -> % Does not support ECC |