September 2007 - Wine-commits

Juan Lang : crypt32: Flags weren't set, so don't bother passing them.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 1fc8c6078899ea973930434a4e45e49779410926 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fc8c6078899ea973930434a4… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:02:33 2007 -0700 crypt32: Flags weren't set, so don't bother passing them. --- dlls/crypt32/chain.c | 20 +++----------------- 1 files changed, 3 insertions(+), 17 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 98b69b9..8d0d78c 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -264,7 +264,7 @@ static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus, } static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, - PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert, DWORD dwFlags) + PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert) { BOOL ret = FALSE; PCERT_CHAIN_ELEMENT element = CryptMemAlloc(sizeof(CERT_CHAIN_ELEMENT)); @@ -282,20 +282,6 @@ static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, memset(element, 0, sizeof(CERT_CHAIN_ELEMENT)); element->cbSize = sizeof(CERT_CHAIN_ELEMENT); element->pCertContext = CertDuplicateCertificateContext(cert); - /* Flags, if set, refer to the element this cert issued, so set - * the preceding element's error accordingly - */ - if (chain->cElement > 1) - { - if (dwFlags & CERT_STORE_REVOCATION_FLAG && - !(dwFlags & CERT_STORE_NO_CRL_FLAG)) - chain->rgpElement[chain->cElement - 2]->TrustStatus. - dwErrorStatus |= CERT_TRUST_IS_REVOKED; - if (dwFlags & CERT_STORE_SIGNATURE_FLAG) - chain->rgpElement[chain->cElement - 2]->TrustStatus. - dwErrorStatus |= - CERT_TRUST_IS_NOT_SIGNATURE_VALID; - } /* FIXME: initialize the rest of element */ if (chain->cElement % engine->CycleDetectionModulus) CRYPT_CheckSimpleChainForCycles(chain); @@ -529,7 +515,7 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, if (issuer) { - ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, flags); + ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer); cert = issuer; } else @@ -555,7 +541,7 @@ static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, { memset(chain, 0, sizeof(CERT_SIMPLE_CHAIN)); chain->cbSize = sizeof(CERT_SIMPLE_CHAIN); - ret = CRYPT_AddCertToSimpleChain(engine, chain, cert, 0); + ret = CRYPT_AddCertToSimpleChain(engine, chain, cert); if (ret) { ret = CRYPT_BuildSimpleChain(engine, world, chain);

1 0

Juan Lang : crypt32: Test whether chain creation should fail when a root signature is invalid.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 31618f91dd3db6c05627ea85768d4858ac67b1c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=31618f91dd3db6c05627ea857… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 09:59:58 2007 -0700 crypt32: Test whether chain creation should fail when a root signature is invalid. --- dlls/crypt32/tests/chain.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 83627e0..4f71b99 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1118,6 +1118,38 @@ static const BYTE chain11_1[] = { 0xe9,0xa7,0xd8,0x1c,0x1c,0x8c,0x1c,0x2f,0xd8,0xfb,0x67,0x44,0xd4,0xa3,0x79, 0x6d,0x53,0x17,0x56,0x3c,0x3e,0xd0,0x67,0x36,0x0c,0x8b,0x77,0xab,0x40,0xc7, 0x27,0xd9,0x44,0x69,0x13,0xeb,0x09,0xec,0x06,0xe2 }; +/* chain12_0 -> chain7_1: + * A chain whose root has an invalid signature. + */ +static const BYTE chain12_0[] = { +0x30,0x82,0x01,0x9b,0x30,0x82,0x01,0x08,0xa0,0x03,0x02,0x01,0x02,0x02,0x10, +0x2f,0x67,0x04,0x50,0xe4,0xac,0x81,0x81,0x44,0x25,0x25,0x81,0xbe,0x8a,0x6c, +0x3c,0x30,0x09,0x06,0x05,0x2b,0x0e,0x03,0x02,0x1d,0x05,0x00,0x30,0x10,0x31, +0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74,0x31, +0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x31,0x30,0x31,0x30,0x30,0x30,0x30,0x30, +0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x32,0x33,0x31,0x32,0x33,0x35,0x39,0x35, +0x39,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05, +0x43,0x65,0x72,0x74,0x31,0x30,0x81,0x9f,0x30,0x0d,0x06,0x09,0x2a,0x86,0x48, +0x86,0xf7,0x0d,0x01,0x01,0x01,0x05,0x00,0x03,0x81,0x8d,0x00,0x30,0x81,0x89, +0x02,0x81,0x81,0x00,0xad,0x7e,0xca,0xf3,0xe5,0x99,0xc2,0x2a,0xca,0x50,0x82, +0x7c,0x2d,0xa4,0x81,0xcd,0x0d,0x0d,0x86,0xd7,0xd8,0xb2,0xde,0xc5,0xc3,0x34, +0x9e,0x07,0x78,0x08,0x11,0x12,0x2d,0x21,0x0a,0x09,0x07,0x14,0x03,0x7a,0xe7, +0x3b,0x58,0xf1,0xde,0x3e,0x01,0x25,0x93,0xab,0x8f,0xce,0x1f,0xc1,0x33,0x91, +0xfe,0x59,0xb9,0x3b,0x9e,0x95,0x12,0x89,0x8e,0xc3,0x4b,0x98,0x1b,0x99,0xc5, +0x07,0xe2,0xdf,0x15,0x4c,0x39,0x76,0x06,0xad,0xdb,0x16,0x06,0x49,0xba,0xcd, +0x0f,0x07,0xd6,0xea,0x27,0xa6,0xfe,0x3d,0x88,0xe5,0x97,0x45,0x72,0xb6,0x1c, +0xc0,0x1c,0xb1,0xa2,0x89,0xe8,0x37,0x9e,0xf6,0x2a,0xcf,0xd5,0x1f,0x2f,0x35, +0x5e,0x8f,0x3a,0x9c,0x61,0xb1,0xf1,0x6c,0xff,0x8c,0xb2,0x2f,0x02,0x03,0x01, +0x00,0x01,0x30,0x09,0x06,0x05,0x2b,0x0e,0x03,0x02,0x1d,0x05,0x00,0x03,0x81, +0x81,0x00,0x82,0xa8,0x28,0x6e,0x85,0xbb,0xa4,0xac,0xf4,0xe3,0xbc,0xe5,0x08, +0x76,0x8a,0x1b,0x51,0xea,0xca,0x49,0x46,0x70,0x75,0x38,0x70,0x71,0xa1,0x1c, +0x67,0x77,0x70,0x7d,0xdf,0xd0,0xc6,0xa4,0xfc,0x30,0x22,0x2f,0x52,0x56,0x16, +0xe7,0xe2,0x7e,0x6a,0xcf,0x24,0x0b,0xe2,0xad,0x94,0x52,0x2c,0xcc,0x56,0xd3, +0x2e,0xe2,0xd3,0x3d,0x2f,0xdb,0x22,0xb2,0xff,0xf3,0x20,0xc1,0x62,0xc2,0x3c, +0x24,0x48,0x19,0x13,0x2c,0x8a,0x80,0xcd,0xb5,0xe1,0x84,0xc2,0xee,0x14,0xfe, +0x59,0xe6,0xed,0x7b,0x8b,0xec,0xcc,0x27,0x56,0xa1,0x0e,0x73,0xe7,0x37,0x20, +0x97,0x27,0x12,0xed,0x9f,0xe9,0xec,0x44,0xde,0x3f,0x07,0xa4,0x07,0x42,0x5b, +0x7e,0xe5,0xe1,0x42,0x10,0x4c,0x38,0xd7,0x2b,0xff }; typedef struct _CONST_DATA_BLOB { @@ -1456,6 +1488,18 @@ static CONST_DATA_BLOB chain11[] = { { sizeof(chain11_1), chain11_1 }, { sizeof(chain7_1), chain7_1 }, }; +static CONST_DATA_BLOB chain12[] = { + { sizeof(chain12_0), chain12_0 }, + { sizeof(chain7_1), chain7_1 }, +}; +static const CERT_TRUST_STATUS elementStatus12[] = { + { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_IS_NOT_SIGNATURE_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, +}; +static const SimpleChainStatusCheck simpleStatus12[] = { + { sizeof(elementStatus12) / sizeof(elementStatus12[0]), elementStatus12 }, +}; static CONST_DATA_BLOB selfSignedChain[] = { { sizeof(selfSignedCert), selfSignedCert } }; @@ -1550,6 +1594,10 @@ static ChainCheck chainCheck[] = { { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 }, TODO_ERROR | TODO_INFO }, + { { sizeof(chain12) / sizeof(chain12[0]), chain12 }, + { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus12 }, + TODO_CHAIN | TODO_ERROR | TODO_INFO }, { { sizeof(selfSignedChain) / sizeof(selfSignedChain[0]), selfSignedChain }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_NOT_TIME_VALID | CERT_TRUST_IS_UNTRUSTED_ROOT, 0 },

1 0

Juan Lang : crypt32: Set *ppChainContext even on error.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 69834b16accf0fcb7335ee7c807486b86d2997db URL: http://source.winehq.org/git/wine.git/?a=commit;h=69834b16accf0fcb7335ee7c8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:00:18 2007 -0700 crypt32: Set *ppChainContext even on error. --- dlls/crypt32/chain.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index e9870f8..3759877 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -644,13 +644,13 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, TRACE("(%p, %p, %p, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); + if (ppChainContext) + *ppChainContext = NULL; if (!pChainPara) { SetLastError(E_INVALIDARG); return FALSE; } - if (ppChainContext) - *ppChainContext = NULL; if (!hChainEngine) hChainEngine = CRYPT_GetDefaultChainEngine(); /* FIXME: what about HCCE_LOCAL_MACHINE? */

1 0

Juan Lang : crypt32: Remove a misplaced todo_wine.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: d82f3f37a2160fbacc852152eefe6a464bdfac87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d82f3f37a2160fbacc852152e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:00:36 2007 -0700 crypt32: Remove a misplaced todo_wine. --- dlls/crypt32/tests/chain.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 4f71b99..bf8a1c5 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1660,7 +1660,6 @@ static void testGetCertChain(void) */ cert = CertCreateCertificateContext(X509_ASN_ENCODING, bigCert, sizeof(bigCert)); - todo_wine ret = CertGetCertificateChain(NULL, cert, NULL, NULL, NULL, 0, NULL, NULL); ok(!ret && GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError());

1 0

Juan Lang : crypt32: Not finding an issuer shouldn' t cause chain creation to fail.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 818634d69a4c3979b43d467818a319208053d709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818634d69a4c3979b43d46781… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 09:58:56 2007 -0700 crypt32: Not finding an issuer shouldn't cause chain creation to fail. --- dlls/crypt32/chain.c | 4 ++-- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 5546886..c6b197a 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -544,8 +544,8 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, } else { - TRACE("Couldn't find issuer, aborting chain creation\n"); - ret = FALSE; + TRACE("Couldn't find issuer, halting chain creation\n"); + break; } } if (ret) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 93bbe2c..83627e0 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1583,7 +1583,7 @@ static ChainCheck chainCheckNoStore[] = { { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus8NoStore }, - TODO_CHAIN | TODO_ERROR | TODO_INFO }, + TODO_INFO }, }; /* Wednesday, Oct 1, 2007 */

