From 4d1ae6cf06741570e9b84d830c875c7cb7d814df Mon Sep 17 00:00:00 2001 From: daMaex Date: Tue, 14 Jun 2022 23:32:34 +0200 Subject: [PATCH] Core/Crypto: Fixed build with openssl 1.1 (cherry picked from commit 9368823c8dfa0587ef915d2f1e0aa443355d7854) --- src/common/Cryptography/ARC4.cpp | 2 +- src/common/Cryptography/ARC4.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/common/Cryptography/ARC4.cpp b/src/common/Cryptography/ARC4.cpp index 8f21cd7c6a0..0f5d7edfc6b 100644 --- a/src/common/Cryptography/ARC4.cpp +++ b/src/common/Cryptography/ARC4.cpp @@ -23,7 +23,7 @@ Trinity::Crypto::ARC4::ARC4() : _ctx(EVP_CIPHER_CTX_new()) #if OPENSSL_VERSION_NUMBER >= 0x30000000L _cipher = EVP_CIPHER_fetch(nullptr, "RC4", nullptr); #else - _cipher = EVP_rc4(); + EVP_CIPHER const* _cipher = EVP_rc4(); #endif EVP_CIPHER_CTX_init(_ctx); diff --git a/src/common/Cryptography/ARC4.h b/src/common/Cryptography/ARC4.h index d3a1bf18eea..faeefd5f2cc 100644 --- a/src/common/Cryptography/ARC4.h +++ b/src/common/Cryptography/ARC4.h @@ -38,7 +38,9 @@ namespace Trinity::Crypto template void UpdateData(Container& c) { UpdateData(std::data(c), std::size(c)); } private: +#if OPENSSL_VERSION_NUMBER >= 0x30000000L EVP_CIPHER* _cipher; +#endif EVP_CIPHER_CTX* _ctx; }; }