ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Simplify CRL creation. 

Decoding already handles signed and unsigned CRLs, so don't duplicate
that in CertCreateCRLContext.
This commit is contained in:
Juan Lang 2006-06-19 14:11:37 -07:00 committed by Alexandre Julliard
parent 661aecc761
commit 13e006a715
1 changed files with 3 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dlls/crypt32/crl.c
View File

@ -32,7 +32,6 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType,
{ {
PCRL_CONTEXT crl = NULL; PCRL_CONTEXT crl = NULL;
BOOL ret; BOOL ret;
PCERT_SIGNED_CONTENT_INFO signedCrl = NULL;
PCRL_INFO crlInfo = NULL; PCRL_INFO crlInfo = NULL;
DWORD size = 0; DWORD size = 0;
@ -44,27 +43,9 @@ PCCRL_CONTEXT WINAPI CertCreateCRLContext(DWORD dwCertEncodingType,
SetLastError(E_INVALIDARG); SetLastError(E_INVALIDARG);
return NULL; return NULL;
} }
/* First try to decode it as a signed crl. */ ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_CRL_TO_BE_SIGNED,
ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT, pbCrlEncoded, pbCrlEncoded, cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL,
cbCrlEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&signedCrl, &size); (BYTE *)&crlInfo, &size);
if (ret)
{
size = 0;
ret = CryptDecodeObjectEx(dwCertEncodingType,
X509_CERT_CRL_TO_BE_SIGNED, signedCrl->ToBeSigned.pbData,
signedCrl->ToBeSigned.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL,
(BYTE *)&crlInfo, &size);
LocalFree(signedCrl);
}
/* Failing that, try it as an unsigned crl */
if (!ret)
{
size = 0;
ret = CryptDecodeObjectEx(dwCertEncodingType,
X509_CERT_CRL_TO_BE_SIGNED, pbCrlEncoded, cbCrlEncoded,
CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL,
(BYTE *)&crlInfo, &size);
}
if (ret) if (ret)
{ {
BYTE *data = NULL; BYTE *data = NULL;