From 9fca5e9117317d6706fdf7d09fb86acaa3361129 Mon Sep 17 00:00:00 2001 From: daMaex Date: Tue, 14 Jun 2022 21:39:22 +0200 Subject: Core/Crypto: Updated ARC4 code with openssl 3.0 support --- src/common/Cryptography/ARC4.cpp | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src/common/Cryptography/ARC4.cpp') diff --git a/src/common/Cryptography/ARC4.cpp b/src/common/Cryptography/ARC4.cpp index 161303e2c15..faa2265ef71 100644 --- a/src/common/Cryptography/ARC4.cpp +++ b/src/common/Cryptography/ARC4.cpp @@ -18,16 +18,35 @@ #include "ARC4.h" #include "Errors.h" +#if OPENSSL_VERSION_NUMBER >= 0x30000000L +#include +#endif + Trinity::Crypto::ARC4::ARC4() : _ctx(EVP_CIPHER_CTX_new()) { + EVP_CIPHER const* cipher; +#if OPENSSL_VERSION_NUMBER >= 0x30000000L + _libCtx = OSSL_LIB_CTX_new(); + _legacyProvider = OSSL_PROVIDER_load(_libCtx, "legacy"); + + cipher = EVP_CIPHER_fetch(_libCtx, "RC4", ""); +#else + cipher = EVP_rc4(); +#endif + EVP_CIPHER_CTX_init(_ctx); - int result = EVP_EncryptInit_ex(_ctx, EVP_rc4(), nullptr, nullptr, nullptr); + int result = EVP_EncryptInit_ex(_ctx, cipher, nullptr, nullptr, nullptr); ASSERT(result == 1); } Trinity::Crypto::ARC4::~ARC4() { EVP_CIPHER_CTX_free(_ctx); + +#if OPENSSL_VERSION_NUMBER >= 0x30000000L + OSSL_PROVIDER_unload(_legacyProvider); + OSSL_LIB_CTX_free(_libCtx); +#endif } void Trinity::Crypto::ARC4::Init(uint8 const* seed, size_t len) -- cgit v1.2.3