diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-11-27 16:29:26 +0530 |
|---|---|---|
| committer | Rene Engelhard <rene@debian.org> | 2017-11-28 08:19:24 +0100 |
| commit | 139a7565bf2c4305c4f915cbff80373a8eff5d40 (patch) | |
| tree | dea7d9b2797cc7910260174feffa3e91104f3ad8 | |
| parent | 2342c16492d2d1cad7b35d14cb4e1e543c127cc1 (diff) | |
tdf#114073: Potential fix for crash with openssl1.1
Using null ssl context to set options is surely not a good idea:
unsigned long SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op)
{
return ctx->options |= op;
}
Change-Id: I2700350e0c3928e372488c81b8111c9ab0b48e06
Reviewed-on: https://gerrit.libreoffice.org/45375
Reviewed-by: pranavk <pranavk@collabora.co.uk>
Tested-by: Rene Engelhard <rene@debian.org>
| -rw-r--r-- | net/Ssl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/Ssl.cpp b/net/Ssl.cpp index dd0094b8c..a16caa258 100644 --- a/net/Ssl.cpp +++ b/net/Ssl.cpp @@ -50,8 +50,7 @@ SslContext::SslContext(const std::string& certFilePath, #endif #if OPENSSL_VERSION_NUMBER >= 0x10100003L - SSL_CTX_set_options(nullptr, 0); - OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, NULL); + OPENSSL_init_ssl(OPENSSL_INIT_LOAD_CONFIG, nullptr); #else SSL_library_init(); SSL_load_error_strings(); |