aboutsummaryrefslogtreecommitdiff
path: root/src/common/Cryptography/OpenSSLCrypto.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-09-06 12:51:08 +0200
committerShauren <shauren.trinity@gmail.com>2024-02-26 12:17:31 +0100
commit7ff70a6bff86d641c51da46285ff69ca3361cff3 (patch)
tree109f87a5242dc090a590277d27f835f41a1d10cd /src/common/Cryptography/OpenSSLCrypto.cpp
parent182cf7bc0e9af9785a43890bc3edbe39a9b6021d (diff)
Core/Crypto: Remove support for OpenSSL 1.0
(cherry picked from commit b8f18fad29df98d5e8dee1ba28cd5f01fbdf9832)
Diffstat (limited to 'src/common/Cryptography/OpenSSLCrypto.cpp')
-rw-r--r--src/common/Cryptography/OpenSSLCrypto.cpp48
1 files changed, 4 insertions, 44 deletions
diff --git a/src/common/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp
index 4b82263c060..e6224d13841 100644
--- a/src/common/Cryptography/OpenSSLCrypto.cpp
+++ b/src/common/Cryptography/OpenSSLCrypto.cpp
@@ -15,30 +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>
-
-std::vector<std::mutex*> cryptoLocks;
-
-static void lockingCallback(int mode, int type, char const* /*file*/, int /*line*/)
-{
- if (mode & CRYPTO_LOCK)
- cryptoLocks[type]->lock();
- else
- cryptoLocks[type]->unlock();
-}
-
-static void threadIdCallback(CRYPTO_THREADID * id)
-{
- (void)id;
- CRYPTO_THREADID_set_numeric(id, std::hash<std::thread::id>()(std::this_thread::get_id()));
-}
-#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
#include <openssl/provider.h>
OSSL_PROVIDER* LegacyProvider;
OSSL_PROVIDER* DefaultProvider;
@@ -46,19 +26,7 @@ OSSL_PROVIDER* DefaultProvider;
void OpenSSLCrypto::threadsSetup([[maybe_unused]] boost::filesystem::path const& providerModulePath)
{
-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010000fL
- cryptoLocks.resize(CRYPTO_num_locks());
- for(int i = 0 ; i < CRYPTO_num_locks(); ++i)
- {
- cryptoLocks[i] = new std::mutex();
- }
-
- (void)&threadIdCallback;
- CRYPTO_THREADID_set_callback(threadIdCallback);
-
- (void)&lockingCallback;
- CRYPTO_set_locking_callback(lockingCallback);
-#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
#if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS
OSSL_PROVIDER_set_default_search_path(nullptr, providerModulePath.string().c_str());
#endif
@@ -69,15 +37,7 @@ void OpenSSLCrypto::threadsSetup([[maybe_unused]] boost::filesystem::path const&
void OpenSSLCrypto::threadsCleanup()
{
-#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x1010000fL
- CRYPTO_set_locking_callback(nullptr);
- CRYPTO_THREADID_set_callback(nullptr);
- for(int i = 0 ; i < CRYPTO_num_locks(); ++i)
- {
- delete cryptoLocks[i];
- }
- cryptoLocks.resize(0);
-#elif OPENSSL_VERSION_NUMBER >= 0x30000000L
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
OSSL_PROVIDER_unload(LegacyProvider);
OSSL_PROVIDER_unload(DefaultProvider);
OSSL_PROVIDER_set_default_search_path(nullptr, nullptr);