Juan Lang : crypt32: Support PKCS messages wrapped in a PKCS content info in CryptQueryObject.
Alexandre Julliard
julliard at winehq.org
Thu Sep 27 14:48:53 CDT 2007
Module: wine
Branch: master
Commit: f8ff1c32370735894ae2932e9bed22aad15f87bd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ff1c32370735894ae2932e9bed22aad15f87bd
Author: Juan Lang <juan.lang at gmail.com>
Date: Thu Sep 27 10:01:30 2007 -0700
crypt32: Support PKCS messages wrapped in a PKCS content info in CryptQueryObject.
---
dlls/crypt32/object.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 49 insertions(+), 1 deletions(-)
diff --git a/dlls/crypt32/object.c b/dlls/crypt32/object.c
index 156b3df..a8d4410 100644
--- a/dlls/crypt32/object.c
+++ b/dlls/crypt32/object.c
@@ -299,7 +299,55 @@ static BOOL CRYPT_QueryMessageObject(DWORD dwObjectType, const void *pvObject,
return FALSE;
ret = FALSE;
- if (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED)
+ /* Try it first as a PKCS content info */
+ if ((dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED) ||
+ (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED))
+ {
+ msg = CryptMsgOpenToDecode(encodingType, 0, 0, 0, NULL, NULL);
+ if (msg)
+ {
+ ret = CryptMsgUpdate(msg, blob->pbData, blob->cbData, TRUE);
+ if (ret)
+ {
+ DWORD type, len = sizeof(type);
+
+ ret = CryptMsgGetParam(msg, CMSG_TYPE_PARAM, 0, &type, &len);
+ if (ret)
+ {
+ if ((dwExpectedContentTypeFlags &
+ CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED))
+ {
+ if (type != CMSG_SIGNED)
+ {
+ SetLastError(ERROR_INVALID_DATA);
+ ret = FALSE;
+ }
+ else if (pdwContentType)
+ *pdwContentType = CERT_QUERY_CONTENT_PKCS7_SIGNED;
+ }
+ else if ((dwExpectedContentTypeFlags &
+ CERT_QUERY_CONTENT_FLAG_PKCS7_UNSIGNED))
+ {
+ if (type != CMSG_DATA)
+ {
+ SetLastError(ERROR_INVALID_DATA);
+ ret = FALSE;
+ }
+ else if (pdwContentType)
+ *pdwContentType = CERT_QUERY_CONTENT_PKCS7_UNSIGNED;
+ }
+ }
+ }
+ if (!ret)
+ {
+ CryptMsgClose(msg);
+ msg = NULL;
+ }
+ }
+ }
+ /* Failing that, try explicitly typed messages */
+ if (!ret &&
+ (dwExpectedContentTypeFlags & CERT_QUERY_CONTENT_FLAG_PKCS7_SIGNED))
{
msg = CryptMsgOpenToDecode(encodingType, 0, CMSG_SIGNED, 0, NULL, NULL);
if (msg)
More information about the wine-cvs
mailing list