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

crypt32: Implement getting content of an enveloped message.

This commit is contained in:
Alexander Morozov 2010-12-01 14:40:27 +03:00 committed by Alexandre Julliard
parent 03e94320c2
commit 6ad5416f32
4 changed files with 125 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/crypt32/crypt32_private.h
View File

@ -82,6 +82,24 @@ typedef struct _CRYPT_DIGESTED_DATA
BOOL CRYPT_AsnEncodePKCSDigestedData(const CRYPT_DIGESTED_DATA *digestedData,
void *pvData, DWORD *pcbData);
typedef struct _CRYPT_ENCRYPTED_CONTENT_INFO
{
LPSTR contentType;
CRYPT_ALGORITHM_IDENTIFIER contentEncryptionAlgorithm;
CRYPT_DATA_BLOB encryptedContent;
} CRYPT_ENCRYPTED_CONTENT_INFO;
typedef struct _CRYPT_ENVELOPED_DATA
{
DWORD version;
DWORD cRecipientInfo;
PCMSG_KEY_TRANS_RECIPIENT_INFO rgRecipientInfo;
CRYPT_ENCRYPTED_CONTENT_INFO encryptedContentInfo;
} CRYPT_ENVELOPED_DATA;
BOOL CRYPT_AsnEncodePKCSEnvelopedData(const CRYPT_ENVELOPED_DATA *envelopedData,
void *pvData, DWORD *pcbData);
typedef struct _CRYPT_SIGNED_INFO
{
DWORD version;

55
dlls/crypt32/encode.c
View File

@ -4293,6 +4293,61 @@ BOOL CRYPT_AsnEncodeCMSSignedInfo(CRYPT_SIGNED_INFO *signedInfo, void *pvData,
return ret;
}
static BOOL WINAPI CRYPT_AsnEncodeRecipientInfo(DWORD dwCertEncodingType,
LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded)
{
const CMSG_KEY_TRANS_RECIPIENT_INFO *info = pvStructInfo;
struct AsnEncodeSequenceItem items[] = {
{ &info->dwVersion, CRYPT_AsnEncodeInt, 0 },
{ &info->RecipientId.u.IssuerSerialNumber,
CRYPT_AsnEncodeIssuerSerialNumber, 0 },
{ &info->KeyEncryptionAlgorithm,
CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 },
{ &info->EncryptedKey, CRYPT_AsnEncodeOctets, 0 },
};
return CRYPT_AsnEncodeSequence(dwCertEncodingType, items,
sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded,
pcbEncoded);
}
static BOOL WINAPI CRYPT_AsnEncodeEncryptedContentInfo(DWORD dwCertEncodingType,
LPCSTR lpszStructType, const void *pvStructInfo, DWORD dwFlags,
PCRYPT_ENCODE_PARA pEncodePara, BYTE *pbEncoded, DWORD *pcbEncoded)
{
const CRYPT_ENCRYPTED_CONTENT_INFO *info = pvStructInfo;
struct AsnEncodeTagSwappedItem swapped = { ASN_CONTEXT | 0,
&info->encryptedContent, CRYPT_AsnEncodeOctets };
struct AsnEncodeSequenceItem items[] = {
{ info->contentType, CRYPT_AsnEncodeOid, 0 },
{ &info->contentEncryptionAlgorithm,
CRYPT_AsnEncodeAlgorithmIdWithNullParams, 0 },
{ &swapped, CRYPT_AsnEncodeSwapTag, 0 },
};
return CRYPT_AsnEncodeSequence(dwCertEncodingType, items,
sizeof(items) / sizeof(items[0]), dwFlags, pEncodePara, pbEncoded,
pcbEncoded);
}
BOOL CRYPT_AsnEncodePKCSEnvelopedData(const CRYPT_ENVELOPED_DATA *envelopedData,
void *pvData, DWORD *pcbData)
{
struct DERSetDescriptor recipientInfosSet = { envelopedData->cRecipientInfo,
envelopedData->rgRecipientInfo, sizeof(CMSG_KEY_TRANS_RECIPIENT_INFO), 0,
CRYPT_AsnEncodeRecipientInfo };
struct AsnEncodeSequenceItem items[] = {
{ &envelopedData->version, CRYPT_AsnEncodeInt, 0 },
{ &recipientInfosSet, CRYPT_DEREncodeItemsAsSet, 0 },
{ &envelopedData->encryptedContentInfo,
CRYPT_AsnEncodeEncryptedContentInfo, 0 },
};
return CRYPT_AsnEncodeSequence(X509_ASN_ENCODING, items,
sizeof(items) / sizeof(items[0]), 0, NULL, pvData, pcbData);
}
static CryptEncodeObjectExFunc CRYPT_GetBuiltinEncoder(DWORD dwCertEncodingType,
LPCSTR lpszStructType)
{

55
dlls/crypt32/msg.c
View File

@ -1785,9 +1785,58 @@ static void CEnvelopedEncodeMsg_Close(HCRYPTMSG hCryptMsg)
static BOOL CEnvelopedEncodeMsg_GetParam(HCRYPTMSG hCryptMsg, DWORD dwParamType,
DWORD dwIndex, void *pvData, DWORD *pcbData)
{
FIXME("(%p, %d, %d, %p, %p): stub\n", hCryptMsg, dwParamType, dwIndex,
pvData, pcbData);
return FALSE;
CEnvelopedEncodeMsg *msg = hCryptMsg;
BOOL ret = FALSE;
switch (dwParamType)
{
case CMSG_BARE_CONTENT_PARAM:
if (msg->base.streamed)
SetLastError(E_INVALIDARG);
else
{
char oid_rsa_data[] = szOID_RSA_data;
CRYPT_ENVELOPED_DATA envelopedData = {
CMSG_ENVELOPED_DATA_PKCS_1_5_VERSION, msg->cRecipientInfo,
msg->recipientInfo, { oid_rsa_data, msg->algo, msg->data }
};
ret = CRYPT_AsnEncodePKCSEnvelopedData(&envelopedData, pvData,
pcbData);
}
break;
case CMSG_CONTENT_PARAM:
{
CRYPT_CONTENT_INFO info;
ret = CryptMsgGetParam(hCryptMsg, CMSG_BARE_CONTENT_PARAM, 0, NULL,
&info.Content.cbData);
if (ret)
{
info.Content.pbData = CryptMemAlloc(info.Content.cbData);
if (info.Content.pbData)
{
ret = CryptMsgGetParam(hCryptMsg, CMSG_BARE_CONTENT_PARAM, 0,
info.Content.pbData, &info.Content.cbData);
if (ret)
{
char oid_rsa_enveloped[] = szOID_RSA_envelopedData;
info.pszObjId = oid_rsa_enveloped;
ret = CryptEncodeObjectEx(X509_ASN_ENCODING,
PKCS_CONTENT_INFO, &info, 0, NULL, pvData, pcbData);
}
CryptMemFree(info.Content.pbData);
}
else
ret = FALSE;
}
break;
}
default:
SetLastError(CRYPT_E_INVALID_MSG_TYPE);
}
return ret;
}
static BOOL CEnvelopedEncodeMsg_Update(HCRYPTMSG hCryptMsg, const BYTE *pbData,

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

@ -2248,11 +2248,9 @@ static void test_enveloped_msg_encoding(void)
"CryptMsgOpenToEncode failed: %08x\n", GetLastError());
if (msg)
{
todo_wine
check_param("enveloped empty bare content", msg,
CMSG_BARE_CONTENT_PARAM, envelopedEmptyBareContent,
sizeof(envelopedEmptyBareContent));
todo_wine
check_param("enveloped empty content", msg, CMSG_CONTENT_PARAM,
envelopedEmptyContent, sizeof(envelopedEmptyContent));
CryptMsgClose(msg);