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

correctly define OPENSSL_VERSION_PREREQ if OPENSSL_VERSION_MAJOR and OPENSSL_VERSION_MINOR are not defined (in older OpenSSL versions)

Browse Source
This commit is contained in:
Günter Obiltschnig 2019-08-16 22:32:13 +02:00
parent 91a78c9146
commit d6de752356
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Crypto/include/Poco/Crypto/Crypto.h
View File

@ -29,8 +29,13 @@
#ifndef OPENSSL_VERSION_PREREQ #ifndef OPENSSL_VERSION_PREREQ
#define OPENSSL_VERSION_PREREQ(maj, min) \ #if defined(OPENSSL_VERSION_MAJOR) && defined(OPENSSL_VERSION_MINOR)
((OPENSSL_VERSION_MAJOR << 16) + OPENSSL_VERSION_MINOR >= ((maj) << 16) + (min)) #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 #endif
@ -130,8 +135,13 @@ enum RSAPaddingMode
#endif #endif
#else #else
#if OPENSSL_VERSION_PREREQ(1,1) #if OPENSSL_VERSION_PREREQ(1,1)
#pragma comment(lib, "libcrypto" POCO_LIB_SUFFIX) #if defined(_WIN64)
#pragma comment(lib, "libssl" POCO_LIB_SUFFIX) #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 #else
#pragma comment(lib, "libeay32" POCO_LIB_SUFFIX) #pragma comment(lib, "libeay32" POCO_LIB_SUFFIX)
#pragma comment(lib, "ssleay32" POCO_LIB_SUFFIX) #pragma comment(lib, "ssleay32" POCO_LIB_SUFFIX)