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

crypt32: Open world store when creating chain, not when building a simple chain.

This commit is contained in:
Juan Lang 2007-09-06 09:57:52 -07:00 committed by Alexandre Julliard
parent 1a059879bf
commit e9ee8c8717
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/crypt32/chain.c
View File

@ -515,23 +515,15 @@ static BOOL CRYPT_CheckSimpleChain(PCertificateChainEngine engine,
} }
static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine,
PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime,
PCERT_SIMPLE_CHAIN *ppChain) PCERT_SIMPLE_CHAIN *ppChain)
{ {
BOOL ret = FALSE; BOOL ret = FALSE;
PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine;
PCERT_SIMPLE_CHAIN chain; PCERT_SIMPLE_CHAIN chain;
HCERTSTORE world;
TRACE("(%p, %p, %p, %p)\n", hChainEngine, cert, pTime, hAdditionalStore); TRACE("(%p, %p, %p, %p)\n", hChainEngine, world, cert, pTime);
world = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL);
CertAddStoreToCollection(world, engine->hWorld, 0, 0);
if (cert->hCertStore)
CertAddStoreToCollection(world, cert->hCertStore, 0, 0);
if (hAdditionalStore)
CertAddStoreToCollection(world, hAdditionalStore, 0, 0);
chain = CryptMemAlloc(sizeof(CERT_SIMPLE_CHAIN)); chain = CryptMemAlloc(sizeof(CERT_SIMPLE_CHAIN));
if (chain) if (chain)
{ {
@ -565,22 +557,30 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine,
} }
*ppChain = chain; *ppChain = chain;
} }
CertCloseStore(world, 0);
return ret; return ret;
} }
static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine,
PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore,
PCertificateChain *ppChain) PCertificateChain *ppChain)
{ {
PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine;
PCERT_SIMPLE_CHAIN simpleChain = NULL; PCERT_SIMPLE_CHAIN simpleChain = NULL;
HCERTSTORE world;
BOOL ret; BOOL ret;
world = CertOpenStore(CERT_STORE_PROV_COLLECTION, 0, 0,
CERT_STORE_CREATE_NEW_FLAG, NULL);
CertAddStoreToCollection(world, engine->hWorld, 0, 0);
if (cert->hCertStore)
CertAddStoreToCollection(world, cert->hCertStore, 0, 0);
if (hAdditionalStore)
CertAddStoreToCollection(world, hAdditionalStore, 0, 0);
/* FIXME: only simple chains are supported for now, as CTLs aren't /* FIXME: only simple chains are supported for now, as CTLs aren't
* supported yet. * supported yet.
*/ */
if ((ret = CRYPT_BuildSimpleChain(hChainEngine, pCertContext, pTime, if ((ret = CRYPT_BuildSimpleChain(hChainEngine, world, cert, pTime,
hAdditionalStore, &simpleChain))) &simpleChain)))
{ {
PCertificateChain chain = CryptMemAlloc(sizeof(CertificateChain)); PCertificateChain chain = CryptMemAlloc(sizeof(CertificateChain));
@ -602,6 +602,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine,
ret = FALSE; ret = FALSE;
*ppChain = chain; *ppChain = chain;
} }
CertCloseStore(world, 0);
return ret; return ret;
} }
@ -625,7 +626,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine,
PCCERT_CHAIN_CONTEXT* ppChainContext) PCCERT_CHAIN_CONTEXT* ppChainContext)
{ {
BOOL ret; BOOL ret;
PCertificateChain chain; PCertificateChain chain = NULL;
TRACE("(%p, %p, %p, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, TRACE("(%p, %p, %p, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext,
pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext);