diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-11-27 16:29:26 +0530 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-01-31 17:48:06 +0100 |
| commit | 97aa646a4f57bdde5857ce05f282627893674a36 (patch) | |
| tree | 705163d42943a23d3a19b0369284540625329d8a | |
| parent | cd370fc1b555cebc87109aa8dc125c812248fc6b (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
(cherry picked from commit 483a5d68e5f7e6b145d957c50120cd05c436387b)
Reviewed-on: https://gerrit.libreoffice.org/49016
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
| -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 5a9f8280b..bae18a9f0 100644 --- a/net/Ssl.cpp +++ b/net/Ssl.cpp @@ -47,8 +47,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(); |