1 0

Juan Lang : crypt32: Store world store in chain.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: a82b36ac9811dcec46f0db1967d4fec357522ff2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82b36ac9811dcec46f0db196… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 09:59:19 2007 -0700 crypt32: Store world store in chain. --- dlls/crypt32/chain.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index c6b197a..ffaef45 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -203,6 +203,7 @@ void default_chain_engine_free(void) typedef struct _CertificateChain { CERT_CHAIN_CONTEXT context; + HCERTSTORE world; LONG ref; } CertificateChain, *PCertificateChain; @@ -585,6 +586,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, if (chain) { chain->ref = 1; + chain->world = world; chain->context.cbSize = sizeof(CERT_CHAIN_CONTEXT); memcpy(&chain->context.TrustStatus, &simpleChain->TrustStatus, sizeof(CERT_TRUST_STATUS)); @@ -600,7 +602,6 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, ret = FALSE; *ppChain = chain; } - CertCloseStore(world, 0); return ret; } @@ -663,6 +664,7 @@ static void CRYPT_FreeChainContext(PCertificateChain chain) for (i = 0; i < chain->context.cChain; i++) CRYPT_FreeSimpleChain(chain->context.rgpChain[i]); CryptMemFree(chain->context.rgpChain); + CertCloseStore(chain->world, 0); CryptMemFree(chain); }

