Skip to content

W
wine-winehq
Commit c9a54102 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

crypt32: According to MSDN, inner content is only decoded when the content type is data.

parent c5a213a8
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
dlls/crypt32/msg.c
View file @ c9a54102
...@@ -1742,14 +1742,15 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, ...@@ -1742,14 +1742,15 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType,
case CMSG_CONTENT_PARAM: case CMSG_CONTENT_PARAM:
if (msg->u.signedInfo) if (msg->u.signedInfo)
{ {
if (!strcmp(msg->u.signedInfo->content.pszObjId, szOID_RSA_data))
{
CRYPT_DATA_BLOB *blob; CRYPT_DATA_BLOB *blob;
DWORD size; DWORD size;
/* FIXME: does this depend on inner content type? */
ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING, ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING,
msg->u.signedInfo->content.Content.pbData, msg->u.signedInfo->content.Content.pbData,
msg->u.signedInfo->content.Content.cbData, CRYPT_DECODE_ALLOC_FLAG, msg->u.signedInfo->content.Content.cbData,
NULL, (LPBYTE)&blob, &size); CRYPT_DECODE_ALLOC_FLAG, NULL, (LPBYTE)&blob, &size);
if (ret) if (ret)
{ {
ret = CRYPT_CopyParam(pvData, pcbData, blob->pbData, ret = CRYPT_CopyParam(pvData, pcbData, blob->pbData,
...@@ -1758,6 +1759,11 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType, ...@@ -1758,6 +1759,11 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType,
} }
} }
else else
ret = CRYPT_CopyParam(pvData, pcbData,
msg->u.signedInfo->content.Content.pbData,
msg->u.signedInfo->content.Content.cbData);
}
else
SetLastError(CRYPT_E_INVALID_MSG_TYPE); SetLastError(CRYPT_E_INVALID_MSG_TYPE);
break; break;
case CMSG_INNER_CONTENT_TYPE_PARAM: case CMSG_INNER_CONTENT_TYPE_PARAM:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment