From 88013b64a9fbe244267db0b79b2a89ca87fbe1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Wed, 22 Mar 2017 02:42:25 -0300 Subject: [PATCH] Added support for openssl 1.1.0 and above. --HG-- branch : dev --- .../network/ssl/backend/openssl/opensslsocket.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/eepp/network/ssl/backend/openssl/opensslsocket.cpp b/src/eepp/network/ssl/backend/openssl/opensslsocket.cpp index 4aa766116..057947096 100644 --- a/src/eepp/network/ssl/backend/openssl/opensslsocket.cpp +++ b/src/eepp/network/ssl/backend/openssl/opensslsocket.cpp @@ -8,10 +8,6 @@ #include #include -#ifndef CRYPTO_malloc_init -#define CRYPTO_malloc_init OPENSSL_malloc_init -#endif - namespace EE { namespace Network { namespace SSL { static std::vector sCerts; @@ -133,9 +129,13 @@ int OpenSSLSocket::certVerifyCb( X509_STORE_CTX * x509_ctx, void * arg ) { } bool OpenSSLSocket::init() { +#if OPENSSL_VERSION_NUMBER < 0x10100000L CRYPTO_malloc_init(); // Initialize malloc, free, etc for OpenSSL's use - - SSL_library_init(); // Initialize OpenSSL's SSL libraries + + SSL_library_init(); +#else + OPENSSL_init_ssl(0, NULL); +#endif SSL_load_error_strings(); // Load SSL error strings