diff options
| author | Ingela Anderton Andin <[email protected]> | 2015-12-11 10:24:28 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2015-12-11 10:24:28 +0100 |
| commit | 69cbf64e5a948064e0503590c8c42443f3405ad0 (patch) | |
| tree | 90462bcf457a9b63ac2da9dcd0dfad2ad33144be /lib/ssl | |
| parent | fae6b9385f3d0d1c725ca6cdb588b8bf1e473721 (diff) | |
| parent | 306afe7480eb4f1f4e29aa02cea538b58e468e0f (diff) | |
| download | otp-69cbf64e5a948064e0503590c8c42443f3405ad0.tar.gz otp-69cbf64e5a948064e0503590c8c42443f3405ad0.tar.bz2 otp-69cbf64e5a948064e0503590c8c42443f3405ad0.zip | |
Merge branch 'ia/ssl/renegotiate-tests' into maint
* ia/ssl/renegotiate-tests:
ssl: Add renegotiation exception
Diffstat (limited to 'lib/ssl')
| -rw-r--r-- | lib/ssl/test/ssl_to_openssl_SUITE.erl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ssl/test/ssl_to_openssl_SUITE.erl b/lib/ssl/test/ssl_to_openssl_SUITE.erl index 16b6cb10b9..9c38549cc7 100644 --- a/lib/ssl/test/ssl_to_openssl_SUITE.erl +++ b/lib/ssl/test/ssl_to_openssl_SUITE.erl @@ -1753,7 +1753,9 @@ check_sane_openssl_renegotaite(Config, _) -> check_sane_openssl_renegotaite(Config). check_sane_openssl_renegotaite(Config) -> - case os:cmd("openssl version") of + case os:cmd("openssl version") of + "OpenSSL 1.0.0" ++ _ -> + {skip, "Known renegotiation bug in OpenSSL"}; "OpenSSL 0.9.8" ++ _ -> {skip, "Known renegotiation bug in OpenSSL"}; "OpenSSL 0.9.7" ++ _ -> |