From 8237e9ba14e686b7750a150cc06d31f6649e0a0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Tue, 18 Apr 2017 11:42:39 +0200 Subject: [PATCH] fix CipherImpl issue with OpenSSL 1.1 --- CHANGELOG | 2 +- Crypto/src/CipherImpl.cpp | 2 +- DLLVersion.rc | 4 ++-- Foundation/include/Poco/Version.h | 2 +- VERSION | 2 +- doc/99100-ReleaseNotes.page | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index acf452d2a..98a5f1826 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,6 @@ This is the changelog file for the POCO C++ Libraries. -Release 1.7.8p1 (2017-04-16) +Release 1.7.8p2 (2017-04-18) ============================ - fixed GH #1655: CipherImpl memory leak with OpenSSL 1.1 diff --git a/Crypto/src/CipherImpl.cpp b/Crypto/src/CipherImpl.cpp index 6ee2bb9d4..eb615b41f 100644 --- a/Crypto/src/CipherImpl.cpp +++ b/Crypto/src/CipherImpl.cpp @@ -119,7 +119,7 @@ namespace { #if OPENSSL_VERSION_NUMBER >= 0x10100000L EVP_CIPHER_CTX_cleanup(_pContext); - EVP_CIPHER_free(_pContext); + EVP_CIPHER_CTX_free(_pContext); #else EVP_CIPHER_CTX_cleanup(&_context); #endif diff --git a/DLLVersion.rc b/DLLVersion.rc index f032f2cb9..94d10dbe3 100644 --- a/DLLVersion.rc +++ b/DLLVersion.rc @@ -4,8 +4,8 @@ #include "winres.h" -#define POCO_VERSION 1,7,8,1 -#define POCO_VERSION_STR "1.7.8p1" +#define POCO_VERSION 1,7,8,2 +#define POCO_VERSION_STR "1.7.8p2" VS_VERSION_INFO VERSIONINFO FILEVERSION POCO_VERSION diff --git a/Foundation/include/Poco/Version.h b/Foundation/include/Poco/Version.h index b73602ae5..ebf75f821 100644 --- a/Foundation/include/Poco/Version.h +++ b/Foundation/include/Poco/Version.h @@ -37,7 +37,7 @@ // Ax: alpha releases // Bx: beta releases // -#define POCO_VERSION 0x01070801 +#define POCO_VERSION 0x01070802 #endif // Foundation_Version_INCLUDED diff --git a/VERSION b/VERSION index 5c7e180ac..0f55946b7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.7.8p1 +1.7.8p2 diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page index 9fb86934d..5af0b4340 100644 --- a/doc/99100-ReleaseNotes.page +++ b/doc/99100-ReleaseNotes.page @@ -1,7 +1,7 @@ POCO C++ Libraries Release Notes AAAIntroduction -!!!Release 1.7.8p1 +!!!Release 1.7.8p2 !!Summary of Changes