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

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

This commit is contained in:
Juan Lang 2007-08-07 14:57:04 -07:00 committed by Alexandre Julliard
parent c5a213a816
commit c9a5410288
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dlls/crypt32/msg.c
View File

@ -1742,20 +1742,26 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType,
case CMSG_CONTENT_PARAM: case CMSG_CONTENT_PARAM:
if (msg->u.signedInfo) if (msg->u.signedInfo)
{ {
CRYPT_DATA_BLOB *blob; if (!strcmp(msg->u.signedInfo->content.pszObjId, szOID_RSA_data))
DWORD size;
/* FIXME: does this depend on inner content type? */
ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING,
msg->u.signedInfo->content.Content.pbData,
msg->u.signedInfo->content.Content.cbData, CRYPT_DECODE_ALLOC_FLAG,
NULL, (LPBYTE)&blob, &size);
if (ret)
{ {
ret = CRYPT_CopyParam(pvData, pcbData, blob->pbData, CRYPT_DATA_BLOB *blob;
blob->cbData); DWORD size;
LocalFree(blob);
ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_OCTET_STRING,
msg->u.signedInfo->content.Content.pbData,
msg->u.signedInfo->content.Content.cbData,
CRYPT_DECODE_ALLOC_FLAG, NULL, (LPBYTE)&blob, &size);
if (ret)
{
ret = CRYPT_CopyParam(pvData, pcbData, blob->pbData,
blob->cbData);
LocalFree(blob);
}
} }
else
ret = CRYPT_CopyParam(pvData, pcbData,
msg->u.signedInfo->content.Content.pbData,
msg->u.signedInfo->content.Content.cbData);
} }
else else
SetLastError(CRYPT_E_INVALID_MSG_TYPE); SetLastError(CRYPT_E_INVALID_MSG_TYPE);