[cpp-xmltooling] 06/09: CPPXT-110 OpenSSL 1.1 internalizes locking.

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=76daf28d24f2cccb1889562b7ddf033e6d5da9a0

commit 76daf28d24f2cccb1889562b7ddf033e6d5da9a0
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 19 16:15:10 2016 +0100

    CPPXT-110 OpenSSL 1.1 internalizes locking.
    
    https://issues.shibboleth.net/jira/browse/CPPXT-110
    
    https://www.openssl.org/docs/manmaster/crypto/CRYPTO_THREAD_lock_free.html
    
    "The old locking functions have been removed completely
    without compatibility macros"
    
    For now we just make the callback compile.  More work TBD.
    
    (reapplied - previously backed out in bae0dd53)
---
 xmltooling/XMLToolingConfig.cpp | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/xmltooling/XMLToolingConfig.cpp b/xmltooling/XMLToolingConfig.cpp
index 6925a23..a8b4bb5 100644
--- a/xmltooling/XMLToolingConfig.cpp
+++ b/xmltooling/XMLToolingConfig.cpp
@@ -111,6 +111,15 @@ using namespace xmlsignature;
 namespace {
     static XMLToolingInternalConfig g_config;
 #ifndef XMLTOOLING_NO_XMLSEC
+// NOTE:
+// "The old locking functions have been removed completely without compatibility macros"
+// see:
+// https://www.openssl.org/docs/manmaster/crypto/CRYPTO_THREAD_lock_free.html
+//
+// For now we just make the callback compile.  More work TBD
+#ifndef CRYPTO_LOCK
+#define CRYPTO_LOCK 1
+#endif
     static ptr_vector<Mutex> g_openssl_locks;
 
     extern "C" void openssl_locking_callback(int mode,int n,const char *file,int line)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.