From 1fe73cd5322657bf8bd1f4f64eecc9e886d96ec3 Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 16 Sep 2023 00:41:07 +0200 Subject: Core/SSL: Support more certificate formats --- src/common/Cryptography/OpenSSLCrypto.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/common/Cryptography/OpenSSLCrypto.cpp') diff --git a/src/common/Cryptography/OpenSSLCrypto.cpp b/src/common/Cryptography/OpenSSLCrypto.cpp index 9671fbe95bd..2d0ccfc526f 100644 --- a/src/common/Cryptography/OpenSSLCrypto.cpp +++ b/src/common/Cryptography/OpenSSLCrypto.cpp @@ -21,7 +21,6 @@ #if OPENSSL_VERSION_NUMBER >= 0x30000000L #include OSSL_PROVIDER* LegacyProvider; -OSSL_PROVIDER* DefaultProvider; #endif void OpenSSLCrypto::threadsSetup([[maybe_unused]] boost::filesystem::path const& providerModulePath) @@ -34,8 +33,7 @@ void OpenSSLCrypto::threadsSetup([[maybe_unused]] boost::filesystem::path const& #if TRINITY_PLATFORM == TRINITY_PLATFORM_WINDOWS OSSL_PROVIDER_set_default_search_path(nullptr, providerModulePath.string().c_str()); #endif - LegacyProvider = OSSL_PROVIDER_load(nullptr, "legacy"); - DefaultProvider = OSSL_PROVIDER_load(nullptr, "default"); + LegacyProvider = OSSL_PROVIDER_try_load(nullptr, "legacy", 1); #endif } @@ -43,7 +41,6 @@ void OpenSSLCrypto::threadsCleanup() { #if OPENSSL_VERSION_NUMBER >= 0x30000000L OSSL_PROVIDER_unload(LegacyProvider); - OSSL_PROVIDER_unload(DefaultProvider); OSSL_PROVIDER_set_default_search_path(nullptr, nullptr); #endif } -- cgit v1.2.3