generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-01-26 03:23:05 +01:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Matej Kenda 2024-01-04 12:36:19 +01:00
parent 67c1a8a3bc
commit 5b9a405989
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Crypto/src/Envelope.cpp
View File

@ -14,12 +14,6 @@
#include "Poco/Crypto/Envelope.h" #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 Poco {
namespace Crypto { namespace Crypto {
@ -30,8 +24,8 @@ Envelope::Envelope(int cipherNID): _pCipher(EVP_get_cipherbynid(cipherNID)),
poco_check_ptr(_pCipher); poco_check_ptr(_pCipher);
poco_check_ptr(_pCtx); poco_check_ptr(_pCtx);
#if OPENSSL_VERSION_NUMBER >= 0x10100000L #if OPENSSL_VERSION_NUMBER >= 0x10100000L
if (1 != EVP_CIPHER_CTX_init(_pCtx)) if (1 != EVP_CIPHER_CTX_reset(_pCtx))
handleErrors(std::string("Envelope():EVP_CIPHER_CTX_init()")); handleErrors(std::string("Envelope():EVP_CIPHER_CTX_reset()"));
#else #else
EVP_CIPHER_CTX_init(_pCtx); EVP_CIPHER_CTX_init(_pCtx);
#endif #endif