From d6de7523563370b7fc8e2cb624ef4ea7e4f89dbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Fri, 16 Aug 2019 22:32:13 +0200 Subject: [PATCH] correctly define OPENSSL_VERSION_PREREQ if OPENSSL_VERSION_MAJOR and OPENSSL_VERSION_MINOR are not defined (in older OpenSSL versions) --- Crypto/include/Poco/Crypto/Crypto.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Crypto/include/Poco/Crypto/Crypto.h b/Crypto/include/Poco/Crypto/Crypto.h index e87a25dc5..d6b3ede65 100644 --- a/Crypto/include/Poco/Crypto/Crypto.h +++ b/Crypto/include/Poco/Crypto/Crypto.h @@ -29,8 +29,13 @@ #ifndef OPENSSL_VERSION_PREREQ -#define OPENSSL_VERSION_PREREQ(maj, min) \ - ((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= ((maj) << 16) + (min)) + #if defined(OPENSSL_VERSION_MAJOR) && defined(OPENSSL_VERSION_MINOR) + #define OPENSSL_VERSION_PREREQ(maj, min) \ + ((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= ((maj) << 16) + (min)) + #else + #define OPENSSL_VERSION_PREREQ(maj, min) \ + (OPENSSL_VERSION_NUMBER >= (((maj) << 28) | ((min) << 20))) + #endif #endif @@ -130,8 +135,13 @@ enum RSAPaddingMode #endif #else #if OPENSSL_VERSION_PREREQ(1,1) - #pragma comment(lib, "libcrypto" POCO_LIB_SUFFIX) - #pragma comment(lib, "libssl" POCO_LIB_SUFFIX) + #if defined(_WIN64) + #pragma comment(lib, "libcrypto64" POCO_LIB_SUFFIX) + #pragma comment(lib, "libssl64" POCO_LIB_SUFFIX) + #else + #pragma comment(lib, "libcrypto32" POCO_LIB_SUFFIX) + #pragma comment(lib, "libssl32" POCO_LIB_SUFFIX) + #endif #else #pragma comment(lib, "libeay32" POCO_LIB_SUFFIX) #pragma comment(lib, "ssleay32" POCO_LIB_SUFFIX)