diff options
author | Pranav Kant <pranavk@collabora.co.uk> | 2017-11-27 16:29:26 +0530 |
---|---|---|
committer | Pranav Kant <pranavk@collabora.co.uk> | 2017-11-27 16:31:21 +0530 |
commit | 483a5d68e5f7e6b145d957c50120cd05c436387b (patch) | |
tree | 1b17b4870e9b0601cd0511abaa42c782e07193fd | |
parent | af7685e49907f5b520ee9288b12f82d633ce9423 (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
-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(); |