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

wintrust: In SoftpubLoadSignature, don't assume a message is present.

This commit is contained in:
Juan Lang 2007-09-28 12:47:03 -07:00 committed by Alexandre Julliard
parent 5fa5518641
commit d7d4a5c4a9
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dlls/wintrust/softpub.c
View File

@ -452,28 +452,34 @@ static BOOL WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx)
HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data)
{ {
BOOL ret; BOOL ret;
DWORD signerCount, size;
TRACE("(%p)\n", data); TRACE("(%p)\n", data);
if (!data->padwTrustStepErrors) if (!data->padwTrustStepErrors)
return S_FALSE; return S_FALSE;
size = sizeof(signerCount); if (data->hMsg)
ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0,
&signerCount, &size);
if (ret)
{ {
DWORD i; DWORD signerCount, size;
for (i = 0; ret && i < signerCount; i++) size = sizeof(signerCount);
ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0,
&signerCount, &size);
if (ret)
{ {
if ((ret = WINTRUST_SaveSigner(data, i))) DWORD i;
ret = WINTRUST_VerifySigner(data, i);
for (i = 0; ret && i < signerCount; i++)
{
if ((ret = WINTRUST_SaveSigner(data, i)))
ret = WINTRUST_VerifySigner(data, i);
}
} }
else
SetLastError(TRUST_E_NOSIGNATURE);
} }
else else
SetLastError(TRUST_E_NOSIGNATURE); ret = TRUE;
if (!ret) if (!ret)
data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] = data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] =
GetLastError(); GetLastError();