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

openssl 1.1 support

Browse Source
This commit is contained in:
Alex Fabijanic
2017-09-22 16:29:33 -05:00
parent 6b57edd031
commit 0e81e082ff
224 changed files with 1499 additions and 1452 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Crypto/src/EVPPKey.cpp
View File

@@ -216,7 +216,8 @@ void EVPPKey::duplicate(EVP_PKEY* pEVPPKey)
if (!_pEVPPKey) throw NullPointerException("EVPPKey::duplicate(): "
"EVP_PKEY_new() returned null.");
switch (pEVPPKey->type)
int keyType = type(pEVPPKey);
switch (keyType)
{
case EVP_PKEY_RSA:
{
@@ -242,7 +243,7 @@ void EVPPKey::duplicate(EVP_PKEY* pEVPPKey)
}
default:
throw NotImplementedException("EVPPKey:duplicate(); Key type: " +
NumberFormatter::format(pEVPPKey->type));
NumberFormatter::format(keyType));
}
}

4
Crypto/src/PKCS12Container.cpp
View File

@@ -95,11 +95,11 @@ void PKCS12Container::load(PKCS12* pPKCS12, const std::string& password)
PKCS12_SAFEBAG* pBag = PKCS12_add_cert(&pBags, pCert);
if (pBag)
{
char*pBuffer = PKCS12_get_friendlyname(pBag);
char* pBuffer = PKCS12_get_friendlyname(pBag);
if(pBuffer)
{
_pkcsFriendlyname = pBuffer;
CRYPTO_free(pBuffer);
OPENSSL_free(pBuffer);
}else _pkcsFriendlyname.clear();
if(pBags) sk_PKCS12_SAFEBAG_pop_free(pBags, PKCS12_SAFEBAG_free);
}