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

crypt32: Use correct private key for signing. 

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexander Morozov 2018-11-14 15:33:38 +03:00 committed by Alexandre Julliard
parent dffb4705c5
commit 263f6ef201
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/crypt32/crypt32_private.h
View File

@ -116,6 +116,7 @@ typedef struct _CRYPT_SIGNED_INFO
CRYPT_CONTENT_INFO content; CRYPT_CONTENT_INFO content;
DWORD cSignerInfo; DWORD cSignerInfo;
PCMSG_CMS_SIGNER_INFO rgSignerInfo; PCMSG_CMS_SIGNER_INFO rgSignerInfo;
PDWORD signerKeySpec;
} CRYPT_SIGNED_INFO; } CRYPT_SIGNED_INFO;
BOOL CRYPT_AsnEncodeCMSSignedInfo(CRYPT_SIGNED_INFO *, void *pvData, BOOL CRYPT_AsnEncodeCMSSignedInfo(CRYPT_SIGNED_INFO *, void *pvData,

13
dlls/crypt32/msg.c
View File

@ -1130,12 +1130,15 @@ static BOOL CSignedMsgData_Sign(CSignedMsgData *msg_data)
for (i = 0; ret && i < msg_data->info->cSignerInfo; i++) for (i = 0; ret && i < msg_data->info->cSignerInfo; i++)
{ {
HCRYPTHASH hash; HCRYPTHASH hash;
DWORD keySpec = msg_data->info->signerKeySpec[i];
if (!keySpec)
keySpec = AT_SIGNATURE;
if (msg_data->info->rgSignerInfo[i].AuthAttrs.cAttr) if (msg_data->info->rgSignerInfo[i].AuthAttrs.cAttr)
hash = msg_data->signerHandles[i].authAttrHash; hash = msg_data->signerHandles[i].authAttrHash;
else else
hash = msg_data->signerHandles[i].contentHash; hash = msg_data->signerHandles[i].contentHash;
ret = CryptSignHashW(hash, AT_SIGNATURE, NULL, 0, NULL, ret = CryptSignHashW(hash, keySpec, NULL, 0, NULL,
&msg_data->info->rgSignerInfo[i].EncryptedHash.cbData); &msg_data->info->rgSignerInfo[i].EncryptedHash.cbData);
if (ret) if (ret)
{ {
@ -1144,7 +1147,7 @@ static BOOL CSignedMsgData_Sign(CSignedMsgData *msg_data)
msg_data->info->rgSignerInfo[i].EncryptedHash.cbData); msg_data->info->rgSignerInfo[i].EncryptedHash.cbData);
if (msg_data->info->rgSignerInfo[i].EncryptedHash.pbData) if (msg_data->info->rgSignerInfo[i].EncryptedHash.pbData)
{ {
ret = CryptSignHashW(hash, AT_SIGNATURE, NULL, 0, ret = CryptSignHashW(hash, keySpec, NULL, 0,
msg_data->info->rgSignerInfo[i].EncryptedHash.pbData, msg_data->info->rgSignerInfo[i].EncryptedHash.pbData,
&msg_data->info->rgSignerInfo[i].EncryptedHash.cbData); &msg_data->info->rgSignerInfo[i].EncryptedHash.cbData);
if (ret) if (ret)
@ -1194,6 +1197,7 @@ static void CSignedEncodeMsg_Close(HCRYPTMSG hCryptMsg)
for (i = 0; i < msg->msg_data.info->cSignerInfo; i++) for (i = 0; i < msg->msg_data.info->cSignerInfo; i++)
CSignerInfo_Free(&msg->msg_data.info->rgSignerInfo[i]); CSignerInfo_Free(&msg->msg_data.info->rgSignerInfo[i]);
CSignedMsgData_CloseHandles(&msg->msg_data); CSignedMsgData_CloseHandles(&msg->msg_data);
CryptMemFree(msg->msg_data.info->signerKeySpec);
CryptMemFree(msg->msg_data.info->rgSignerInfo); CryptMemFree(msg->msg_data.info->rgSignerInfo);
CryptMemFree(msg->msg_data.info); CryptMemFree(msg->msg_data.info);
} }
@ -1416,6 +1420,9 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags,
msg->msg_data.info->cSignerInfo * msg->msg_data.info->cSignerInfo *
sizeof(CMSG_CMS_SIGNER_INFO)); sizeof(CMSG_CMS_SIGNER_INFO));
ret = CSignedMsgData_AllocateHandles(&msg->msg_data); ret = CSignedMsgData_AllocateHandles(&msg->msg_data);
msg->msg_data.info->signerKeySpec = CryptMemAlloc(info->cSigners * sizeof(DWORD));
if (!msg->msg_data.info->signerKeySpec)
ret = FALSE;
for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++) for (i = 0; ret && i < msg->msg_data.info->cSignerInfo; i++)
{ {
if (info->rgSigners[i].SignerId.dwIdChoice == if (info->rgSigners[i].SignerId.dwIdChoice ==
@ -1432,6 +1439,8 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags,
CryptReleaseContext(info->rgSigners[i].hCryptProv, CryptReleaseContext(info->rgSigners[i].hCryptProv,
0); 0);
} }
msg->msg_data.info->signerKeySpec[i] =
info->rgSigners[i].dwKeySpec;
} }
} }
else else