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

crypt32: Initialize HashEncryptionAlgorithm.

This commit is contained in:
Alexander Morozov 2010-09-16 18:48:30 +04:00 committed by Alexandre Julliard
parent 8cdf146317
commit 190c3518d6
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/crypt32/msg.c
View File

@ -809,9 +809,16 @@ static BOOL CSignerInfo_Construct(CMSG_CMS_SIGNER_INFO *info,
&info->SignerId.u.IssuerSerialNumber.SerialNumber, &info->SignerId.u.IssuerSerialNumber.SerialNumber,
&in->pCertInfo->SerialNumber); &in->pCertInfo->SerialNumber);
info->SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER; info->SignerId.dwIdChoice = CERT_ID_ISSUER_SERIAL_NUMBER;
info->HashEncryptionAlgorithm.pszObjId =
in->pCertInfo->SubjectPublicKeyInfo.Algorithm.pszObjId;
if (ret)
ret = CRYPT_ConstructBlob(&info->HashEncryptionAlgorithm.Parameters,
&in->pCertInfo->SubjectPublicKeyInfo.Algorithm.Parameters);
} }
else else
{ {
const CRYPT_ALGORITHM_IDENTIFIER *pEncrAlg;
/* Implicitly in->cbSize == sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS). /* Implicitly in->cbSize == sizeof(CMSG_SIGNER_ENCODE_INFO_WITH_CMS).
* See CRYPT_IsValidSigner. * See CRYPT_IsValidSigner.
*/ */
@ -845,6 +852,13 @@ static BOOL CSignerInfo_Construct(CMSG_CMS_SIGNER_INFO *info,
ret = CRYPT_ConstructBlob(&info->SignerId.u.KeyId, ret = CRYPT_ConstructBlob(&info->SignerId.u.KeyId,
&in->SignerId.u.KeyId); &in->SignerId.u.KeyId);
} }
pEncrAlg = in->HashEncryptionAlgorithm.pszObjId ?
&in->HashEncryptionAlgorithm :
&in->pCertInfo->SubjectPublicKeyInfo.Algorithm;
info->HashEncryptionAlgorithm.pszObjId = pEncrAlg->pszObjId;
if (ret)
ret = CRYPT_ConstructBlob(&info->HashEncryptionAlgorithm.Parameters,
&pEncrAlg->Parameters);
} }
/* Assumption: algorithm IDs will point to static strings, not /* Assumption: algorithm IDs will point to static strings, not
* stack-based ones, so copying the pointer values is safe. * stack-based ones, so copying the pointer values is safe.
@ -853,8 +867,6 @@ static BOOL CSignerInfo_Construct(CMSG_CMS_SIGNER_INFO *info,
if (ret) if (ret)
ret = CRYPT_ConstructBlob(&info->HashAlgorithm.Parameters, ret = CRYPT_ConstructBlob(&info->HashAlgorithm.Parameters,
&in->HashAlgorithm.Parameters); &in->HashAlgorithm.Parameters);
memset(&info->HashEncryptionAlgorithm, 0,
sizeof(info->HashEncryptionAlgorithm));
if (ret) if (ret)
ret = CRYPT_ConstructAttributes(&info->AuthAttrs, ret = CRYPT_ConstructAttributes(&info->AuthAttrs,
(CRYPT_ATTRIBUTES *)&in->cAuthAttr); (CRYPT_ATTRIBUTES *)&in->cAuthAttr);
@ -876,6 +888,7 @@ static void CSignerInfo_Free(CMSG_CMS_SIGNER_INFO *info)
else else
CryptMemFree(info->SignerId.u.KeyId.pbData); CryptMemFree(info->SignerId.u.KeyId.pbData);
CryptMemFree(info->HashAlgorithm.Parameters.pbData); CryptMemFree(info->HashAlgorithm.Parameters.pbData);
CryptMemFree(info->HashEncryptionAlgorithm.Parameters.pbData);
CryptMemFree(info->EncryptedHash.pbData); CryptMemFree(info->EncryptedHash.pbData);
for (i = 0; i < info->AuthAttrs.cAttr; i++) for (i = 0; i < info->AuthAttrs.cAttr; i++)
{ {

12
dlls/crypt32/tests/message.c
View File

@ -1024,10 +1024,8 @@ static void test_sign_message(void)
ret = CryptSignMessage(&para, TRUE, 0, NULL, NULL, signedBlob, ret = CryptSignMessage(&para, TRUE, 0, NULL, NULL, signedBlob,
&signedBlobSize); &signedBlobSize);
ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError());
todo_wine
ok(signedBlobSize == sizeof(signedHashForEmptyMessage), ok(signedBlobSize == sizeof(signedHashForEmptyMessage),
"unexpected size %d\n", signedBlobSize); "unexpected size %d\n", signedBlobSize);
todo_wine
ok(!memcmp(signedBlob, signedHashForEmptyMessage, signedBlobSize), ok(!memcmp(signedBlob, signedHashForEmptyMessage, signedBlobSize),
"unexpected value\n"); "unexpected value\n");
CryptMemFree(signedBlob); CryptMemFree(signedBlob);
@ -1044,10 +1042,8 @@ static void test_sign_message(void)
ret = CryptSignMessage(&para, FALSE, 0, NULL, NULL, signedBlob, ret = CryptSignMessage(&para, FALSE, 0, NULL, NULL, signedBlob,
&signedBlobSize); &signedBlobSize);
ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError());
todo_wine
ok(signedBlobSize == sizeof(signedEmptyMessage), "unexpected size %d\n", ok(signedBlobSize == sizeof(signedEmptyMessage), "unexpected size %d\n",
signedBlobSize); signedBlobSize);
todo_wine
ok(!memcmp(signedBlob, signedEmptyMessage, signedBlobSize), ok(!memcmp(signedBlob, signedEmptyMessage, signedBlobSize),
"unexpected value\n"); "unexpected value\n");
CryptMemFree(signedBlob); CryptMemFree(signedBlob);
@ -1065,10 +1061,8 @@ static void test_sign_message(void)
ret = CryptSignMessage(&para, TRUE, 2, toSign, signSize, signedBlob, ret = CryptSignMessage(&para, TRUE, 2, toSign, signSize, signedBlob,
&signedBlobSize); &signedBlobSize);
ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError());
todo_wine
ok(signedBlobSize == sizeof(signedHash), ok(signedBlobSize == sizeof(signedHash),
"unexpected size of signed blob %d\n", signedBlobSize); "unexpected size of signed blob %d\n", signedBlobSize);
todo_wine
ok(!memcmp(signedBlob, signedHash, signedBlobSize), ok(!memcmp(signedBlob, signedHash, signedBlobSize),
"unexpected value\n"); "unexpected value\n");
CryptMemFree(signedBlob); CryptMemFree(signedBlob);
@ -1089,10 +1083,8 @@ static void test_sign_message(void)
ret = CryptSignMessage(&para, TRUE, 2, toSign, signSize, signedBlob, ret = CryptSignMessage(&para, TRUE, 2, toSign, signSize, signedBlob,
&signedBlobSize); &signedBlobSize);
ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError());
todo_wine
ok(signedBlobSize == sizeof(signedHashWithCert), ok(signedBlobSize == sizeof(signedHashWithCert),
"unexpected size of signed blob %d\n", signedBlobSize); "unexpected size of signed blob %d\n", signedBlobSize);
todo_wine
ok(!memcmp(signedBlob, signedHashWithCert, signedBlobSize), ok(!memcmp(signedBlob, signedHashWithCert, signedBlobSize),
"unexpected value\n"); "unexpected value\n");
CryptMemFree(signedBlob); CryptMemFree(signedBlob);
@ -1120,10 +1112,8 @@ static void test_sign_message(void)
ret = CryptSignMessage(&para, TRUE, 2, toSign, signSize, signedBlob, ret = CryptSignMessage(&para, TRUE, 2, toSign, signSize, signedBlob,
&signedBlobSize); &signedBlobSize);
ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError());
todo_wine
ok(signedBlobSize == sizeof(signedHashWithCRL), ok(signedBlobSize == sizeof(signedHashWithCRL),
"unexpected size of signed blob %d\n", signedBlobSize); "unexpected size of signed blob %d\n", signedBlobSize);
todo_wine
ok(!memcmp(signedBlob, signedHashWithCRL, signedBlobSize), ok(!memcmp(signedBlob, signedHashWithCRL, signedBlobSize),
"unexpected value\n"); "unexpected value\n");
CryptMemFree(signedBlob); CryptMemFree(signedBlob);
@ -1145,10 +1135,8 @@ static void test_sign_message(void)
ret = CryptSignMessage(&para, FALSE, 1, toSign, signSize, signedBlob, ret = CryptSignMessage(&para, FALSE, 1, toSign, signSize, signedBlob,
&signedBlobSize); &signedBlobSize);
ok(ret, "CryptSignMessage failed: %08x\n", GetLastError()); ok(ret, "CryptSignMessage failed: %08x\n", GetLastError());
todo_wine
ok(signedBlobSize == sizeof(signedData), ok(signedBlobSize == sizeof(signedData),
"unexpected size of signed blob %d\n", signedBlobSize); "unexpected size of signed blob %d\n", signedBlobSize);
todo_wine
ok(!memcmp(signedBlob, signedData, signedBlobSize), ok(!memcmp(signedBlob, signedData, signedBlobSize),
"unexpected value\n"); "unexpected value\n");
CryptMemFree(signedBlob); CryptMemFree(signedBlob);