commit df0d2d0dbdf88576f26da9c71df3ab6249d351dc
author Stefan Sperling <stsp@apache.org> Tue Dec 20 09:57:08 2016 +0000
committer Stefan Sperling <stsp@apache.org> Tue Dec 20 09:57:08 2016 +0000
tree 753d99ded1dcfcf6d66165bf090f4e2d5b1d4fe7
parent 477055f5eb2d4e3b0006eee6d4de65e93ffed280

Fix another build problem with LibreSSL.

* SConstruct: Check for OpenSSL_malloc_init() and provide the
   SERF_HAVE_OPENSSL_MALLOC_INIT feature flag.

* buckets/ssl_buckets.c
  (init_ssl_libraries): Use SERF_HAVE_OPENSSL_MALLOC_INIT instead
   of USE_LEGACY_OPENSSL.


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

SConstruct

diff --git a/SConstruct b/SConstruct
index 9398c7e..9412cdd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -420,6 +420,8 @@
 conf = Configure(env)
 if not conf.CheckFunc('BIO_set_init'):
   env.Append(CPPDEFINES=['SERF_NO_SSL_BIO_WRAPPERS'])
+if conf.CheckFunc('OPENSSL_malloc_init'):
+  env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_MALLOC_INIT'])
 env = conf.Finish()
 
 # If build with gssapi, get its information and define SERF_HAVE_GSSAPI

buckets/ssl_buckets.c

diff --git a/buckets/ssl_buckets.c b/buckets/ssl_buckets.c
index a8e5bef..3eb2004 100644
--- a/buckets/ssl_buckets.c
+++ b/buckets/ssl_buckets.c
@@ -1418,7 +1418,7 @@
         }
 #endif
 
-#ifndef USE_LEGACY_OPENSSL
+#ifdef SERF_HAVE_OPENSSL_MALLOC_INIT
         OPENSSL_malloc_init();
 #else
         CRYPTO_malloc_init();