serf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1833229 - in /serf/trunk: buckets/ssl_buckets.c test/MockHTTPinC/MockHTTP_server.c
Date Sat, 09 Jun 2018 11:56:34 GMT
Author: brane
Date: Sat Jun  9 11:56:33 2018
New Revision: 1833229

URL: http://svn.apache.org/viewvc?rev=1833229&view=rev
Log:
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.

Modified:
    serf/trunk/buckets/ssl_buckets.c
    serf/trunk/test/MockHTTPinC/MockHTTP_server.c

Modified: serf/trunk/buckets/ssl_buckets.c
URL: http://svn.apache.org/viewvc/serf/trunk/buckets/ssl_buckets.c?rev=1833229&r1=1833228&r2=1833229&view=diff
==============================================================================
--- serf/trunk/buckets/ssl_buckets.c (original)
+++ serf/trunk/buckets/ssl_buckets.c Sat Jun  9 11:56:33 2018
@@ -1482,11 +1482,6 @@ static void init_ssl_libraries(void)
         }
 #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();

Modified: serf/trunk/test/MockHTTPinC/MockHTTP_server.c
URL: http://svn.apache.org/viewvc/serf/trunk/test/MockHTTPinC/MockHTTP_server.c?rev=1833229&r1=1833228&r2=1833229&view=diff
==============================================================================
--- serf/trunk/test/MockHTTPinC/MockHTTP_server.c (original)
+++ serf/trunk/test/MockHTTPinC/MockHTTP_server.c Sat Jun  9 11:56:33 2018
@@ -2668,11 +2668,6 @@ static apr_status_t initSSLCtx(_mhClient
     /* 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();



Mime
View raw message