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

crypt32: Fix CryptQueryObject for embedded PKCS7 signatures.

This commit is contained in:
Juan Lang 2007-09-27 10:00:44 -07:00 committed by Alexandre Julliard
parent d78a58298a
commit f880982176
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/crypt32/object.c
View File

@ -365,25 +365,28 @@ static BOOL CRYPT_QueryEmbeddedMessageObject(DWORD dwObjectType,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (file != INVALID_HANDLE_VALUE) if (file != INVALID_HANDLE_VALUE)
{ {
CERT_BLOB blob; DWORD len;
ret = ImageGetCertificateData(file, 0, NULL, &blob.cbData); ret = ImageGetCertificateData(file, 0, NULL, &len);
if (ret) if (ret)
{ {
blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData); WIN_CERTIFICATE *winCert = HeapAlloc(GetProcessHeap(), 0, len);
if (blob.pbData)
if (winCert)
{ {
ret = ImageGetCertificateData(file, 0, ret = ImageGetCertificateData(file, 0, winCert, &len);
(WIN_CERTIFICATE *)blob.pbData, &blob.cbData);
if (ret) if (ret)
{ {
CERT_BLOB blob = { winCert->dwLength,
winCert->bCertificate };
ret = CRYPT_QueryMessageObject(CERT_QUERY_OBJECT_BLOB, ret = CRYPT_QueryMessageObject(CERT_QUERY_OBJECT_BLOB,
&blob, CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED, &blob, CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED,
pdwMsgAndCertEncodingType, NULL, phCertStore, phMsg); pdwMsgAndCertEncodingType, NULL, phCertStore, phMsg);
if (ret && pdwContentType) if (ret && pdwContentType)
*pdwContentType = CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED; *pdwContentType = CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED;
} }
HeapFree(GetProcessHeap(), 0, blob.pbData); HeapFree(GetProcessHeap(), 0, winCert);
} }
} }
CloseHandle(file); CloseHandle(file);