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

X509Certificate: Get rid of deprecated OpenSSL 1.1 APIs

Browse Source 
Added a missing implicit header and added compatibility macros.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-11-02 22:31:21 -07:00
parent 2471aa19d3
commit c11d1eebb0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Crypto/src/X509Certificate.cpp
View File

@ -27,7 +27,13 @@
#include <openssl/x509v3.h> #include <openssl/x509v3.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/bn.h>
#if OPENSSL_VERSION_NUMBER < 0x10100000L
#define ASN1_STRING_get0_data ASN1_STRING_data
#define X509_get0_notBefore X509_get_notBefore
#define X509_get0_notAfter X509_get_notAfter
#endif
namespace Poco { namespace Poco {
namespace Crypto { namespace Crypto {
@ -255,7 +261,7 @@ void X509Certificate::extractNames(std::string& cmnName, std::set<std::string>&
const GENERAL_NAME* name = sk_GENERAL_NAME_value(names, i); const GENERAL_NAME* name = sk_GENERAL_NAME_value(names, i);
if (name->type == GEN_DNS) if (name->type == GEN_DNS)
{ {
const char* data = reinterpret_cast<char*>(ASN1_STRING_data(name->d.ia5)); const char* data = reinterpret_cast<char*>(ASN1_STRING_get0_data(name->d.ia5));
std::size_t len = ASN1_STRING_length(name->d.ia5); std::size_t len = ASN1_STRING_length(name->d.ia5);
domainNames.insert(std::string(data, len)); domainNames.insert(std::string(data, len));
} }
@ -273,7 +279,7 @@ void X509Certificate::extractNames(std::string& cmnName, std::set<std::string>&
Poco::DateTime X509Certificate::validFrom() const Poco::DateTime X509Certificate::validFrom() const
{ {
ASN1_TIME* certTime = X509_get_notBefore(_pCert); const ASN1_TIME* certTime = X509_get0_notBefore(_pCert);
std::string dateTime(reinterpret_cast<char*>(certTime->data)); std::string dateTime(reinterpret_cast<char*>(certTime->data));
int tzd; int tzd;
return DateTimeParser::parse("%y%m%d%H%M%S", dateTime, tzd); return DateTimeParser::parse("%y%m%d%H%M%S", dateTime, tzd);
@ -282,7 +288,7 @@ Poco::DateTime X509Certificate::validFrom() const
Poco::DateTime X509Certificate::expiresOn() const Poco::DateTime X509Certificate::expiresOn() const
{ {
ASN1_TIME* certTime = X509_get_notAfter(_pCert); const ASN1_TIME* certTime = X509_get0_notAfter(_pCert);
std::string dateTime(reinterpret_cast<char*>(certTime->data)); std::string dateTime(reinterpret_cast<char*>(certTime->data));
int tzd; int tzd;
return DateTimeParser::parse("%y%m%d%H%M%S", dateTime, tzd); return DateTimeParser::parse("%y%m%d%H%M%S", dateTime, tzd);