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

crypt32: Simplify certificate creation. 

Decoding already handles signed and unsigned certs, so don't duplicate
that in CertCreateCertificateContext.
This commit is contained in:
Juan Lang 2006-06-19 14:10:29 -07:00 committed by Alexandre Julliard
parent 38a85261cb
commit 661aecc761
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/crypt32/cert.c
View File

@ -73,33 +73,15 @@ PCCERT_CONTEXT WINAPI CertCreateCertificateContext(DWORD dwCertEncodingType,
{ {
PCERT_CONTEXT cert = NULL; PCERT_CONTEXT cert = NULL;
BOOL ret; BOOL ret;
PCERT_SIGNED_CONTENT_INFO signedCert = NULL;
PCERT_INFO certInfo = NULL; PCERT_INFO certInfo = NULL;
DWORD size = 0; DWORD size = 0;
TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCertEncoded, TRACE("(%08lx, %p, %ld)\n", dwCertEncodingType, pbCertEncoded,
cbCertEncoded); cbCertEncoded);
/* First try to decode it as a signed cert. */ ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED,
ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT, pbCertEncoded, pbCertEncoded, cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL,
cbCertEncoded, CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&signedCert, &size); (BYTE *)&certInfo, &size);
if (ret)
{
size = 0;
ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED,
signedCert->ToBeSigned.pbData, signedCert->ToBeSigned.cbData,
CRYPT_DECODE_ALLOC_FLAG, NULL, (BYTE *)&certInfo, &size);
LocalFree(signedCert);
}
/* Failing that, try it as an unsigned cert */
if (!ret)
{
size = 0;
ret = CryptDecodeObjectEx(dwCertEncodingType, X509_CERT_TO_BE_SIGNED,
pbCertEncoded, cbCertEncoded,
CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL,
(BYTE *)&certInfo, &size);
}
if (ret) if (ret)
{ {
BYTE *data = NULL; BYTE *data = NULL;