From 7ea33120a03d70aaa856c2c66f183d684131746e Mon Sep 17 00:00:00 2001
From: Peter Keresztes Schmidt <carbenium@outlook.com>
Date: Sat, 25 Jul 2020 03:44:38 +0200
Subject: Common/Crypto: #ifdef out unnecessary locking code for OpenSSL 1.1+
 (PR #25110)

---
 src/common/Cryptography/OpenSSLCrypto.cpp | 3 +++
 src/common/Cryptography/OpenSSLCrypto.h   | 8 ++++++++
 2 files changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/common/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp
index e6b1aaf0ecf..864e95530c2 100644
--- a/src/common/Cryptography/OpenSSLCrypto.cpp
+++ b/src/common/Cryptography/OpenSSLCrypto.cpp
@@ -17,6 +17,8 @@
 
 #include <OpenSSLCrypto.h>
 #include <openssl/crypto.h>
+
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010000fL
 #include <vector>
 #include <thread>
 #include <mutex>
@@ -62,3 +64,4 @@ void OpenSSLCrypto::threadsCleanup()
     }
     cryptoLocks.resize(0);
 }
+#endif
diff --git a/src/common/Cryptography/OpenSSLCrypto.h b/src/common/Cryptography/OpenSSLCrypto.h
index 09ab6bf7a72..8aa0abef88d 100644
--- a/src/common/Cryptography/OpenSSLCrypto.h
+++ b/src/common/Cryptography/OpenSSLCrypto.h
@@ -19,6 +19,7 @@
 #define OPENSSL_CRYPTO_H
 
 #include "Define.h"
+#include <openssl/opensslv.h>
 
 /**
 * A group of functions which setup openssl crypto module to work properly in multithreaded enviroment
@@ -26,10 +27,17 @@
 */
 namespace OpenSSLCrypto
 {
+
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010000fL
     /// Needs to be called before threads using openssl are spawned
     TC_COMMON_API void threadsSetup();
     /// Needs to be called after threads using openssl are despawned
     TC_COMMON_API void threadsCleanup();
+#else
+    void threadsSetup() { };
+    void threadsCleanup() { };
+#endif
+
 }
 
 #endif
-- 
cgit v1.2.3