wine-commits August 2007

wine-commits@winehq.org

3 participants
1085 discussions

Juan Lang : crypt32: Halt chain creation when a cycle is detected.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: b8b787a81039c4a62c04540d2529593cf3f5fa87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8b787a81039c4a62c04540d2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 30 17:54:58 2007 -0700 crypt32: Halt chain creation when a cycle is detected. --- dlls/crypt32/chain.c | 62 ++++++++++++++++++++++++++++++++++--------- dlls/crypt32/tests/chain.c | 5 +-- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b8ce476..1372ad8 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -212,6 +212,45 @@ static inline BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); } +static void CRYPT_FreeChainElement(PCERT_CHAIN_ELEMENT element) +{ + CertFreeCertificateContext(element->pCertContext); + CryptMemFree(element); +} + +static void CRYPT_CheckSimpleChainForCycles(PCERT_SIMPLE_CHAIN chain) +{ + DWORD i, j, cyclicCertIndex = 0; + + /* O(n^2) - I don't think there's a faster way */ + for (i = 0; !cyclicCertIndex && i < chain->cElement; i++) + for (j = i + 1; !cyclicCertIndex && j < chain->cElement; j++) + if (CertCompareCertificate(X509_ASN_ENCODING, + chain->rgpElement[i]->pCertContext->pCertInfo, + chain->rgpElement[j]->pCertContext->pCertInfo)) + cyclicCertIndex = j; + if (cyclicCertIndex) + { + chain->rgpElement[cyclicCertIndex]->TrustStatus.dwErrorStatus + |= CERT_TRUST_IS_CYCLIC; + /* Release remaining certs */ + for (i = cyclicCertIndex + 1; i < chain->cElement; i++) + CRYPT_FreeChainElement(chain->rgpElement[i]); + /* Truncate chain */ + chain->cElement = cyclicCertIndex + 1; + } +} + +/* Checks whether the chain is cyclic by examining the last element's status */ +static inline BOOL CRYPT_IsSimpleChainCyclic(PCERT_SIMPLE_CHAIN chain) +{ + if (chain->cElement) + return chain->rgpElement[chain->cElement - 1]->TrustStatus.dwErrorStatus + & CERT_TRUST_IS_CYCLIC; + else + return FALSE; +} + /* Gets cert's issuer from store, and returns the validity flags associated * with it. Returns NULL if no issuer whose public key matches cert's * signature could be found. @@ -233,8 +272,8 @@ static PCCERT_CONTEXT CRYPT_GetIssuerFromStore(HCERTSTORE store, return issuer; } -static BOOL CRYPT_AddCertToSimpleChain(PCERT_SIMPLE_CHAIN chain, - PCCERT_CONTEXT cert, DWORD dwFlags) +static BOOL CRYPT_AddCertToSimpleChain(PCertificateChainEngine engine, + PCERT_SIMPLE_CHAIN chain, PCCERT_CONTEXT cert, DWORD dwFlags) { BOOL ret = FALSE; PCERT_CHAIN_ELEMENT element = CryptMemAlloc(sizeof(CERT_CHAIN_ELEMENT)); @@ -273,13 +312,15 @@ static BOOL CRYPT_AddCertToSimpleChain(PCERT_SIMPLE_CHAIN chain, prevElement->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_TIME_NESTED; } - /* FIXME: check valid usages, name constraints, and for cycles */ + /* FIXME: check valid usages and name constraints */ /* FIXME: initialize the rest of element */ + chain->rgpElement[chain->cElement++] = element; + if (chain->cElement % engine->CycleDetectionModulus) + CRYPT_CheckSimpleChainForCycles(chain); chain->TrustStatus.dwErrorStatus |= element->TrustStatus.dwErrorStatus; chain->TrustStatus.dwInfoStatus |= element->TrustStatus.dwInfoStatus; - chain->rgpElement[chain->cElement++] = element; ret = TRUE; } else @@ -288,12 +329,6 @@ static BOOL CRYPT_AddCertToSimpleChain(PCERT_SIMPLE_CHAIN chain, return ret; } -static void CRYPT_FreeChainElement(PCERT_CHAIN_ELEMENT element) -{ - CertFreeCertificateContext(element->pCertContext); - CryptMemFree(element); -} - static void CRYPT_FreeSimpleChain(PCERT_SIMPLE_CHAIN chain) { DWORD i; @@ -327,8 +362,9 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, { memset(chain, 0, sizeof(CERT_SIMPLE_CHAIN)); chain->cbSize = sizeof(CERT_SIMPLE_CHAIN); - ret = CRYPT_AddCertToSimpleChain(chain, cert, 0); - while (ret && !CRYPT_IsCertificateSelfSigned(cert)) + ret = CRYPT_AddCertToSimpleChain(engine, chain, cert, 0); + while (ret && !CRYPT_IsSimpleChainCyclic(chain) && + !CRYPT_IsCertificateSelfSigned(cert)) { DWORD flags; PCCERT_CONTEXT issuer = CRYPT_GetIssuerFromStore(world, cert, @@ -336,7 +372,7 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, if (issuer) { - ret = CRYPT_AddCertToSimpleChain(chain, issuer, flags); + ret = CRYPT_AddCertToSimpleChain(engine, chain, issuer, flags); cert = issuer; } else diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 4cafd0e..2d42ccb 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1529,14 +1529,13 @@ static ChainCheck chainCheck[] = { CERT_TRUST_IS_NOT_TIME_VALID, 0 }, 1, simpleStatus8 }, TODO_ERROR | TODO_INFO }, - /* This (cyclic) chain never completes in Wine, so don't test it yet + /* This (cyclic) chain fails in Wine */ { { sizeof(chain9) / sizeof(chain9[0]), chain9 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT | CERT_TRUST_INVALID_BASIC_CONSTRAINTS | CERT_TRUST_IS_CYCLIC, 0 }, 1, simpleStatus9 }, - TODO_ERROR | TODO_INFO }, - */ + TODO_CHAIN | TODO_ERROR | TODO_INFO }, { { sizeof(chain10) / sizeof(chain10[0]), chain10 }, { { 0, CERT_TRUST_HAS_PREFERRED_ISSUER }, { CERT_TRUST_IS_UNTRUSTED_ROOT, 0 }, 1, simpleStatus10 },

1 0

Juan Lang : crypt32: Implement CertDuplicateCertificateChain.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 51a9d208eebf1f0e61f5035e30c0bf50f843bd35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51a9d208eebf1f0e61f5035e3… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 30 17:53:19 2007 -0700 crypt32: Implement CertDuplicateCertificateChain. --- dlls/crypt32/chain.c | 12 ++++++++++++ dlls/crypt32/crypt32.spec | 1 + 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 81dd6c4..b8ce476 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -482,6 +482,18 @@ static void CRYPT_FreeChainContext(PCertificateChain chain) CryptMemFree(chain); } +PCCERT_CHAIN_CONTEXT WINAPI CertDuplicateCertificateChain( + PCCERT_CHAIN_CONTEXT pChainContext) +{ + PCertificateChain chain = (PCertificateChain)pChainContext; + + TRACE("(%p)\n", pChainContext); + + if (chain) + InterlockedIncrement(&chain->ref); + return pChainContext; +} + void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT pChainContext) { PCertificateChain chain = (PCertificateChain)pChainContext; diff --git a/dlls/crypt32/crypt32.spec b/dlls/crypt32/crypt32.spec index 7403ca2..e16b3ae 100644 --- a/dlls/crypt32/crypt32.spec +++ b/dlls/crypt32/crypt32.spec @@ -26,6 +26,7 @@ @ stdcall CertDeleteCertificateFromStore(ptr) @ stdcall CertDuplicateCRLContext(ptr) @ stdcall CertDuplicateCTLContext(ptr) +@ stdcall CertDuplicateCertificateChain(ptr) @ stdcall CertDuplicateCertificateContext(ptr) @ stdcall CertDuplicateStore(ptr) @ stdcall CertEnumCRLContextProperties(ptr long)

1 0

Juan Lang : crypt32: Remove unneeded WINAPI from internal function.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 3ef4c7e1ccbbd331c5283e8ecd92cc51edc6333d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef4c7e1ccbbd331c5283e8ec… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 30 17:52:50 2007 -0700 crypt32: Remove unneeded WINAPI from internal function. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 24bb197..81dd6c4 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -206,7 +206,7 @@ typedef struct _CertificateChain LONG ref; } CertificateChain, *PCertificateChain; -static inline BOOL WINAPI CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) +static inline BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) { return CertCompareCertificateName(cert->dwCertEncodingType, &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer);

1 0

Juan Lang : crypt32: Free lower quality chain contexts.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 0dc82780cab6583935abcc811ef912cd215b1767 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0dc82780cab6583935abcc811… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 30 17:52:30 2007 -0700 crypt32: Free lower quality chain contexts. --- dlls/crypt32/chain.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b87eee1..24bb197 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -473,9 +473,9 @@ static void CRYPT_FreeChainContext(PCertificateChain chain) { DWORD i; - /* Note the chain's rgpLowerQualityChainContext isn't freed, but - * it's never set, either. - */ + for (i = 0; i < chain->context.cLowerQualityChainContext; i++) + CertFreeCertificateChain(chain->context.rgpLowerQualityChainContext[i]); + CryptMemFree(chain->context.rgpLowerQualityChainContext); for (i = 0; i < chain->context.cChain; i++) CRYPT_FreeSimpleChain(chain->context.rgpChain[i]); CryptMemFree(chain->context.rgpChain);

1 0

Juan Lang : crypt32: Check chain root' s trusted status regardless of whether its signature is valid.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: a4e88cb64402e602ab1a61f859bc8eaafdc5c139 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e88cb64402e602ab1a61f85… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 30 17:51:45 2007 -0700 crypt32: Check chain root's trusted status regardless of whether its signature is valid. --- dlls/crypt32/chain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 6584085..b87eee1 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -367,7 +367,7 @@ static BOOL CRYPT_BuildSimpleChain(HCERTCHAINENGINE hChainEngine, CERT_TRUST_IS_NOT_SIGNATURE_VALID; } } - if (ret) + if (CRYPT_IsCertificateSelfSigned(root)) { BYTE hash[20]; DWORD size = sizeof(hash);

1 0

Juan Lang : crypt32: Properly reference count certificate contexts referenced by a chain.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 8cd7abf1be287af002e742cf2a06a0d83364baa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cd7abf1be287af002e742cf2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 30 17:50:23 2007 -0700 crypt32: Properly reference count certificate contexts referenced by a chain. --- dlls/crypt32/chain.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index f1711ac..6584085 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -250,7 +250,7 @@ static BOOL CRYPT_AddCertToSimpleChain(PCERT_SIMPLE_CHAIN chain, { memset(element, 0, sizeof(CERT_CHAIN_ELEMENT)); element->cbSize = sizeof(CERT_CHAIN_ELEMENT); - element->pCertContext = cert; + element->pCertContext = CertDuplicateCertificateContext(cert); if (dwFlags & CERT_STORE_REVOCATION_FLAG && !(dwFlags & CERT_STORE_NO_CRL_FLAG)) element->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_REVOKED; @@ -288,12 +288,18 @@ static BOOL CRYPT_AddCertToSimpleChain(PCERT_SIMPLE_CHAIN chain, return ret; } +static void CRYPT_FreeChainElement(PCERT_CHAIN_ELEMENT element) +{ + CertFreeCertificateContext(element->pCertContext); + CryptMemFree(element); +} + static void CRYPT_FreeSimpleChain(PCERT_SIMPLE_CHAIN chain) { DWORD i; for (i = 0; i < chain->cElement; i++) - CryptMemFree(chain->rgpElement[i]); + CRYPT_FreeChainElement(chain->rgpElement[i]); CryptMemFree(chain->rgpElement); CryptMemFree(chain); }

1 0

Juan Lang : crypt32: Add a default cycle detection modulus.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 45eef63a35f27a522e4c3e24f2511593bffb987c URL: http://source.winehq.org/git/wine.git/?a=commit;h=45eef63a35f27a522e4c3e24f… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 30 17:49:52 2007 -0700 crypt32: Add a default cycle detection modulus. --- dlls/crypt32/chain.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index cfe05b3..f1711ac 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -25,6 +25,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(crypt); +#define DEFAULT_CYCLE_MODULUS 7 + static HCERTCHAINENGINE CRYPT_defaultChainEngine; /* This represents a subset of a certificate chain engine: it doesn't include @@ -149,7 +151,10 @@ BOOL WINAPI CertCreateCertificateChainEngine(PCERT_CHAIN_ENGINE_CONFIG pConfig, engine->dwUrlRetrievalTimeout = pConfig->dwUrlRetrievalTimeout; engine->MaximumCachedCertificates = pConfig->MaximumCachedCertificates; - engine->CycleDetectionModulus = pConfig->CycleDetectionModulus; + if (pConfig->CycleDetectionModulus) + engine->CycleDetectionModulus = pConfig->CycleDetectionModulus; + else + engine->CycleDetectionModulus = DEFAULT_CYCLE_MODULUS; *phChainEngine = (HCERTCHAINENGINE)engine; ret = TRUE; }

1 0

Juan Lang : crypt32: The preferred issuer flag appears to be a bug in XP, so don't set it.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: cf2047fd726d643638d8191cc9836cbd24c3e163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf2047fd726d643638d8191cc… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Aug 30 17:49:27 2007 -0700 crypt32: The preferred issuer flag appears to be a bug in XP, so don't set it. --- dlls/crypt32/chain.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 2b00ff0..cfe05b3 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -255,10 +255,6 @@ static BOOL CRYPT_AddCertToSimpleChain(PCERT_SIMPLE_CHAIN chain, if (dwFlags & CERT_STORE_TIME_VALIDITY_FLAG) element->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_TIME_VALID; - /* It appears, from every example certificate chain I've found, - * that this flag is always set: - */ - element->TrustStatus.dwInfoStatus = CERT_TRUST_HAS_PREFERRED_ISSUER; if (chain->cElement) { PCERT_CHAIN_ELEMENT prevElement =

1 0

Juan Lang : crypt32: Greatly expand certificate chain tests.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: 6a8a7362cc1dae3237b7e92ea4db2a8b44df79d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6a8a7362cc1dae3237b7e92ea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Fri Aug 31 08:51:11 2007 -0700 crypt32: Greatly expand certificate chain tests. --- dlls/crypt32/tests/chain.c | 1252 +++++++++++++++++++++++++++++++++++++++----- 1 files changed, 1111 insertions(+), 141 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6a8a7362cc1dae3237b7e…

1 0

Alexandre Julliard : gdi32: New DC locking mechanism that doesn' t require holding the global GDI lock.
by Alexandre Julliard 31 Aug '07

31 Aug '07

Module: wine Branch: master Commit: d88ff791ef6429c8557c5e782cd47fa516474ad7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88ff791ef6429c8557c5e782… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Aug 31 15:58:38 2007 +0200 gdi32: New DC locking mechanism that doesn't require holding the global GDI lock. --- dlls/gdi32/bitmap.c | 2 +- dlls/gdi32/clipping.c | 5 +- dlls/gdi32/dc.c | 146 +++++++++++++++++++++++++++++++++++--------- dlls/gdi32/enhmfdrv/init.c | 6 ++ dlls/gdi32/gdi_private.h | 7 ++- dlls/gdi32/mfdrv/init.c | 6 ++ 6 files changed, 138 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d88ff791ef6429c8557c5…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2007