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

wintrust: Return error directly from WINTRUST_CreateChainForSigner.

This commit is contained in:
Juan Lang 2010-01-27 14:20:26 -08:00 committed by Alexandre Julliard
parent 711ca0f4f3
commit 428fc17934
1 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dlls/wintrust/softpub.c
View File

@ -753,11 +753,11 @@ static void WINTRUST_CreateChainPolicyCreateInfo(
info->pvReserved = NULL; info->pvReserved = NULL;
} }
static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data, static DWORD WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data,
DWORD signer, PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO createInfo, DWORD signer, PWTD_GENERIC_CHAIN_POLICY_CREATE_INFO createInfo,
PCERT_CHAIN_PARA chainPara) PCERT_CHAIN_PARA chainPara)
{ {
BOOL ret = TRUE; DWORD err = ERROR_SUCCESS;
HCERTSTORE store = NULL; HCERTSTORE store = NULL;
if (data->chStores) if (data->chStores)
@ -772,15 +772,17 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data,
CertAddStoreToCollection(store, data->pahStores[i], 0, 0); CertAddStoreToCollection(store, data->pahStores[i], 0, 0);
} }
else else
ret = FALSE; err = GetLastError();
} }
if (ret) if (!err)
{ {
/* Expect the end certificate for each signer to be the only cert in /* Expect the end certificate for each signer to be the only cert in
* the chain: * the chain:
*/ */
if (data->pasSigners[signer].csCertChain) if (data->pasSigners[signer].csCertChain)
{ {
BOOL ret;
/* Create a certificate chain for each signer */ /* Create a certificate chain for each signer */
ret = CertGetCertificateChain(createInfo->hChainEngine, ret = CertGetCertificateChain(createInfo->hChainEngine,
data->pasSigners[signer].pasCertChain[0].pCert, data->pasSigners[signer].pasCertChain[0].pCert,
@ -792,45 +794,41 @@ static BOOL WINTRUST_CreateChainForSigner(CRYPT_PROVIDER_DATA *data,
if (data->pasSigners[signer].pChainContext->cChain != 1) if (data->pasSigners[signer].pChainContext->cChain != 1)
{ {
FIXME("unimplemented for more than 1 simple chain\n"); FIXME("unimplemented for more than 1 simple chain\n");
ret = FALSE; err = E_NOTIMPL;
} }
else else
{ {
DWORD err;
if (!(err = WINTRUST_CopyChain(data, signer))) if (!(err = WINTRUST_CopyChain(data, signer)))
{ {
if (data->psPfns->pfnCertCheckPolicy) if (data->psPfns->pfnCertCheckPolicy)
{
ret = data->psPfns->pfnCertCheckPolicy(data, signer, ret = data->psPfns->pfnCertCheckPolicy(data, signer,
FALSE, 0); FALSE, 0);
if (!ret)
err = GetLastError();
}
else else
TRACE( TRACE(
"no cert check policy, skipping policy check\n"); "no cert check policy, skipping policy check\n");
} }
}
}
else else
{ err = GetLastError();
SetLastError(err);
ret = FALSE;
}
}
}
} }
CertCloseStore(store, 0); CertCloseStore(store, 0);
} }
return ret; return err;
} }
HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data)
{ {
BOOL ret; DWORD err;
TRACE("(%p)\n", data); TRACE("(%p)\n", data);
if (!data->csSigners) if (!data->csSigners)
{ err = TRUST_E_NOSIGNATURE;
ret = FALSE;
SetLastError(TRUST_E_NOSIGNATURE);
}
else else
{ {
DWORD i; DWORD i;
@ -838,17 +836,16 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data)
CERT_CHAIN_PARA chainPara; CERT_CHAIN_PARA chainPara;
WINTRUST_CreateChainPolicyCreateInfo(data, &createInfo, &chainPara); WINTRUST_CreateChainPolicyCreateInfo(data, &createInfo, &chainPara);
ret = TRUE; err = ERROR_SUCCESS;
for (i = 0; i < data->csSigners; i++) for (i = 0; !err && i < data->csSigners; i++)
ret = WINTRUST_CreateChainForSigner(data, i, &createInfo, err = WINTRUST_CreateChainForSigner(data, i, &createInfo,
&chainPara); &chainPara);
} }
if (!ret) if (err)
data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = err;
GetLastError(); TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE,
TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE,
data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]);
return ret ? S_OK : S_FALSE; return !err ? S_OK : S_FALSE;
} }
HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data)