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

crypt32: Implement getting inner content of a decoded signed message.

This commit is contained in:
Juan Lang 2007-07-30 12:00:23 -07:00 committed by Alexandre Julliard
parent 2acb8a2dd2
commit d6150a7974
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/crypt32/msg.c
View File

@ -1570,6 +1570,27 @@ static BOOL CDecodeSignedMsg_GetParam(CDecodeMsg *msg, DWORD dwParamType,
case CMSG_TYPE_PARAM:
ret = CRYPT_CopyParam(pvData, pcbData, &msg->type, sizeof(msg->type));
break;
case CMSG_CONTENT_PARAM:
if (msg->u.signedInfo)
{
CRYPT_DATA_BLOB *blob;
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,
blob->cbData);
LocalFree(blob);
}
}
else
SetLastError(CRYPT_E_INVALID_MSG_TYPE);
break;
case CMSG_SIGNER_COUNT_PARAM:
if (msg->u.signedInfo)
ret = CRYPT_CopyParam(pvData, pcbData,

1
dlls/crypt32/tests/msg.c
View File

@ -1976,7 +1976,6 @@ static void test_decode_msg_get_param(void)
msg = CryptMsgOpenToDecode(PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL);
ret = CryptMsgUpdate(msg, signedContent, sizeof(signedContent), TRUE);
ok(ret, "CryptMsgUpdate failed: %08x\n", GetLastError());
todo_wine
check_param("signed content", msg, CMSG_CONTENT_PARAM, msgData,
sizeof(msgData));
todo_wine