crypt32: Get rid of CRYPT_CreateCertificateContext, it's not needed anymore.
This commit is contained in:
parent
09f0ea1c76
commit
06bc59cd53
|
@ -1749,10 +1749,8 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext( DWORD dwCertEncodingType,
|
||||||
return pcrl;
|
return pcrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Decodes the encoded certificate and creates the certificate context for it.
|
PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType,
|
||||||
*/
|
const BYTE *pbCertEncoded, DWORD cbCertEncoded)
|
||||||
static PWINE_CERT_CONTEXT CRYPT_CreateCertificateContext(
|
|
||||||
DWORD dwCertEncodingType, const BYTE *pbCertEncoded, DWORD cbCertEncoded)
|
|
||||||
{
|
{
|
||||||
PWINE_CERT_CONTEXT_DATA cert = NULL;
|
PWINE_CERT_CONTEXT_DATA cert = NULL;
|
||||||
BOOL ret;
|
BOOL ret;
|
||||||
|
@ -1809,19 +1807,6 @@ static PWINE_CERT_CONTEXT CRYPT_CreateCertificateContext(
|
||||||
}
|
}
|
||||||
|
|
||||||
end:
|
end:
|
||||||
return (PWINE_CERT_CONTEXT)cert;
|
|
||||||
}
|
|
||||||
|
|
||||||
PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType,
|
|
||||||
const BYTE *pbCertEncoded, DWORD cbCertEncoded)
|
|
||||||
{
|
|
||||||
PWINE_CERT_CONTEXT cert;
|
|
||||||
|
|
||||||
TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCertEncoded,
|
|
||||||
cbCertEncoded);
|
|
||||||
|
|
||||||
cert = CRYPT_CreateCertificateContext(dwCertEncodingType, pbCertEncoded,
|
|
||||||
cbCertEncoded);
|
|
||||||
return (PCCERT_CONTEXT)cert;
|
return (PCCERT_CONTEXT)cert;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2293,14 +2278,14 @@ BOOL WINAPI CertAddEncodedCertificateToStore(HCERTSTORE hCertStore,
|
||||||
ret = FALSE;
|
ret = FALSE;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
PWINE_CERT_CONTEXT cert = CRYPT_CreateCertificateContext(
|
PCCERT_CONTEXT cert = CertCreateCertificateContext(
|
||||||
dwCertEncodingType, pbCertEncoded, cbCertEncoded);
|
dwCertEncodingType, pbCertEncoded, cbCertEncoded);
|
||||||
|
|
||||||
if (cert)
|
if (cert)
|
||||||
{
|
{
|
||||||
ret = CertAddCertificateContextToStore(hCertStore,
|
ret = CertAddCertificateContextToStore(hCertStore,
|
||||||
(PCCERT_CONTEXT)cert, dwAddDisposition, ppCertContext);
|
cert, dwAddDisposition, ppCertContext);
|
||||||
CertFreeCertificateContext((PCCERT_CONTEXT)cert);
|
CertFreeCertificateContext(cert);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
ret = FALSE;
|
ret = FALSE;
|
||||||
|
|
Loading…
Reference in New Issue