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

wintrust: Simplify error handling in SoftpubLoadSignature.

This commit is contained in:
Juan Lang 2010-01-27 14:09:37 -08:00 committed by Alexandre Julliard
parent 47e75329e3
commit c9c23190f7
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
dlls/wintrust/softpub.c
View File

@ -560,7 +560,7 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx)
HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data)
{ {
BOOL ret; DWORD err;
TRACE("(%p)\n", data); TRACE("(%p)\n", data);
@ -572,30 +572,26 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data)
DWORD signerCount, size; DWORD signerCount, size;
size = sizeof(signerCount); size = sizeof(signerCount);
ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0, if (CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0,
&signerCount, &size); &signerCount, &size))
if (ret)
{ {
DWORD i; DWORD i;
DWORD err = ERROR_SUCCESS;
err = ERROR_SUCCESS;
for (i = 0; !err && i < signerCount; i++) for (i = 0; !err && i < signerCount; i++)
{ {
if (!(err = WINTRUST_SaveSigner(data, i))) if (!(err = WINTRUST_SaveSigner(data, i)))
err = WINTRUST_VerifySigner(data, i); err = WINTRUST_VerifySigner(data, i);
} }
if (err)
ret = FALSE;
} }
else else
SetLastError(TRUST_E_NOSIGNATURE); err = TRUST_E_NOSIGNATURE;
} }
else else
ret = TRUE; err = ERROR_SUCCESS;
if (!ret) if (err)
data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = err;
GetLastError(); return !err ? S_OK : S_FALSE;
return ret ? S_OK : S_FALSE;
} }
static DWORD WINTRUST_TrustStatusToConfidence(DWORD errorStatus) static DWORD WINTRUST_TrustStatusToConfidence(DWORD errorStatus)