generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-14 11:06:57 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.10.1' into devel

Browse Source
This commit is contained in:
Günter Obiltschnig 2020-02-04 13:22:19 +01:00
commit 69e56a17c6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
NetSSL_Win/src/SecureSocketImpl.cpp
View File

@ -433,7 +433,7 @@ int SecureSocketImpl::receiveBytes(void* buffer, int length, int flags)
} }
else else
{ {
rc = overflowSize; rc = static_cast<int>(overflowSize);
std::memcpy(buffer, _overflowBuffer.begin(), rc); std::memcpy(buffer, _overflowBuffer.begin(), rc);
_overflowBuffer.resize(0); _overflowBuffer.resize(0);
} }
@ -1283,7 +1283,7 @@ void SecureSocketImpl::verifyCertificateChainClient(PCCERT_CONTEXT pServerCert)
BOOL ok = CertVerifyRevocation( BOOL ok = CertVerifyRevocation(
X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
CERT_CONTEXT_REVOCATION_TYPE, CERT_CONTEXT_REVOCATION_TYPE,
certs.size(), static_cast<DWORD>(certs.size()),
(void**) &certs[0], (void**) &certs[0],
CERT_VERIFY_REV_CHAIN_FLAG, CERT_VERIFY_REV_CHAIN_FLAG,
NULL, NULL,
@ -1390,7 +1390,7 @@ void SecureSocketImpl::serverVerifyCertificate()
BOOL ok = CertVerifyRevocation( BOOL ok = CertVerifyRevocation(
X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
CERT_CONTEXT_REVOCATION_TYPE, CERT_CONTEXT_REVOCATION_TYPE,
certs.size(), static_cast<DWORD>(certs.size()),
(void**) &certs[0], (void**) &certs[0],
CERT_VERIFY_REV_CHAIN_FLAG, CERT_VERIFY_REV_CHAIN_FLAG,
NULL, NULL,

2
NetSSL_Win/src/X509Certificate.cpp
View File

@ -250,7 +250,7 @@ void X509Certificate::extractNames(std::string& cmnName, std::set<std::string>&
flags |= CRYPT_DECODE_ENABLE_PUNYCODE_FLAG; flags |= CRYPT_DECODE_ENABLE_PUNYCODE_FLAG;
#endif #endif
Poco::Buffer<char> buffer(256); Poco::Buffer<char> buffer(256);
DWORD bufferSize = buffer.sizeBytes(); DWORD bufferSize = static_cast<DWORD>(buffer.sizeBytes());
BOOL rc = CryptDecodeObjectEx( BOOL rc = CryptDecodeObjectEx(
X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING,
pExt->pszObjId, pExt->pszObjId,