From 5b9a4059897421e17fd713711066cff57b12cf3e Mon Sep 17 00:00:00 2001 From: Matej Kenda Date: Thu, 4 Jan 2024 12:36:19 +0100 Subject: [PATCH] fix(Crypto): EVP_CIPHER_CTX_init is incorrectly defined in Envelope.cpp if it is not defined already by OpenSSL. Fixed to properly use EVP_CIPHER_CTX_reset. --- Crypto/src/Envelope.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Crypto/src/Envelope.cpp b/Crypto/src/Envelope.cpp index c74fc25da8..84d96681f4 100644 --- a/Crypto/src/Envelope.cpp +++ b/Crypto/src/Envelope.cpp @@ -14,12 +14,6 @@ #include "Poco/Crypto/Envelope.h" -#if OPENSSL_VERSION_NUMBER >= 0x10100000L - #if !defined(EVP_CIPHER_CTX_init) - #define EVP_CIPHER_CTX_init(a) - #endif -#endif - namespace Poco { namespace Crypto { @@ -30,8 +24,8 @@ Envelope::Envelope(int cipherNID): _pCipher(EVP_get_cipherbynid(cipherNID)), poco_check_ptr(_pCipher); poco_check_ptr(_pCtx); #if OPENSSL_VERSION_NUMBER >= 0x10100000L - if (1 != EVP_CIPHER_CTX_init(_pCtx)) - handleErrors(std::string("Envelope():EVP_CIPHER_CTX_init()")); + if (1 != EVP_CIPHER_CTX_reset(_pCtx)) + handleErrors(std::string("Envelope():EVP_CIPHER_CTX_reset()")); #else EVP_CIPHER_CTX_init(_pCtx); #endif