1 0

Juan Lang : crypt32: Separate allocating a simple chain and checking it from building it.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: c4e07a5bfc4cb298bbcc05d7e7d122c6be3da80f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4e07a5bfc4cb298bbcc05d7e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 09:59:38 2007 -0700 crypt32: Separate allocating a simple chain and checking it from building it. --- dlls/crypt32/chain.c | 58 +++++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 22 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ffaef45..e9870f8 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -515,15 +515,43 @@ static BOOL CRYPT_CheckSimpleChain(PCertificateChainEngine engine, return ret; } -static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, +/* Builds a simple chain by finding an issuer for the last cert in the chain, + * until reaching a self-signed cert, or until no issuer can be found. + */ +static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, + HCERTSTORE world, PCERT_SIMPLE_CHAIN chain) +{ + BOOL ret = TRUE; + PCCERT_CONTEXT cert = chain->rgpElement[chain->cElement - 1]->pCertContext; + + while (ret && !CRYPT_IsSimpleChainCyclic(chain) && + !CRYPT_IsCertificateSelfSigned(cert)) + { + DWORD flags; + PCCERT_CONTEXT issuer = CRYPT_GetIssuerFromStore(world, cert, &flags); + + if (issuer) + { + ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, flags); + cert = issuer; + } + else + { + TRACE("Couldn't find issuer, halting chain creation\n"); + break; + } + } + return ret; +} + +static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, PCERT_SIMPLE_CHAIN *ppChain) { BOOL ret = FALSE; - PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; PCERT_SIMPLE_CHAIN chain; - TRACE("(%p, %p, %p, %p)\n", hChainEngine, world, cert, pTime); + TRACE("(%p, %p, %p, %p)\n", engine, world, cert, pTime); chain = CryptMemAlloc(sizeof(CERT_SIMPLE_CHAIN)); if (chain) @@ -531,26 +559,12 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, memset(chain, 0, sizeof(CERT_SIMPLE_CHAIN)); chain->cbSize = sizeof(CERT_SIMPLE_CHAIN); ret = CRYPT_AddCertToSimpleChain(engine, chain, cert, 0); - while (ret && !CRYPT_IsSimpleChainCyclic(chain) && - !CRYPT_IsCertificateSelfSigned(cert)) + if (ret) { - DWORD flags; - PCCERT_CONTEXT issuer = CRYPT_GetIssuerFromStore(world, cert, - &flags); - - if (issuer) - { - ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, flags); - cert = issuer; - } - else - { - TRACE("Couldn't find issuer, halting chain creation\n"); - break; - } + ret = CRYPT_BuildSimpleChain(engine, world, chain); + if (ret) + ret = CRYPT_CheckSimpleChain(engine, chain, pTime); } - if (ret) - ret = CRYPT_CheckSimpleChain(engine, chain, pTime); if (!ret) { CRYPT_FreeSimpleChain(chain); @@ -578,7 +592,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, /* FIXME: only simple chains are supported for now, as CTLs aren't * supported yet. */ - if ((ret = CRYPT_BuildSimpleChain(hChainEngine, world, cert, pTime, + if ((ret = CRYPT_GetSimpleChainForCert(engine, world, cert, pTime, &simpleChain))) { PCertificateChain chain = CryptMemAlloc(sizeof(CertificateChain));

1 0

Juan Lang : crypt32: Make a helper function to create initial candidate chain.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 1a059879bf0d0df531646238c676daedfde329b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a059879bf0d0df531646238c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 09:57:29 2007 -0700 crypt32: Make a helper function to create initial candidate chain. --- dlls/crypt32/chain.c | 64 +++++++++++++++++++++++++++++++------------------ 1 files changed, 40 insertions(+), 24 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 7efe0c7..9652d61 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -569,6 +569,42 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, return ret; } +static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, + PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + PCertificateChain *ppChain) +{ + PCERT_SIMPLE_CHAIN simpleChain = NULL; + BOOL ret; + + /* FIXME: only simple chains are supported for now, as CTLs aren't + * supported yet. + */ + if ((ret = CRYPT_BuildSimpleChain(hChainEngine, pCertContext, pTime, + hAdditionalStore, &simpleChain))) + { + PCertificateChain chain = CryptMemAlloc(sizeof(CertificateChain)); + + if (chain) + { + chain->ref = 1; + chain->context.cbSize = sizeof(CERT_CHAIN_CONTEXT); + memcpy(&chain->context.TrustStatus, &simpleChain->TrustStatus, + sizeof(CERT_TRUST_STATUS)); + chain->context.cChain = 1; + chain->context.rgpChain = CryptMemAlloc(sizeof(PCERT_SIMPLE_CHAIN)); + chain->context.rgpChain[0] = simpleChain; + chain->context.cLowerQualityChainContext = 0; + chain->context.rgpLowerQualityChainContext = NULL; + chain->context.fHasRevocationFreshnessTime = FALSE; + chain->context.dwRevocationFreshnessTime = 0; + } + else + ret = FALSE; + *ppChain = chain; + } + return ret; +} + typedef struct _CERT_CHAIN_PARA_NO_EXTRA_FIELDS { DWORD cbSize; CERT_USAGE_MATCH RequestedUsage; @@ -588,8 +624,8 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCERT_CHAIN_PARA pChainPara, DWORD dwFlags, LPVOID pvReserved, PCCERT_CHAIN_CONTEXT* ppChainContext) { - PCERT_SIMPLE_CHAIN simpleChain = NULL; BOOL ret; + PCertificateChain chain; TRACE("(%p, %p, %p, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext); @@ -605,30 +641,10 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, hChainEngine = CRYPT_GetDefaultChainEngine(); /* FIXME: what about HCCE_LOCAL_MACHINE? */ /* FIXME: pChainPara is for now ignored */ - /* FIXME: only simple chains are supported for now, as CTLs aren't - * supported yet. - */ - if ((ret = CRYPT_BuildSimpleChain(hChainEngine, pCertContext, pTime, - hAdditionalStore, &simpleChain))) + ret = CRYPT_BuildCandidateChainFromCert(hChainEngine, pCertContext, pTime, + hAdditionalStore, &chain); + if (ret) { - PCertificateChain chain = CryptMemAlloc(sizeof(CertificateChain)); - - if (chain) - { - chain->ref = 1; - chain->context.cbSize = sizeof(CERT_CHAIN_CONTEXT); - memcpy(&chain->context.TrustStatus, &simpleChain->TrustStatus, - sizeof(CERT_TRUST_STATUS)); - chain->context.cChain = 1; - chain->context.rgpChain = CryptMemAlloc(sizeof(PCERT_SIMPLE_CHAIN)); - chain->context.rgpChain[0] = simpleChain; - chain->context.cLowerQualityChainContext = 0; - chain->context.rgpLowerQualityChainContext = NULL; - chain->context.fHasRevocationFreshnessTime = FALSE; - chain->context.dwRevocationFreshnessTime = 0; - } - else - ret = FALSE; if (ppChainContext) *ppChainContext = (PCCERT_CHAIN_CONTEXT)chain; else

1 0

Juan Lang : crypt32: Open world store when creating chain, not when building a simple chain.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: e9ee8c8717833dcd4c580451477f48df4d6efc8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9ee8c8717833dcd4c5804514… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 09:57:52 2007 -0700 crypt32: Open world store when creating chain, not when building a simple chain. --- dlls/crypt32/chain.c | 31 ++++++++++++++++--------------- 1 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 9652d61..5d6a8c6 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -515,23 +515,15 @@ static BOOL CRYPT_CheckSimpleChain(PCertificateChainEngine engine, } static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, - PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + HCERTSTORE world, PCCERT_CONTEXT cert, LPFILETIME pTime, PCERT_SIMPLE_CHAIN *ppChain) { BOOL ret = FALSE; PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; 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)); if (chain) { @@ -565,22 +557,30 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, } *ppChain = chain; } - CertCloseStore(world, 0); return ret; } static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, - PCCERT_CONTEXT pCertContext, LPFILETIME pTime, HCERTSTORE hAdditionalStore, + PCCERT_CONTEXT cert, LPFILETIME pTime, HCERTSTORE hAdditionalStore, PCertificateChain *ppChain) { + PCertificateChainEngine engine = (PCertificateChainEngine)hChainEngine; PCERT_SIMPLE_CHAIN simpleChain = NULL; + HCERTSTORE world; 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 * supported yet. */ - if ((ret = CRYPT_BuildSimpleChain(hChainEngine, pCertContext, pTime, - hAdditionalStore, &simpleChain))) + if ((ret = CRYPT_BuildSimpleChain(hChainEngine, world, cert, pTime, + &simpleChain))) { PCertificateChain chain = CryptMemAlloc(sizeof(CertificateChain)); @@ -602,6 +602,7 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, ret = FALSE; *ppChain = chain; } + CertCloseStore(world, 0); return ret; } @@ -625,7 +626,7 @@ BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE hChainEngine, PCCERT_CHAIN_CONTEXT* ppChainContext) { BOOL ret; - PCertificateChain chain; + PCertificateChain chain = NULL; TRACE("(%p, %p, %p, %p, %p, %08x, %p, %p)\n", hChainEngine, pCertContext, pTime, hAdditionalStore, pChainPara, dwFlags, pvReserved, ppChainContext);

1 0

Juan Lang : crypt32: Don't add end cert's store to world.
by Alexandre Julliard 10 Sep '07

10 Sep '07

Module: wine Branch: master Commit: 8698a598fc8aa2094caa1800ec13e8de19ac087e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8698a598fc8aa2094caa1800e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 09:58:32 2007 -0700 crypt32: Don't add end cert's store to world. --- dlls/crypt32/chain.c | 2 -- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 5d6a8c6..5546886 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -572,8 +572,6 @@ static BOOL CRYPT_BuildCandidateChainFromCert(HCERTCHAINENGINE hChainEngine, 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 diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 0698e2c..93bbe2c 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1583,7 +1583,7 @@ static ChainCheck chainCheckNoStore[] = { { CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus8NoStore }, - TODO_ELEMENTS | TODO_ERROR | TODO_INFO }, + TODO_CHAIN | TODO_ERROR | TODO_INFO }, }; /* Wednesday, Oct 1, 2007 */

1 0