Skip to content

W
wine-winehq
Commit 03d76d97 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

crypt32: Correct combining trust status of a chain's elements into the chain's trust status.

parent c39696eb
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 8 deletions
dlls/crypt32/chain.c
View file @ 03d76d97
...@@ -262,6 +262,17 @@ static PCCERT_CONTEXT CRYPT_GetIssuerFromStore(HCERTSTORE store, ...@@ -262,6 +262,17 @@ static PCCERT_CONTEXT CRYPT_GetIssuerFromStore(HCERTSTORE store,
return CertGetIssuerCertificateFromStore(store, cert, NULL, pdwFlags); return CertGetIssuerCertificateFromStore(store, cert, NULL, pdwFlags);
} }
static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus,
CERT_TRUST_STATUS *elementStatus)
{
/* Any error that applies to an element also applies to a chain.. */
chainStatus->dwErrorStatus |= elementStatus->dwErrorStatus;
/* but the bottom nibble of an element's info status doesn't apply to the
* chain.
*/
chainStatus->dwInfoStatus |= (elementStatus->dwInfoStatus & 0xfffffff0);
}
static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine,
PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert, DWORD dwFlags) PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert, DWORD dwFlags)
{ {
...@@ -307,10 +318,8 @@ static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, ...@@ -307,10 +318,8 @@ static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine,
chain->rgpElement[chain->cElement++] = element; chain->rgpElement[chain->cElement++] = element;
if (chain->cElement % engine->CycleDetectionModulus) if (chain->cElement % engine->CycleDetectionModulus)
CRYPT_CheckSimpleChainForCycles(chain); CRYPT_CheckSimpleChainForCycles(chain);
chain->TrustStatus.dwErrorStatus |= CRYPT_CombineTrustStatus(&chain->TrustStatus,
element->TrustStatus.dwErrorStatus; &element->TrustStatus);
chain->TrustStatus.dwInfoStatus |=
element->TrustStatus.dwInfoStatus;
ret = TRUE; ret = TRUE;
} }
else else
...@@ -412,10 +421,8 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, ...@@ -412,10 +421,8 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine,
} }
CRYPT_CheckTrustedStatus(engine->hRoot, rootElement); CRYPT_CheckTrustedStatus(engine->hRoot, rootElement);
} }
chain->TrustStatus.dwErrorStatus |= CRYPT_CombineTrustStatus(&chain->TrustStatus,
rootElement->TrustStatus.dwErrorStatus; &rootElement->TrustStatus);
chain->TrustStatus.dwInfoStatus |=
rootElement->TrustStatus.dwInfoStatus & ~CERT_TRUST_IS_SELF_SIGNED;
} }
if (!ret) if (!ret)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment