svn commit: r1775248 - in /serf/trunk: SConstruct buckets/ssl_buckets.c

[st...@apache.org]

Author: stsp
Date: Tue Dec 20 10:17:46 2016
New Revision: 1775248

URL: http://svn.apache.org/viewvc?rev=1775248&view=rev
Log:
* SConstruct: Check for X509_STORE wrapper functions and provide
    SERF_NO_SSL_X509_STORE_WRAPPERS.

* buckets/ssl_buckets.c: Provide custom X509_STORE_get0_param() macro
   if SERF_NO_SSL_X509_STORE_WRAPPERS is defined, instead of basing
   this decision off of OPENSSL_VERSION_NUMBER.

Modified:
    serf/trunk/SConstruct
    serf/trunk/buckets/ssl_buckets.c

Modified: serf/trunk/SConstruct
URL: http://svn.apache.org/viewvc/serf/trunk/SConstruct?rev=1775248&r1=1775247&r2=1775248&view=diff
==============================================================================
--- serf/trunk/SConstruct (original)
+++ serf/trunk/SConstruct Tue Dec 20 10:17:46 2016
@@ -420,6 +420,8 @@ else:
 conf = Configure(env)
 if not conf.CheckFunc('BIO_set_init'):
   env.Append(CPPDEFINES=['SERF_NO_SSL_BIO_WRAPPERS'])
+if not conf.CheckFunc('X509_STORE_get0_param'):
+  env.Append(CPPDEFINES=['SERF_NO_SSL_X509_STORE_WRAPPERS'])
 if conf.CheckFunc('OPENSSL_malloc_init'):
   env.Append(CPPDEFINES=['SERF_HAVE_OPENSSL_MALLOC_INIT'])
 env = conf.Finish()

Modified: serf/trunk/buckets/ssl_buckets.c
URL: http://svn.apache.org/viewvc/serf/trunk/buckets/ssl_buckets.c?rev=1775248&r1=1775247&r2=1775248&view=diff
==============================================================================
--- serf/trunk/buckets/ssl_buckets.c (original)
+++ serf/trunk/buckets/ssl_buckets.c Tue Dec 20 10:17:46 2016
@@ -51,6 +51,9 @@
 
 #if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER < 0x10100000L
 #define USE_LEGACY_OPENSSL
+#endif
+
+#ifdef SERF_NO_SSL_X509_STORE_WRAPPERS
 #define X509_STORE_get0_param(store) store->param
 #endif