From 333d5751a9615cc98cda6820a446056bba2170d6 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 12 May 2024 15:48:39 +0200 Subject: Core/Cryptography: dropped support for OpenSSL 1.1 OpenSSL 1.1 has been deprecated for quite some time now so it is time to put it to rest. Please upgrade to OpenSSL 3.x (cherry picked from commit 728e7c7fcf2435172a86e621746db5218bdda0cd) --- src/common/Cryptography/OpenSSLCrypto.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/common/Cryptography/OpenSSLCrypto.cpp') diff --git a/src/common/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp index 2d0ccfc526f..db5e2e01533 100644 --- a/src/common/Cryptography/OpenSSLCrypto.cpp +++ b/src/common/Cryptography/OpenSSLCrypto.cpp @@ -17,11 +17,9 @@ #include "OpenSSLCrypto.h" #include - -#if OPENSSL_VERSION_NUMBER >= 0x30000000L #include + OSSL_PROVIDER* LegacyProvider; -#endif void OpenSSLCrypto::threadsSetup([[maybe_unused]] boost::filesystem::path const& providerModulePath) { @@ -29,20 +27,16 @@ void OpenSSLCrypto::threadsSetup([[maybe_unused]] boost::filesystem::path const& ValgrindRandomSetup(); #endif -#if OPENSSL_VERSION_NUMBER >= 0x30000000L #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS OSSL_PROVIDER_set_default_search_path(nullptr, providerModulePath.string().c_str()); #endif LegacyProvider = OSSL_PROVIDER_try_load(nullptr, "legacy", 1); -#endif } void OpenSSLCrypto::threadsCleanup() { -#if OPENSSL_VERSION_NUMBER >= 0x30000000L OSSL_PROVIDER_unload(LegacyProvider); OSSL_PROVIDER_set_default_search_path(nullptr, nullptr); -#endif } #ifdef VALGRIND -- cgit v1.2.3