commit 06b483019bc5146a1208c4a6dd69fb617802c3c9
author Branko Čibej <brane@apache.org> Sat Jun 09 11:56:33 2018 +0000
committer Branko Čibej <brane@apache.org> Sat Jun 09 11:56:33 2018 +0000
tree 92da2b044185de75d517f4aa92cae99765832d62
parent 0e5f9317afca0a05bf82c918df428ef08eea0e59

Make the tests work with OpenSSL 1.1 on Windows (and also other platforms).

* buckets/ssl_buckets.c (init_ssl_libraries):
   Remove the unnecessary call to CRYPTO/OPENSSL_malloc_init();
* test/MockHTTPinC/MockHTTP_server.c (initSSLCtx): Likewise.


git-svn-id: https://svn.apache.org/repos/asf/serf/trunk@1833229 13f79535-47bb-0310-9956-ffa450edef68

buckets/ssl_buckets.c

diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
index 4ae0d8a..1b28560 100644
--- a/buckets/ssl_buckets.c
+++ b/buckets/ssl_buckets.c
@@ -1482,11 +1482,6 @@
         }
 #endif
 
-#ifdef SERF_HAVE_OPENSSL_MALLOC_INIT
-        OPENSSL_malloc_init();
-#else
-        CRYPTO_malloc_init();
-#endif
 #ifdef SERF_HAVE_OPENSSL_SSL_LIBRARY_INIT
         ERR_load_crypto_strings();
         SSL_load_error_strings();

test/MockHTTPinC/MockHTTP_server.c

diff --git a/test/MockHTTPinC/MockHTTP_server.c b/test/MockHTTPinC/MockHTTP_server.c
index 2220720..f302169 100644
--- a/test/MockHTTPinC/MockHTTP_server.c
+++ b/test/MockHTTPinC/MockHTTP_server.c
@@ -2668,11 +2668,6 @@
     /* Init OpenSSL globally */
     if (!init_done)
     {
-#ifdef SERF_HAVE_OPENSSL_MALLOC_INIT
-        OPENSSL_malloc_init();
-#else
-        CRYPTO_malloc_init();
-#endif
         ERR_load_crypto_strings();
         SSL_load_error_strings();
         SSL_library_init();