generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-17 07:13:27 +02:00
Code Issues Projects Releases Wiki Activity

ifdef signature algorithm for older openssl versions

Browse Source
This commit is contained in:
Alex Fabijanic 2017-09-29 14:55:29 -05:00
parent 6121d55819
commit 4e4fed8965
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Crypto/src/OpenSSLInitializer.cpp
View File

@ -22,7 +22,12 @@
#if OPENSSL_VERSION_NUMBER >= 0x0907000L
#include <openssl/conf.h>
#endif
#if defined(POCO_OS_FAMILY_WINDOWS)
#pragma message (OPENSSL_VERSION_TEXT)
#elif defined (POCO_COMPILER_GCC)
#pragma message OPENSSL_VERSION_TEXT
// clang?
#endif
using Poco::RandomInputStream;
using Poco::Thread;

10
Crypto/src/X509Certificate.cpp
View File

@ -311,7 +311,15 @@ bool X509Certificate::equals(const X509Certificate& otherCertificate) const
std::string X509Certificate::signatureAlgorithm() const
{
int sigNID = X509_get_signature_nid(_pCert);
int sigNID = NID_undef;
#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL)
sigNID = X509_get_signature_nid(_pCert);
#else
poco_check_ptr(_pCert->sig_alg);
sigNID = OBJ_obj2nid(_pCert->sig_alg->algorithm);
#endif
if (sigNID != NID_undef)
{
const char* pAlgName = OBJ_nid2ln(sigNID);