December 2009 - Wine-commits

Henri Verbeet : wined3d: IWineD3DStateBlockImpl no longer implements IWineD3DBase.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: a389fe551e1ac44a1805eccffd3ba5a3679dbc10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a389fe551e1ac44a1805eccff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 17 19:14:36 2009 +0100 wined3d: IWineD3DStateBlockImpl no longer implements IWineD3DBase. --- dlls/wined3d/stateblock.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 7c47f36..7241e8a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -465,8 +465,8 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_QueryInterface(IWineD3DStateBlock IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; TRACE("(%p)->(%s,%p)\n",This,debugstr_guid(riid),ppobj); if (IsEqualGUID(riid, &IID_IUnknown) - || IsEqualGUID(riid, &IID_IWineD3DBase) - || IsEqualGUID(riid, &IID_IWineD3DStateBlock)){ + || IsEqualGUID(riid, &IID_IWineD3DStateBlock)) + { IUnknown_AddRef(iface); *ppobj = This; return S_OK;

1 0

Juan Lang : ole32: Fix a memory leak.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 776ee9ee818dbee9b639c31ab5ae736373b31c61 URL: http://source.winehq.org/git/wine.git/?a=commit;h=776ee9ee818dbee9b639c31ab… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 17 10:46:41 2009 -0800 ole32: Fix a memory leak. --- dlls/ole32/stg_prop.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 643848a..cd2395f 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -1406,6 +1406,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) idOffset->propid, &prop, This->codePage); } } + PropVariantClear(&prop); } } }

1 0

Luke Benstead : ddraw: Fix an incorrect refcount test.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 34e82e3dbdf2972ae3d7c23358b8e1eaa06e744e URL: http://source.winehq.org/git/wine.git/?a=commit;h=34e82e3dbdf2972ae3d7c2335… Author: Luke Benstead <kazade(a)gmail.com> Date: Thu Dec 17 19:00:44 2009 +0000 ddraw: Fix an incorrect refcount test. --- dlls/ddraw/tests/refcount.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/tests/refcount.c b/dlls/ddraw/tests/refcount.c index 9ad560b..c432f13 100644 --- a/dlls/ddraw/tests/refcount.c +++ b/dlls/ddraw/tests/refcount.c @@ -268,7 +268,7 @@ static void test_iface_refcnt(void) ok(ref == 2, "IDirectDraw7 reference count is %ld\n", ref); /* Can't get older d3d interfaces. WHY????? */ - hr = IDirectDraw7_QueryInterface(DDraw4, &IID_IDirect3D3, (void **) &D3D3); + hr = IDirectDraw7_QueryInterface(DDraw7, &IID_IDirect3D3, (void **) &D3D3); todo_wine ok(hr == E_NOINTERFACE, "IDirectDraw7_QueryInterface returned %08x\n", hr); if(hr == DD_OK && D3D3) IDirect3D3_Release(D3D3);

1 0

Juan Lang : crypt32: Check authority key identifer extension to determine if a certificate is self-signed .
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 048594854a4bbaa337ae3556ed5de4d5f3470a6a URL: http://source.winehq.org/git/wine.git/?a=commit;h=048594854a4bbaa337ae3556e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 17 08:52:19 2009 -0800 crypt32: Check authority key identifer extension to determine if a certificate is self-signed. --- dlls/crypt32/chain.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 111 insertions(+), 3 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 0d1a2f0..28a2206 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -230,10 +230,118 @@ typedef struct _CertificateChain LONG ref; } CertificateChain, *PCertificateChain; -static inline BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) +static BOOL CRYPT_IsCertificateSelfSigned(PCCERT_CONTEXT cert) { - return CertCompareCertificateName(cert->dwCertEncodingType, - &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); + PCERT_EXTENSION ext; + DWORD size; + BOOL ret; + + if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER2, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + { + CERT_AUTHORITY_KEY_ID2_INFO *info; + + ret = CryptDecodeObjectEx(cert->dwCertEncodingType, + X509_AUTHORITY_KEY_ID2, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &info, &size); + if (ret) + { + if (info->AuthorityCertIssuer.cAltEntry && + info->AuthorityCertSerialNumber.cbData) + { + PCERT_ALT_NAME_ENTRY directoryName = NULL; + DWORD i; + + for (i = 0; !directoryName && + i < info->AuthorityCertIssuer.cAltEntry; i++) + if (info->AuthorityCertIssuer.rgAltEntry[i].dwAltNameChoice + == CERT_ALT_NAME_DIRECTORY_NAME) + directoryName = + &info->AuthorityCertIssuer.rgAltEntry[i]; + if (directoryName) + { + ret = CertCompareCertificateName(cert->dwCertEncodingType, + &directoryName->u.DirectoryName, &cert->pCertInfo->Issuer) + && CertCompareIntegerBlob(&info->AuthorityCertSerialNumber, + &cert->pCertInfo->SerialNumber); + } + else + { + FIXME("no supported name type in authority key id2\n"); + ret = FALSE; + } + } + else if (info->KeyId.cbData) + { + ret = CertGetCertificateContextProperty(cert, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + if (ret && size == info->KeyId.cbData) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + CertGetCertificateContextProperty(cert, + CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); + ret = !memcmp(buf, info->KeyId.pbData, size); + CryptMemFree(buf); + } + } + else + ret = FALSE; + } + LocalFree(info); + } + } + else if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + { + CERT_AUTHORITY_KEY_ID_INFO *info; + + ret = CryptDecodeObjectEx(cert->dwCertEncodingType, + X509_AUTHORITY_KEY_ID, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &info, &size); + if (ret) + { + if (info->CertIssuer.cbData && info->CertSerialNumber.cbData) + { + ret = CertCompareCertificateName(cert->dwCertEncodingType, + &info->CertIssuer, &cert->pCertInfo->Issuer) && + CertCompareIntegerBlob(&info->CertSerialNumber, + &cert->pCertInfo->SerialNumber); + } + else if (info->KeyId.cbData) + { + ret = CertGetCertificateContextProperty(cert, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + if (ret && size == info->KeyId.cbData) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + CertGetCertificateContextProperty(cert, + CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); + ret = !memcmp(buf, info->KeyId.pbData, size); + CryptMemFree(buf); + } + else + ret = FALSE; + } + else + ret = FALSE; + } + else + ret = FALSE; + LocalFree(info); + } + } + else + ret = CertCompareCertificateName(cert->dwCertEncodingType, + &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); + return ret; } static void CRYPT_FreeChainElement(PCERT_CHAIN_ELEMENT element)

1 0

Juan Lang : wintrust: Check authority key identifer extension to determine if a certificate is self-signed .
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 2fbe80ad8936537c80685ba584b79e600f6b6085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fbe80ad8936537c80685ba58… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Dec 17 08:54:54 2009 -0800 wintrust: Check authority key identifer extension to determine if a certificate is self-signed. --- dlls/wintrust/wintrust_main.c | 111 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index c61f6e0..1c87b6e 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -77,11 +77,118 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) */ BOOL WINAPI TrustIsCertificateSelfSigned( PCCERT_CONTEXT cert ) { + PCERT_EXTENSION ext; + DWORD size; BOOL ret; TRACE("%p\n", cert); - ret = CertCompareCertificateName(cert->dwCertEncodingType, - &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); + if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER2, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + { + CERT_AUTHORITY_KEY_ID2_INFO *info; + + ret = CryptDecodeObjectEx(cert->dwCertEncodingType, + X509_AUTHORITY_KEY_ID2, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &info, &size); + if (ret) + { + if (info->AuthorityCertIssuer.cAltEntry && + info->AuthorityCertSerialNumber.cbData) + { + PCERT_ALT_NAME_ENTRY directoryName = NULL; + DWORD i; + + for (i = 0; !directoryName && + i < info->AuthorityCertIssuer.cAltEntry; i++) + if (info->AuthorityCertIssuer.rgAltEntry[i].dwAltNameChoice + == CERT_ALT_NAME_DIRECTORY_NAME) + directoryName = + &info->AuthorityCertIssuer.rgAltEntry[i]; + if (directoryName) + { + ret = CertCompareCertificateName(cert->dwCertEncodingType, + &directoryName->u.DirectoryName, &cert->pCertInfo->Issuer) + && CertCompareIntegerBlob(&info->AuthorityCertSerialNumber, + &cert->pCertInfo->SerialNumber); + } + else + { + FIXME("no supported name type in authority key id2\n"); + ret = FALSE; + } + } + else if (info->KeyId.cbData) + { + ret = CertGetCertificateContextProperty(cert, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + if (ret && size == info->KeyId.cbData) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + CertGetCertificateContextProperty(cert, + CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); + ret = !memcmp(buf, info->KeyId.pbData, size); + CryptMemFree(buf); + } + else + ret = FALSE; + } + else + ret = FALSE; + } + LocalFree(info); + } + } + else if ((ext = CertFindExtension(szOID_AUTHORITY_KEY_IDENTIFIER, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + { + CERT_AUTHORITY_KEY_ID_INFO *info; + + ret = CryptDecodeObjectEx(cert->dwCertEncodingType, + X509_AUTHORITY_KEY_ID, ext->Value.pbData, ext->Value.cbData, + CRYPT_DECODE_ALLOC_FLAG | CRYPT_DECODE_NOCOPY_FLAG, NULL, + &info, &size); + if (ret) + { + if (info->CertIssuer.cbData && info->CertSerialNumber.cbData) + { + ret = CertCompareCertificateName(cert->dwCertEncodingType, + &info->CertIssuer, &cert->pCertInfo->Issuer) && + CertCompareIntegerBlob(&info->CertSerialNumber, + &cert->pCertInfo->SerialNumber); + } + else if (info->KeyId.cbData) + { + ret = CertGetCertificateContextProperty(cert, + CERT_KEY_IDENTIFIER_PROP_ID, NULL, &size); + if (ret && size == info->KeyId.cbData) + { + LPBYTE buf = CryptMemAlloc(size); + + if (buf) + { + CertGetCertificateContextProperty(cert, + CERT_KEY_IDENTIFIER_PROP_ID, buf, &size); + ret = !memcmp(buf, info->KeyId.pbData, size); + CryptMemFree(buf); + } + else + ret = FALSE; + } + else + ret = FALSE; + } + else + ret = FALSE; + LocalFree(info); + } + } + else + ret = CertCompareCertificateName(cert->dwCertEncodingType, + &cert->pCertInfo->Subject, &cert->pCertInfo->Issuer); return ret; }

1 0

Henri Verbeet : ddraw: Don't depend on IWineD3DDevice_CreateSurface() not touching the surface parameter on failure.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: aa305c4a244837950e292459b8db42e3a3ea65dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa305c4a244837950e292459b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 17 19:14:32 2009 +0100 ddraw: Don't depend on IWineD3DDevice_CreateSurface() not touching the surface parameter on failure. The reason it actually fails is because of ddraw trying to create surface of type "SURFACE_UNKNOWN". Stefan should have a patch for that. --- dlls/ddraw/ddraw.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 46fd729..527f448 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -1655,9 +1655,11 @@ IDirectDrawImpl_RecreateSurfacesCallback(IDirectDrawSurface7 *surf, TRUE /* Lockable */, FALSE /* Discard */, surfImpl->mipmap_level, &surfImpl->WineD3DSurface, Usage, Pool, MultiSampleType, MultiSampleQuality, This->ImplType, Parent, &ddraw_null_wined3d_parent_ops); IUnknown_Release(Parent); - - if(hr != D3D_OK) + if (FAILED(hr)) + { + surfImpl->WineD3DSurface = wineD3DSurface; return hr; + } IWineD3DSurface_SetClipper(surfImpl->WineD3DSurface, clipper);

1 0

Henri Verbeet : wined3d: Don't touch "ppSurface" on failure in IWineD3DDeviceImpl_CreateSurface().
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 7fe3ab5a234893084724f2cd76885f8cffb3ba40 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe3ab5a234893084724f2cd7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 17 19:14:33 2009 +0100 wined3d: Don't touch "ppSurface" on failure in IWineD3DDeviceImpl_CreateSurface(). I originally kept these when adding surface_init() in 5f581975dcf83f4f32432137990c72c26b415e3b because the original code had them on most error paths. However, this actually broke ddraw because it assumed we don't touch "ppSurface" on errors. Just remove these since they're useless anyway. --- dlls/wined3d/device.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bedccb0..d09655d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -640,7 +640,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UI if (!object) { ERR("Failed to allocate surface memory.\n"); - *ppSurface = NULL; return WINED3DERR_OUTOFVIDEOMEMORY; } @@ -650,7 +649,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UI { WARN("Failed to initialize surface, returning %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); - *ppSurface = NULL; return hr; }

1 0

Henri Verbeet : wined3d: Add a function to destroy dummy textures.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 4c66141c996fcb5940c4ff27fcb40ed4d1d2f156 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c66141c996fcb5940c4ff27f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 17 19:14:34 2009 +0100 wined3d: Add a function to destroy dummy textures. The next patch uses this. --- dlls/wined3d/device.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d09655d..3dfc4e9 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1368,6 +1368,17 @@ static void create_dummy_textures(IWineD3DDeviceImpl *This) LEAVE_GL(); } +/* Context activation is done by the caller. */ +static void destroy_dummy_textures(IWineD3DDeviceImpl *device, const struct wined3d_gl_info *gl_info) +{ + ENTER_GL(); + glDeleteTextures(gl_info->limits.textures, device->dummyTextureName); + checkGLcall("glDeleteTextures(gl_info->limits.textures, device->dummyTextureName)"); + LEAVE_GL(); + + memset(device->dummyTextureName, 0, gl_info->limits.textures * sizeof(*device->dummyTextureName)); +} + static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPRESENT_PARAMETERS *pPresentationParameters) { @@ -6240,7 +6251,6 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_ IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *) swapchain_iface; const struct wined3d_gl_info *gl_info; struct wined3d_context *context; - UINT i; IWineD3DBaseShaderImpl *shader; context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); @@ -6267,16 +6277,7 @@ void delete_opengl_contexts(IWineD3DDevice *iface, IWineD3DSwapChain *swapchain_ This->blitter->free_private(iface); This->frag_pipe->free_private(iface); This->shader_backend->shader_free_private(iface); - - ENTER_GL(); - for (i = 0; i < This->adapter->gl_info.limits.textures; ++i) - { - /* Textures are recreated below */ - glDeleteTextures(1, &This->dummyTextureName[i]); - checkGLcall("glDeleteTextures(1, &This->dummyTextureName[i])"); - This->dummyTextureName[i] = 0; - } - LEAVE_GL(); + destroy_dummy_textures(This, gl_info); context_release(context);

1 0

Juan Lang : cryptnet: Use helper function to get a URL from a CRL distribution points extension.
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: f1f231ca40c0815ac130ed1ef1b6a58a7e2f2589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f231ca40c0815ac130ed1ef… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 17:07:47 2009 -0800 cryptnet: Use helper function to get a URL from a CRL distribution points extension. --- dlls/cryptnet/cryptnet_main.c | 187 +++++++++++++++++++++-------------------- 1 files changed, 97 insertions(+), 90 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index ef326f7..bf7a2ab 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -235,34 +235,65 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateIssuer(LPCSTR pszUrlOid, return ret; } -static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid, - LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, - PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved) +static BOOL CRYPT_GetUrlFromCRLDistPointsExt(const CRYPT_DATA_BLOB *value, + PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, PCRYPT_URL_INFO pUrlInfo, + DWORD *pcbUrlInfo) { - PCCERT_CONTEXT cert = pvPara; - PCERT_EXTENSION ext; - BOOL ret = FALSE; + BOOL ret; + CRL_DIST_POINTS_INFO *info; + DWORD size; - /* The only applicable flag is CRYPT_GET_URL_FROM_EXTENSION */ - if (dwFlags && !(dwFlags & CRYPT_GET_URL_FROM_EXTENSION)) - { - SetLastError(CRYPT_E_NOT_FOUND); - return FALSE; - } - if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, - cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CRL_DIST_POINTS, + value->pbData, value->cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, &info, &size); + if (ret) { - CRL_DIST_POINTS_INFO *info; - DWORD size; + DWORD i, cUrl, bytesNeeded = sizeof(CRYPT_URL_ARRAY); - ret = CryptDecodeObjectEx(X509_ASN_ENCODING, X509_CRL_DIST_POINTS, - ext->Value.pbData, ext->Value.cbData, CRYPT_DECODE_ALLOC_FLAG, NULL, - &info, &size); - if (ret) - { - DWORD i, cUrl, bytesNeeded = sizeof(CRYPT_URL_ARRAY); + for (i = 0, cUrl = 0; i < info->cDistPoint; i++) + if (info->rgDistPoint[i].DistPointName.dwDistPointNameChoice + == CRL_DIST_POINT_FULL_NAME) + { + DWORD j; + CERT_ALT_NAME_INFO *name = + &info->rgDistPoint[i].DistPointName.u.FullName; - for (i = 0, cUrl = 0; i < info->cDistPoint; i++) + for (j = 0; j < name->cAltEntry; j++) + if (name->rgAltEntry[j].dwAltNameChoice == + CERT_ALT_NAME_URL) + { + if (name->rgAltEntry[j].u.pwszURL) + { + cUrl++; + bytesNeeded += sizeof(LPWSTR) + + (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1) + * sizeof(WCHAR); + } + } + } + if (!pcbUrlArray) + { + SetLastError(E_INVALIDARG); + ret = FALSE; + } + else if (!pUrlArray) + *pcbUrlArray = bytesNeeded; + else if (*pcbUrlArray < bytesNeeded) + { + SetLastError(ERROR_MORE_DATA); + *pcbUrlArray = bytesNeeded; + ret = FALSE; + } + else + { + LPWSTR nextUrl; + + *pcbUrlArray = bytesNeeded; + pUrlArray->cUrl = 0; + pUrlArray->rgwszUrl = + (LPWSTR *)((BYTE *)pUrlArray + sizeof(CRYPT_URL_ARRAY)); + nextUrl = (LPWSTR)((BYTE *)pUrlArray + sizeof(CRYPT_URL_ARRAY) + + cUrl * sizeof(LPWSTR)); + for (i = 0; i < info->cDistPoint; i++) if (info->rgDistPoint[i].DistPointName.dwDistPointNameChoice == CRL_DIST_POINT_FULL_NAME) { @@ -276,83 +307,59 @@ static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid, { if (name->rgAltEntry[j].u.pwszURL) { - cUrl++; - bytesNeeded += sizeof(LPWSTR) + - (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1) - * sizeof(WCHAR); + lstrcpyW(nextUrl, + name->rgAltEntry[j].u.pwszURL); + pUrlArray->rgwszUrl[pUrlArray->cUrl++] = + nextUrl; + nextUrl += + (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1); } } } - if (!pcbUrlArray) - { - SetLastError(E_INVALIDARG); - ret = FALSE; - } - else if (!pUrlArray) - *pcbUrlArray = bytesNeeded; - else if (*pcbUrlArray < bytesNeeded) - { - SetLastError(ERROR_MORE_DATA); - *pcbUrlArray = bytesNeeded; - ret = FALSE; - } - else - { - LPWSTR nextUrl; - - *pcbUrlArray = bytesNeeded; - pUrlArray->cUrl = 0; - pUrlArray->rgwszUrl = - (LPWSTR *)((BYTE *)pUrlArray + sizeof(CRYPT_URL_ARRAY)); - nextUrl = (LPWSTR)((BYTE *)pUrlArray + sizeof(CRYPT_URL_ARRAY) - + cUrl * sizeof(LPWSTR)); - for (i = 0; i < info->cDistPoint; i++) - if (info->rgDistPoint[i].DistPointName.dwDistPointNameChoice - == CRL_DIST_POINT_FULL_NAME) - { - DWORD j; - CERT_ALT_NAME_INFO *name = - &info->rgDistPoint[i].DistPointName.u.FullName; - - for (j = 0; j < name->cAltEntry; j++) - if (name->rgAltEntry[j].dwAltNameChoice == - CERT_ALT_NAME_URL) - { - if (name->rgAltEntry[j].u.pwszURL) - { - lstrcpyW(nextUrl, - name->rgAltEntry[j].u.pwszURL); - pUrlArray->rgwszUrl[pUrlArray->cUrl++] = - nextUrl; - nextUrl += - (lstrlenW(name->rgAltEntry[j].u.pwszURL) + 1); - } - } - } - } - if (ret) + } + if (ret) + { + if (pcbUrlInfo) { - if (pcbUrlInfo) + FIXME("url info: stub\n"); + if (!pUrlInfo) + *pcbUrlInfo = sizeof(CRYPT_URL_INFO); + else if (*pcbUrlInfo < sizeof(CRYPT_URL_INFO)) { - FIXME("url info: stub\n"); - if (!pUrlInfo) - *pcbUrlInfo = sizeof(CRYPT_URL_INFO); - else if (*pcbUrlInfo < sizeof(CRYPT_URL_INFO)) - { - *pcbUrlInfo = sizeof(CRYPT_URL_INFO); - SetLastError(ERROR_MORE_DATA); - ret = FALSE; - } - else - { - *pcbUrlInfo = sizeof(CRYPT_URL_INFO); - memset(pUrlInfo, 0, sizeof(CRYPT_URL_INFO)); - } + *pcbUrlInfo = sizeof(CRYPT_URL_INFO); + SetLastError(ERROR_MORE_DATA); + ret = FALSE; + } + else + { + *pcbUrlInfo = sizeof(CRYPT_URL_INFO); + memset(pUrlInfo, 0, sizeof(CRYPT_URL_INFO)); } } - LocalFree(info); } + LocalFree(info); + } + return ret; +} + +static BOOL WINAPI CRYPT_GetUrlFromCertificateCRLDistPoint(LPCSTR pszUrlOid, + LPVOID pvPara, DWORD dwFlags, PCRYPT_URL_ARRAY pUrlArray, DWORD *pcbUrlArray, + PCRYPT_URL_INFO pUrlInfo, DWORD *pcbUrlInfo, LPVOID pvReserved) +{ + PCCERT_CONTEXT cert = pvPara; + PCERT_EXTENSION ext; + BOOL ret = FALSE; + + /* The only applicable flag is CRYPT_GET_URL_FROM_EXTENSION */ + if (dwFlags && !(dwFlags & CRYPT_GET_URL_FROM_EXTENSION)) + { + SetLastError(CRYPT_E_NOT_FOUND); + return FALSE; } + if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + ret = CRYPT_GetUrlFromCRLDistPointsExt(&ext->Value, pUrlArray, + pcbUrlArray, pUrlInfo, pcbUrlInfo); else SetLastError(CRYPT_E_NOT_FOUND); return ret;

1 0

Juan Lang : cryptnet: Use helper function to check revocation with a CRL distribution points extension .
by Alexandre Julliard 18 Dec '09

18 Dec '09

Module: wine Branch: master Commit: 7a987b77148c6d7e5674b06c794142daf881c1f2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a987b77148c6d7e5674b06c7… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Dec 2 17:28:49 2009 -0800 cryptnet: Use helper function to check revocation with a CRL distribution points extension. --- dlls/cryptnet/cryptnet_main.c | 154 ++++++++++++++++++++++------------------- 1 files changed, 83 insertions(+), 71 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index bf7a2ab..10863a2 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1578,20 +1578,97 @@ static DWORD verify_cert_revocation_with_crl(PCCERT_CONTEXT cert, return error; } -static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, +static DWORD verify_cert_revocation_from_dist_points_ext( + const CRYPT_DATA_BLOB *value, PCCERT_CONTEXT cert, DWORD index, FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, PCERT_REVOCATION_STATUS pRevStatus) { - BOOL ret; DWORD error = ERROR_SUCCESS, cbUrlArray; - ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, (void *)cert, - 0, NULL, &cbUrlArray, NULL, NULL, NULL); - if (!ret && GetLastError() == CRYPT_E_NOT_FOUND) + if (CRYPT_GetUrlFromCRLDistPointsExt(value, NULL, &cbUrlArray, NULL, NULL)) + { + CRYPT_URL_ARRAY *urlArray = CryptMemAlloc(cbUrlArray); + + if (urlArray) + { + DWORD j, retrievalFlags = 0, startTime, endTime, timeout; + BOOL ret; + + ret = CRYPT_GetUrlFromCRLDistPointsExt(value, urlArray, + &cbUrlArray, NULL, NULL); + if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) + retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; + if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG && + pRevPara && pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA, + dwUrlRetrievalTimeout) + sizeof(DWORD)) + { + startTime = GetTickCount(); + endTime = startTime + pRevPara->dwUrlRetrievalTimeout; + timeout = pRevPara->dwUrlRetrievalTimeout; + } + else + endTime = timeout = 0; + if (!ret) + error = GetLastError(); + for (j = 0; !error && j < urlArray->cUrl; j++) + { + PCCRL_CONTEXT crl; + + ret = CryptRetrieveObjectByUrlW(urlArray->rgwszUrl[j], + CONTEXT_OID_CRL, retrievalFlags, timeout, (void **)&crl, + NULL, NULL, NULL, NULL); + if (ret) + { + error = verify_cert_revocation_with_crl(cert, crl, index, + pTime, pRevStatus); + if (!error && timeout) + { + DWORD time = GetTickCount(); + + if ((int)(endTime - time) <= 0) + { + error = ERROR_TIMEOUT; + pRevStatus->dwIndex = index; + } + else + timeout = endTime - time; + } + CertFreeCRLContext(crl); + } + else + error = CRYPT_E_REVOCATION_OFFLINE; + } + CryptMemFree(urlArray); + } + else + { + error = ERROR_OUTOFMEMORY; + pRevStatus->dwIndex = index; + } + } + else + { + error = GetLastError(); + pRevStatus->dwIndex = index; + } + return error; +} + +static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, + FILETIME *pTime, DWORD dwFlags, PCERT_REVOCATION_PARA pRevPara, + PCERT_REVOCATION_STATUS pRevStatus) +{ + DWORD error = ERROR_SUCCESS; + PCERT_EXTENSION ext; + + if ((ext = CertFindExtension(szOID_CRL_DIST_POINTS, + cert->pCertInfo->cExtension, cert->pCertInfo->rgExtension))) + error = verify_cert_revocation_from_dist_points_ext(&ext->Value, cert, + index, pTime, dwFlags, pRevPara, pRevStatus); + else { if (pRevPara && pRevPara->hCrlStore && pRevPara->pIssuerCert) { - PCERT_EXTENSION ext; PCCRL_CONTEXT crl = NULL; BOOL canSignCRLs; @@ -1654,71 +1731,6 @@ static DWORD verify_cert_revocation(PCCERT_CONTEXT cert, DWORD index, pRevStatus->dwIndex = index; } } - else if (ret) - { - CRYPT_URL_ARRAY *urlArray = CryptMemAlloc(cbUrlArray); - - if (urlArray) - { - DWORD j, retrievalFlags = 0, startTime, endTime, timeout; - - ret = CryptGetObjectUrl(URL_OID_CERTIFICATE_CRL_DIST_POINT, - (void *)cert, 0, urlArray, &cbUrlArray, NULL, NULL, NULL); - if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) - retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; - if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG && - pRevPara && pRevPara->cbSize >= offsetof(CERT_REVOCATION_PARA, - dwUrlRetrievalTimeout) + sizeof(DWORD)) - { - startTime = GetTickCount(); - endTime = startTime + pRevPara->dwUrlRetrievalTimeout; - timeout = pRevPara->dwUrlRetrievalTimeout; - } - else - endTime = timeout = 0; - if (!ret) - error = GetLastError(); - for (j = 0; !error && j < urlArray->cUrl; j++) - { - PCCRL_CONTEXT crl; - - ret = CryptRetrieveObjectByUrlW(urlArray->rgwszUrl[j], - CONTEXT_OID_CRL, retrievalFlags, timeout, (void **)&crl, - NULL, NULL, NULL, NULL); - if (ret) - { - error = verify_cert_revocation_with_crl(cert, crl, index, - pTime, pRevStatus); - if (!error && timeout) - { - DWORD time = GetTickCount(); - - if ((int)(endTime - time) <= 0) - { - error = ERROR_TIMEOUT; - pRevStatus->dwIndex = index; - } - else - timeout = endTime - time; - } - CertFreeCRLContext(crl); - } - else - error = CRYPT_E_REVOCATION_OFFLINE; - } - CryptMemFree(urlArray); - } - else - { - error = ERROR_OUTOFMEMORY; - pRevStatus->dwIndex = index; - } - } - else - { - error = GetLastError(); - pRevStatus->dwIndex = index; - } return error; }

1 0