From 5a5f262e5ec5af7ff4ed107088c155b95033693a Mon Sep 17 00:00:00 2001 From: Juan Lang Date: Thu, 27 Sep 2007 10:00:44 -0700 Subject: [PATCH] Fix CryptQueryObject for embedded PKCS7 signatures --- dlls/crypt32/object.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c index 5dc6341..156b3df 100644 --- a/dlls/crypt32/object.c +++ b/dlls/crypt32/object.c @@ -365,25 +365,28 @@ static BOOL CRYPT_QueryEmbeddedMessageOb NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); 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) { - blob.pbData = HeapAlloc(GetProcessHeap(), 0, blob.cbData); - if (blob.pbData) + WIN_CERTIFICATE *winCert = HeapAlloc(GetProcessHeap(), 0, len); + + if (winCert) { - ret = ImageGetCertificateData(file, 0, - (WIN_CERTIFICATE *)blob.pbData, &blob.cbData); + ret = ImageGetCertificateData(file, 0, winCert, &len); if (ret) { + CERT_BLOB blob = { winCert->dwLength, + winCert->bCertificate }; + ret = CRYPT_QueryMessageObject(CERT_QUERY_OBJECT_BLOB, &blob, CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED, pdwMsgAndCertEncodingType, NULL, phCertStore, phMsg); if (ret && pdwContentType) *pdwContentType = CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED; } - HeapFree(GetProcessHeap(), 0, blob.pbData); + HeapFree(GetProcessHeap(), 0, winCert); } } CloseHandle(file); -- 1.4.1