--- serf-trunk/buckets/ssl_buckets.c 2017-09-23 12:34:06.002125058 +0200 +++ serf-trunk/buckets/ssl_buckets.c 2017-09-23 16:10:38.329194232 +0200 @@ -1417,14 +1417,6 @@ #endif -#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(); - OpenSSL_add_all_algorithms(); #if APR_HAS_THREADS && defined(SERF_HAVE_SSL_LOCKING_CALLBACKS) numlocks = CRYPTO_num_locks(); --- serf-trunk/test/MockHTTPinC/MockHTTP_server.c 2017-09-23 12:35:30.445564939 +0200 +++ serf-trunk/test/MockHTTPinC/MockHTTP_server.c 2017-09-23 16:22:49.968896304 +0200 @@ -2668,15 +2668,7 @@ /* 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(); - OpenSSL_add_all_algorithms(); init_done = 1; }