From 10f835b058ffa517866b08efe6634b0d5226bb66 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)

(cherry picked from commit 7ea33120a03d70aaa856c2c66f183d684131746e)
---
 src/common/Cryptography/OpenSSLCrypto.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/common/Cryptography/OpenSSLCrypto.cpp')

diff --git a/src/common/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp
index ccb20431673..3346a1c2098 100644
--- a/src/common/Cryptography/OpenSSLCrypto.cpp
+++ b/src/common/Cryptography/OpenSSLCrypto.cpp
@@ -15,8 +15,10 @@
  * with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <OpenSSLCrypto.h>
+#include "OpenSSLCrypto.h"
 #include <openssl/crypto.h>
+
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010000fL
 #include <vector>
 #include <thread>
 #include <mutex>
@@ -67,6 +69,7 @@ void OpenSSLCrypto::threadsCleanup()
     }
     cryptoLocks.resize(0);
 }
+#endif
 
 #ifdef VALGRIND
 #include <openssl/rand.h>
-- 
cgit v1.2.3