winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
September 2007
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
7 participants
787 discussions
Start a n
N
ew thread
Louis Lenders : wined3d: Add WINED3DPRESENT_INTERVAL_ONE flag.
by Alexandre Julliard
10 Sep '07
10 Sep '07
Module: wine Branch: master Commit: a7558ce756c62b4b282f1acdfee23870a04a9a8e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a7558ce756c62b4b282f1acdf…
Author: Louis Lenders <xerox_xerox2000(a)yahoo.co.uk> Date: Fri Sep 7 17:29:02 2007 +0100 wined3d: Add WINED3DPRESENT_INTERVAL_ONE flag. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e199f36..774bf38 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1810,7 +1810,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, WINED3DCAPS2_FULLSCREENGAMMA | WINED3DCAPS2_DYNAMICTEXTURES; *pCaps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD; - *pCaps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE; + *pCaps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE | + WINED3DPRESENT_INTERVAL_ONE; *pCaps->CursorCaps = WINED3DCURSORCAPS_COLOR | WINED3DCURSORCAPS_LOWRES;
1
0
0
0
Rob Shearman : kernel32: Remove an unused #define in time.c.
by Alexandre Julliard
10 Sep '07
10 Sep '07
Module: wine Branch: master Commit: 11d75beeed17500d5f11a16140f7f93cd86486c1 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=11d75beeed17500d5f11a1614…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Sep 7 18:41:58 2007 +0100 kernel32: Remove an unused #define in time.c. --- dlls/kernel32/time.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/time.c b/dlls/kernel32/time.c index eab7635..0614c13 100644 --- a/dlls/kernel32/time.c +++ b/dlls/kernel32/time.c @@ -52,8 +52,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(time); -/* maximum time adjustment in seconds for SetLocalTime and SetSystemTime */ -#define SETTIME_MAX_ADJUST 120 #define CALINFO_MAX_YEAR 2029 #define LL2FILETIME( ll, pft )\
1
0
0
0
Rob Shearman : ntdll: Remove the overly-cautious check which prevented NtSetSystemTime from changing the time by more than two minutes .
by Alexandre Julliard
10 Sep '07
10 Sep '07
Module: wine Branch: master Commit: 67cc0302f441d648601ed63d8474887ba3d3a58b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=67cc0302f441d648601ed63d8…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Sep 7 18:41:42 2007 +0100 ntdll: Remove the overly-cautious check which prevented NtSetSystemTime from changing the time by more than two minutes. Simplify the returning of different status codes by not playing around with the return value from settimeofday. --- dlls/ntdll/time.c | 37 ++++++++++++------------------------- 1 files changed, 12 insertions(+), 25 deletions(-) diff --git a/dlls/ntdll/time.c b/dlls/ntdll/time.c index 957d587..cd23958 100644 --- a/dlls/ntdll/time.c +++ b/dlls/ntdll/time.c @@ -62,8 +62,6 @@ static RTL_CRITICAL_SECTION_DEBUG critsect_debug = }; static RTL_CRITICAL_SECTION TIME_tz_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -#define SETTIME_MAX_ADJUST 120 - #define TICKSPERSEC 10000000 #define TICKSPERMSEC 10000 #define SECSPERDAY 86400 @@ -898,7 +896,6 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old time_t tm_t; DWORD sec, oldsec; LARGE_INTEGER tm; - int err; /* Return the old time if necessary */ if (!OldTime) OldTime = &tm; @@ -912,30 +909,20 @@ NTSTATUS WINAPI NtSetSystemTime(const LARGE_INTEGER *NewTime, LARGE_INTEGER *Old tv.tv_sec = sec; tv.tv_usec = 0; - /* error and sanity check*/ - if(sec == (time_t)-1 || abs((int)(sec-oldsec)) > SETTIME_MAX_ADJUST) { - err = 2; - } else { #ifdef HAVE_SETTIMEOFDAY - err = settimeofday(&tv, NULL); /* 0 is OK, -1 is error */ - if(err == 0) - return STATUS_SUCCESS; -#else - err = 1; -#endif - } - + if (!settimeofday(&tv, NULL)) /* 0 is OK, -1 is error */ + return STATUS_SUCCESS; tm_t = sec; - ERR("Cannot set time to %s Time adjustment %ld %s\n", - ctime( &tm_t ), - (long)(sec-oldsec), - err == -1 ? "No Permission" - : sec == (time_t)-1 ? "" : "is too large." ); - - if(err == 2) - return STATUS_INVALID_PARAMETER; - else if(err == -1) + ERR("Cannot set time to %s, time adjustment %ld: %s\n", + ctime(&tm_t), (long)(sec-oldsec), strerror(errno)); + if (errno == EPERM) return STATUS_PRIVILEGE_NOT_HELD; else - return STATUS_NOT_IMPLEMENTED; + return STATUS_INVALID_PARAMETER; +#else + tm_t = sec; + FIXME("setting time to %s not implemented for missing settimeofday\n", + ctime(&tm_t)); + return STATUS_NOT_IMPLEMENTED; +#endif }
1
0
0
0
Rob Shearman : shlwapi: Fix IUnknown_OnFocusOCS to call OnFocus instead of GetExtendedControl.
by Alexandre Julliard
10 Sep '07
10 Sep '07
Module: wine Branch: master Commit: 5440889645fbfb44a46d2f4a315e9b97e1d7f6db URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5440889645fbfb44a46d2f4a3…
Author: Rob Shearman <rob(a)codeweavers.com> Date: Fri Sep 7 15:26:40 2007 +0100 shlwapi: Fix IUnknown_OnFocusOCS to call OnFocus instead of GetExtendedControl. --- dlls/shlwapi/ordinal.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 8e950d8..b1cb585 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -1775,29 +1775,29 @@ HRESULT WINAPI IUnknown_TranslateAcceleratorOCS(IUnknown *lpUnknown, LPMSG lpMsg /************************************************************************* * @ [SHLWAPI.189] * - * Call IOleControlSite_GetExtendedControl() on an object. + * Call IOleControlSite_OnFocus() on an object. * * PARAMS * lpUnknown [I] Object supporting the IOleControlSite interface. - * lppDisp [O] Destination for resulting IDispatch. + * fGotFocus [I] Whether focus was gained (TRUE) or lost (FALSE). * * RETURNS * Success: S_OK. * Failure: An HRESULT error code, or E_FAIL if lpUnknown is NULL. */ -DWORD WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, IDispatch** lppDisp) +HRESULT WINAPI IUnknown_OnFocusOCS(IUnknown *lpUnknown, BOOL fGotFocus) { IOleControlSite* lpCSite = NULL; HRESULT hRet = E_FAIL; - TRACE("(%p,%p)\n", lpUnknown, lppDisp); + TRACE("(%p,%s)\n", lpUnknown, fGotFocus ? "TRUE" : "FALSE"); if (lpUnknown) { hRet = IUnknown_QueryInterface(lpUnknown, &IID_IOleControlSite, (void**)&lpCSite); if (SUCCEEDED(hRet) && lpCSite) { - hRet = IOleControlSite_GetExtendedControl(lpCSite, lppDisp); + hRet = IOleControlSite_OnFocus(lpCSite, fGotFocus); IOleControlSite_Release(lpCSite); } }
1
0
0
0
Huw Davies : wineps.drv: Ignore an empty output string.
by Alexandre Julliard
10 Sep '07
10 Sep '07
Module: wine Branch: master Commit: 5dadeeb29d36a93b3bbeec8d7b1d237f29bf8f67 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5dadeeb29d36a93b3bbeec8d7…
Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Sep 7 11:29:56 2007 +0100 wineps.drv: Ignore an empty output string. --- dlls/wineps.drv/init.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index d499247..82ed439 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -356,7 +356,7 @@ BOOL PSDRV_CreateDC( HDC hdc, PSDRV_PDEVICE **pdev, LPCWSTR driver, LPCWSTR devi physDev->logPixelsX = physDev->pi->ppd->DefaultResolution; physDev->logPixelsY = physDev->pi->ppd->DefaultResolution; - if (output) { + if (output && *output) { INT len = WideCharToMultiByte( CP_ACP, 0, output, -1, NULL, 0, NULL, NULL ); if ((physDev->job.output = HeapAlloc( PSDRV_Heap, 0, len ))) WideCharToMultiByte( CP_ACP, 0, output, -1, physDev->job.output, len, NULL, NULL );
1
0
0
0
Juan Lang : crypt32: Consider alternate issuers when building chains.
by Alexandre Julliard
10 Sep '07
10 Sep '07
Module: wine Branch: master Commit: 5e674f3580d629a3a5e0ef82df4db4fb16efd491 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5e674f3580d629a3a5e0ef82d…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:02:54 2007 -0700 crypt32: Consider alternate issuers when building chains. --- dlls/crypt32/chain.c | 340 ++++++++++++++++++++++++++++++++++++++++++-- dlls/crypt32/tests/chain.c | 4 +- 2 files changed, 328 insertions(+), 16 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e674f3580d629a3a5e0e…
1
0
0
0
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
0
0
Juan Lang : crypt32: Defer checking signatures until chain is complete.
by Alexandre Julliard
10 Sep '07
10 Sep '07
Module: wine Branch: master Commit: a040dd22e75f8ca86961a0a0afbc0caa97c9f109 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a040dd22e75f8ca86961a0a0a…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:02:11 2007 -0700 crypt32: Defer checking signatures until chain is complete. --- dlls/crypt32/chain.c | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 4cf74a6..98b69b9 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -252,16 +252,6 @@ static inline BOOL CRYPT_IsSimpleChainCyclic(PCERT_SIMPLE_CHAIN chain) return FALSE; } -/* Gets cert's issuer from store, and returns the validity flags associated - * with it. Returns NULL if no issuer signature could be found. - */ -static PCCERT_CONTEXT CRYPT_GetIssuerFromStore(HCERTSTORE store, - PCCERT_CONTEXT cert, PDWORD pdwFlags) -{ - *pdwFlags = CERT_STORE_SIGNATURE_FLAG; - return CertGetIssuerCertificateFromStore(store, cert, NULL, pdwFlags); -} - static inline void CRYPT_CombineTrustStatus(CERT_TRUST_STATUS *chainStatus, CERT_TRUST_STATUS *elementStatus) { @@ -482,6 +472,14 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, CERT_TRUST_IS_NOT_TIME_VALID; if (i != 0) { + /* Check the signature of the cert this issued */ + if (!CryptVerifyCertificateSignatureEx(0, X509_ASN_ENCODING, + CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, + (void *)chain->rgpElement[i - 1]->pCertContext, + CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, + (void *)chain->rgpElement[i]->pCertContext, 0, NULL)) + chain->rgpElement[i - 1]->TrustStatus.dwErrorStatus |= + CERT_TRUST_IS_NOT_SIGNATURE_VALID; /* Once a path length constraint has been violated, every remaining * CA cert's basic constraints is considered invalid. */ @@ -525,8 +523,9 @@ static BOOL CRYPT_BuildSimpleChain(PCertificateChainEngine engine, while (ret && !CRYPT_IsSimpleChainCyclic(chain) && !CRYPT_IsCertificateSelfSigned(cert)) { - DWORD flags; - PCCERT_CONTEXT issuer = CRYPT_GetIssuerFromStore(world, cert, &flags); + DWORD flags = 0; + PCCERT_CONTEXT issuer = + CertGetIssuerCertificateFromStore(world, cert, NULL, &flags); if (issuer) {
1
0
0
0
Juan Lang : crypt32: Don' t ask CertGetIssuerCertificateFromStore to verify revocation status, it almost certainly doesn't do what we want.
by Alexandre Julliard
10 Sep '07
10 Sep '07
Module: wine Branch: master Commit: 56d4a3c3924917253b401c6c2920a932072f0bee URL:
http://source.winehq.org/git/wine.git/?a=commit;h=56d4a3c3924917253b401c6c2…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:01:47 2007 -0700 crypt32: Don't ask CertGetIssuerCertificateFromStore to verify revocation status, it almost certainly doesn't do what we want. --- dlls/crypt32/chain.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index b8bb0df..4cf74a6 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -258,7 +258,7 @@ static inline BOOL CRYPT_IsSimpleChainCyclic(PCERT_SIMPLE_CHAIN chain) static PCCERT_CONTEXT CRYPT_GetIssuerFromStore(HCERTSTORE store, PCCERT_CONTEXT cert, PDWORD pdwFlags) { - *pdwFlags = CERT_STORE_REVOCATION_FLAG | CERT_STORE_SIGNATURE_FLAG; + *pdwFlags = CERT_STORE_SIGNATURE_FLAG; return CertGetIssuerCertificateFromStore(store, cert, NULL, pdwFlags); } @@ -509,6 +509,7 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, rootElement->TrustStatus.dwInfoStatus |= CERT_TRUST_IS_SELF_SIGNED; CRYPT_CheckRootCert(engine->hRoot, rootElement); } + /* FIXME: check revocation of every cert with CertVerifyRevocation */ CRYPT_CombineTrustStatus(&chain->TrustStatus, &rootElement->TrustStatus); }
1
0
0
0
Juan Lang : crypt32: Don't abort chain creation if the root signature isn' t valid.
by Alexandre Julliard
10 Sep '07
10 Sep '07
Module: wine Branch: master Commit: dfd2d3d9bc3785c2a0051dc94bca4adb7a60a12c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=dfd2d3d9bc3785c2a0051dc94…
Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Sep 6 10:01:22 2007 -0700 crypt32: Don't abort chain creation if the root signature isn't valid. --- dlls/crypt32/chain.c | 17 +++++++---------- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 5af49e6..b8bb0df 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -349,22 +349,20 @@ static void CRYPT_CheckTrustedStatus(HCERTSTORE hRoot, CertFreeCertificateContext(trustedRoot); } -static BOOL CRYPT_CheckRootCert(HCERTCHAINENGINE hRoot, +static void CRYPT_CheckRootCert(HCERTCHAINENGINE hRoot, PCERT_CHAIN_ELEMENT rootElement) { PCCERT_CONTEXT root = rootElement->pCertContext; - BOOL ret; - if (!(ret = CryptVerifyCertificateSignatureEx(0, root->dwCertEncodingType, + if (!CryptVerifyCertificateSignatureEx(0, root->dwCertEncodingType, CRYPT_VERIFY_CERT_SIGN_SUBJECT_CERT, (void *)root, - CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)root, 0, NULL))) + CRYPT_VERIFY_CERT_SIGN_ISSUER_CERT, (void *)root, 0, NULL)) { TRACE("Last certificate's signature is invalid\n"); rootElement->TrustStatus.dwErrorStatus |= CERT_TRUST_IS_NOT_SIGNATURE_VALID; } CRYPT_CheckTrustedStatus(hRoot, rootElement); - return ret; } /* Decodes a cert's basic constraints extension (either szOID_BASIC_CONSTRAINTS @@ -468,12 +466,12 @@ static BOOL CRYPT_CheckBasicConstraintsForCA(PCCERT_CONTEXT cert, return validBasicConstraints; } -static BOOL CRYPT_CheckSimpleChain(PCertificateChainEngine engine, +static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, PCERT_SIMPLE_CHAIN chain, LPFILETIME time) { PCERT_CHAIN_ELEMENT rootElement = chain->rgpElement[chain->cElement - 1]; int i; - BOOL ret = TRUE, pathLengthConstraintViolated = FALSE; + BOOL pathLengthConstraintViolated = FALSE; CERT_BASIC_CONSTRAINTS2_INFO constraints = { TRUE, FALSE, 0 }; for (i = chain->cElement - 1; i >= 0; i--) @@ -509,10 +507,9 @@ static BOOL CRYPT_CheckSimpleChain(PCertificateChainEngine engine, if (CRYPT_IsCertificateSelfSigned(rootElement->pCertContext)) { rootElement->TrustStatus.dwInfoStatus |= CERT_TRUST_IS_SELF_SIGNED; - ret = CRYPT_CheckRootCert(engine->hRoot, rootElement); + CRYPT_CheckRootCert(engine->hRoot, rootElement); } CRYPT_CombineTrustStatus(&chain->TrustStatus, &rootElement->TrustStatus); - return ret; } /* Builds a simple chain by finding an issuer for the last cert in the chain, @@ -563,7 +560,7 @@ static BOOL CRYPT_GetSimpleChainForCert(PCertificateChainEngine engine, { ret = CRYPT_BuildSimpleChain(engine, world, chain); if (ret) - ret = CRYPT_CheckSimpleChain(engine, chain, pTime); + CRYPT_CheckSimpleChain(engine, chain, pTime); } if (!ret) { diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index f713c1d..e6cdfd2 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1597,7 +1597,7 @@ static ChainCheck chainCheck[] = { { { 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 }, + 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
0
0
← Newer
1
...
70
71
72
73
74
75
76
...
79
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
Results per page:
10
25
50
100
200