October 2010 - Wine-commits

Juan Lang : crypt32/tests: Add name to test to help identify test failures.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 8fbcad75babe646ff1a7535cb77631fd3318fa8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fbcad75babe646ff1a7535cb… Author: Juan Lang <juan.lang(a)gmail.com> Date: Wed Oct 6 10:21:16 2010 -0700 crypt32/tests: Add name to test to help identify test failures. --- dlls/crypt32/tests/chain.c | 70 +++++++++++++++++++++++-------------------- 1 files changed, 37 insertions(+), 33 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index ede6edb..24831b5 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -2655,62 +2655,64 @@ typedef struct _SimpleChainStatusCheck static void checkElementStatus(const CERT_TRUST_STATUS *expected, const CERT_TRUST_STATUS *got, const CERT_TRUST_STATUS *ignore, - DWORD todo, DWORD testIndex, DWORD chainIndex, DWORD elementIndex) + DWORD todo, LPCSTR testName, DWORD testIndex, DWORD chainIndex, + DWORD elementIndex) { if (got->dwErrorStatus == expected->dwErrorStatus) ok(got->dwErrorStatus == expected->dwErrorStatus, - "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + "%s[%d], element [%d,%d]: expected error %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); else if (todo & TODO_ERROR) todo_wine ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == (expected->dwErrorStatus & ~ignore->dwErrorStatus)), - "Chain %d, element [%d,%d]: expected error %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + "%s[%d], element [%d,%d]: expected error %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus); else ok(got->dwErrorStatus == expected->dwErrorStatus || broken((got->dwErrorStatus & ~ignore->dwErrorStatus) == (expected->dwErrorStatus & ~ignore->dwErrorStatus)), - "Chain %d, element [%d,%d]: expected error %08x, got %08x. %08x is " + "%s[%d], element [%d,%d]: expected error %08x, got %08x. %08x is " "expected if no valid Verisign root certificate is available.\n", - testIndex, chainIndex, elementIndex, expected->dwErrorStatus, + testName, testIndex, chainIndex, elementIndex, expected->dwErrorStatus, got->dwErrorStatus, CERT_TRUST_IS_UNTRUSTED_ROOT); if (got->dwInfoStatus == expected->dwInfoStatus) ok(got->dwInfoStatus == expected->dwInfoStatus, - "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + "%s[%d], element [%d,%d]: expected info %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); else if (todo & TODO_INFO) todo_wine ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == (expected->dwInfoStatus & ~ignore->dwInfoStatus)), - "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + "%s[%d], element [%d,%d]: expected info %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); else ok(got->dwInfoStatus == expected->dwInfoStatus || broken((got->dwInfoStatus & ~ignore->dwInfoStatus) == (expected->dwInfoStatus & ~ignore->dwInfoStatus)), - "Chain %d, element [%d,%d]: expected info %08x, got %08x\n", - testIndex, chainIndex, elementIndex, expected->dwInfoStatus, + "%s[%d], element [%d,%d]: expected info %08x, got %08x\n", + testName, testIndex, chainIndex, elementIndex, expected->dwInfoStatus, got->dwInfoStatus); } static void checkSimpleChainStatus(const CERT_SIMPLE_CHAIN *simpleChain, const SimpleChainStatusCheck *simpleChainStatus, - const CERT_TRUST_STATUS *ignore, DWORD todo, DWORD testIndex, DWORD chainIndex) + const CERT_TRUST_STATUS *ignore, DWORD todo, LPCSTR testName, DWORD testIndex, + DWORD chainIndex) { if (todo & TODO_ELEMENTS) todo_wine ok(simpleChain->cElement == simpleChainStatus->cElement, - "Chain %d: expected %d elements, got %d\n", testIndex, + "%s[%d]: expected %d elements, got %d\n", testName, testIndex, simpleChainStatus->cElement, simpleChain->cElement); else ok(simpleChain->cElement == simpleChainStatus->cElement, - "Chain %d: expected %d elements, got %d\n", testIndex, + "%s[%d]: expected %d elements, got %d\n", testName, testIndex, simpleChainStatus->cElement, simpleChain->cElement); if (simpleChain->cElement == simpleChainStatus->cElement) { @@ -2718,8 +2720,8 @@ static void checkSimpleChainStatus(const CERT_SIMPLE_CHAIN *simpleChain, for (i = 0; i < simpleChain->cElement; i++) checkElementStatus(&simpleChainStatus->rgElementStatus[i], - &simpleChain->rgpElement[i]->TrustStatus, ignore, todo, testIndex, - chainIndex, i); + &simpleChain->rgpElement[i]->TrustStatus, ignore, todo, testName, + testIndex, chainIndex, i); } } @@ -2732,10 +2734,11 @@ typedef struct _ChainStatusCheck } ChainStatusCheck; static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, - const ChainStatusCheck *chainStatus, DWORD todo, DWORD testIndex) + const ChainStatusCheck *chainStatus, DWORD todo, LPCSTR testName, + DWORD testIndex) { ok(chain->cChain == chainStatus->cChain, - "Chain %d: expected %d simple chains, got %d\n", testIndex, + "%s[%d]: expected %d simple chains, got %d\n", testName, testIndex, chainStatus->cChain, chain->cChain); if (todo & TODO_ERROR && chain->TrustStatus.dwErrorStatus != chainStatus->status.dwErrorStatus) @@ -2745,8 +2748,8 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, ~chainStatus->statusToIgnore.dwErrorStatus) == (chainStatus->status.dwErrorStatus & ~chainStatus->statusToIgnore.dwErrorStatus)), - "Chain %d: expected error %08x, got %08x\n", - testIndex, chainStatus->status.dwErrorStatus, + "%s[%d]: expected error %08x, got %08x\n", + testName, testIndex, chainStatus->status.dwErrorStatus, chain->TrustStatus.dwErrorStatus); else ok(chain->TrustStatus.dwErrorStatus == @@ -2755,9 +2758,9 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, ~chainStatus->statusToIgnore.dwErrorStatus) == (chainStatus->status.dwErrorStatus & ~chainStatus->statusToIgnore.dwErrorStatus)), - "Chain %d: expected error %08x, got %08x. %08x is expected if no valid " + "%s[%d]: expected error %08x, got %08x. %08x is expected if no valid " "Verisign root certificate is available.\n", - testIndex, chainStatus->status.dwErrorStatus, + testName, testIndex, chainStatus->status.dwErrorStatus, chain->TrustStatus.dwErrorStatus, CERT_TRUST_IS_UNTRUSTED_ROOT); if (todo & TODO_INFO && chain->TrustStatus.dwInfoStatus != chainStatus->status.dwInfoStatus) @@ -2767,8 +2770,8 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, ~chainStatus->statusToIgnore.dwInfoStatus) == (chainStatus->status.dwInfoStatus & ~chainStatus->statusToIgnore.dwInfoStatus)), - "Chain %d: expected info %08x, got %08x\n", - testIndex, chainStatus->status.dwInfoStatus, + "%s[%d]: expected info %08x, got %08x\n", + testName, testIndex, chainStatus->status.dwInfoStatus, chain->TrustStatus.dwInfoStatus); else ok(chain->TrustStatus.dwInfoStatus == @@ -2777,8 +2780,8 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, ~chainStatus->statusToIgnore.dwInfoStatus) == (chainStatus->status.dwInfoStatus & ~chainStatus->statusToIgnore.dwInfoStatus)), - "Chain %d: expected info %08x, got %08x\n", - testIndex, chainStatus->status.dwInfoStatus, + "%s[%d]: expected info %08x, got %08x\n", + testName, testIndex, chainStatus->status.dwInfoStatus, chain->TrustStatus.dwInfoStatus); if (chain->cChain == chainStatus->cChain) { @@ -2787,7 +2790,7 @@ static void checkChainStatus(PCCERT_CHAIN_CONTEXT chain, for (i = 0; i < chain->cChain; i++) checkSimpleChainStatus(chain->rgpChain[i], &chainStatus->rgChainStatus[i], &chainStatus->statusToIgnore, - todo, testIndex, i); + todo, testName, testIndex, i); } } @@ -3712,7 +3715,7 @@ static void testGetCertChain(void) if (chain) { checkChainStatus(chain, &chainCheck[i].status, chainCheck[i].todo, - i); + "chainCheck", i); pCertFreeCertificateChain(chain); } } @@ -3724,7 +3727,7 @@ static void testGetCertChain(void) if (chain) { checkChainStatus(chain, &chainCheckNoStore[i].status, - chainCheckNoStore[i].todo, i); + chainCheckNoStore[i].todo, "chainCheckNoStore", i); pCertFreeCertificateChain(chain); } } @@ -3743,10 +3746,11 @@ static void testGetCertChain(void) if (chainCheckEmbeddedNull.status.status.dwErrorStatus == chain->TrustStatus.dwErrorStatus) checkChainStatus(chain, &chainCheckEmbeddedNull.status, - chainCheckEmbeddedNull.todo, 0); + chainCheckEmbeddedNull.todo, "chainCheckEmbeddedNull", 0); else checkChainStatus(chain, &chainCheckEmbeddedNullBroken.status, - chainCheckEmbeddedNullBroken.todo, 0); + chainCheckEmbeddedNullBroken.todo, "chainCheckEmbeddedNullBroken", + 0); pCertFreeCertificateChain(chain); } }

1 0

Austin Lund : riched20/tests: Plug a few memory leaks and make failure messages more meaningful.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: d08fc667327da4eae2427adfcffb3cbdca3f234c URL: http://source.winehq.org/git/wine.git/?a=commit;h=d08fc667327da4eae2427adfc… Author: Austin Lund <austin.lund(a)gmail.com> Date: Wed Oct 6 12:29:29 2010 +1000 riched20/tests: Plug a few memory leaks and make failure messages more meaningful. --- dlls/riched20/tests/txtsrv.c | 53 +++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 23 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 8da111d..894ff92 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -612,7 +612,7 @@ static BOOL init_texthost(void) ITextServices object. */ pCreateTextServices = (void*)GetProcAddress(hmoduleRichEdit, "CreateTextServices"); result = (*pCreateTextServices)(NULL,(ITextHost*)dummyTextHost, &init); - ok(result == S_OK, "Did not return OK when created. Returned %x\n", result); + ok(result == S_OK, "Did not return S_OK when created (result = %x)\n", result); if (result != S_OK) { CoTaskMemFree(dummyTextHost); skip("CreateTextServices failed.\n"); @@ -621,7 +621,7 @@ static BOOL init_texthost(void) result = IUnknown_QueryInterface(init, &IID_ITextServices, (void **)&txtserv); - ok((result == S_OK) && (txtserv != NULL), "Querying interface failed\n"); + ok((result == S_OK) && (txtserv != NULL), "Querying interface failed (result = %x, txtserv = %p)\n", result, txtserv); IUnknown_Release(init); if (!((result == S_OK) && (txtserv != NULL))) { CoTaskMemFree(dummyTextHost); @@ -632,6 +632,12 @@ static BOOL init_texthost(void) return TRUE; } +static void free_texthost(void) +{ + IUnknown_Release(txtserv); + CoTaskMemFree(dummyTextHost); +} + static void test_TxGetText(void) { HRESULT hres; @@ -641,10 +647,9 @@ static void test_TxGetText(void) return; hres = ITextServices_TxGetText(txtserv, &rettext); - ok(hres == S_OK, "ITextServices_TxGetText failed\n"); + ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); - IUnknown_Release(txtserv); - CoTaskMemFree(dummyTextHost); + free_texthost(); } static void test_TxSetText(void) @@ -657,19 +662,18 @@ static void test_TxSetText(void) return; hres = ITextServices_TxSetText(txtserv, settext); - ok(hres == S_OK, "ITextServices_TxSetText failed\n"); + ok(hres == S_OK, "ITextServices_TxSetText failed (result = %x)\n", hres); hres = ITextServices_TxGetText(txtserv, &rettext); - ok(hres == S_OK, "ITextServices_TxGetText failed\n"); + ok(hres == S_OK, "ITextServices_TxGetText failed (result = %x)\n", hres); ok(SysStringLen(rettext) == 4, - "String returned of wrong length\n"); + "String returned of wrong length (expected 4, got %d)\n", SysStringLen(rettext)); ok(memcmp(rettext,settext,SysStringByteLen(rettext)) == 0, "String returned differs\n"); SysFreeString(rettext); - IUnknown_Release(txtserv); - CoTaskMemFree(dummyTextHost); + free_texthost(); } static void test_TxGetNaturalSize(void) { @@ -708,9 +712,7 @@ static void test_TxGetNaturalSize(void) { ret = GetCharWidth32(hdcDraw,'A','Z',charwidth_caps_text); if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) { win_skip("GetCharWidth32 is not available\n"); - RestoreDC(hdcDraw,1); - ReleaseDC(NULL,hdcDraw); - return; + goto cleanup; } /* Make measurements in MM_TEXT */ @@ -718,13 +720,21 @@ static void test_TxGetNaturalSize(void) { xdim = 0; ydim = 0; result = ITextServices_TxSetText(txtserv, oneA); - ok(result == S_OK, "ITextServices_TxSetText failed\n"); + ok(result == S_OK, "ITextServices_TxSetText failed (result = %x)\n", result); + if (result != S_OK) { + skip("Could not set text\n"); + goto cleanup; + } result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, TXTNS_FITTOCONTENT, &psizelExtent, &xdim, &ydim); - todo_wine ok(result == S_OK, "TxGetNaturalSize failed\n"); + todo_wine ok(result == S_OK, "TxGetNaturalSize failed (result = %x)\n", result); + if (result != S_OK) { + skip("TxGetNaturalSize measurements failed\n"); + goto cleanup; + } todo_wine ok(ydim == tmInfo_text.tmHeight, "Height calculated incorrectly (expected %d, got %d)\n", tmInfo_text.tmHeight, ydim); @@ -733,11 +743,10 @@ static void test_TxGetNaturalSize(void) { "Width calculated incorrectly (expected %d {+1}, got %d)\n", charwidth_caps_text[0], xdim); +cleanup: RestoreDC(hdcDraw,1); ReleaseDC(NULL,hdcDraw); - - IUnknown_Release(txtserv); - CoTaskMemFree(dummyTextHost); + free_texthost(); } static void test_TxDraw(void) @@ -757,11 +766,10 @@ static void test_TxDraw(void) result = ITextServices_TxDraw(txtserv, dwAspect, 0, pvAspect, ptd, tmphdc, hicTargetDev, &client, NULL, NULL, NULL, 0, 0); - ok(result == S_OK, "TxDraw failed\n"); + ok(result == S_OK, "TxDraw failed (result = %x)\n", result); } - IUnknown_Release(txtserv); - CoTaskMemFree(dummyTextHost); + free_texthost(); } @@ -776,8 +784,7 @@ START_TEST( txtsrv ) if (init_texthost()) { - IUnknown_Release(txtserv); - CoTaskMemFree(dummyTextHost); + free_texthost(); test_TxGetText(); test_TxSetText();

1 0

Dmitry Timoshkov : kernel32: Truncate the reported by GlobalMemoryStatus() memory limits for Win9x versions too.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 83bfa7636ee7457806b389e5626066c6ac435488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83bfa7636ee7457806b389e56… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Oct 6 19:05:01 2010 +0900 kernel32: Truncate the reported by GlobalMemoryStatus() memory limits for Win9x versions too. --- dlls/kernel32/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index e20f8fb..7be9172 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -1325,7 +1325,7 @@ VOID WINAPI GlobalMemoryStatus( LPMEMORYSTATUS lpBuffer ) osver.dwOSVersionInfoSize = sizeof(osver); GetVersionExW(&osver); - if ( osver.dwMajorVersion >= 5 ) + if ( osver.dwMajorVersion >= 5 || osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS ) { lpBuffer->dwTotalPhys = min( memstatus.ullTotalPhys, MAXDWORD ); lpBuffer->dwAvailPhys = min( memstatus.ullAvailPhys, MAXDWORD );

1 0

Juan Lang : crypt32/tests: Test invalid critical extension in intermediate cert.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: ab1a3ccede34862ff397861359213fdda7368f88 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab1a3ccede34862ff39786135… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 5 14:52:24 2010 -0700 crypt32/tests: Test invalid critical extension in intermediate cert. --- dlls/crypt32/tests/chain.c | 95 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 94 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 9fe24b6..9d90ba3 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1274,7 +1274,7 @@ static const BYTE chain5_1[] = { * A chain whose end certificate is a CA. */ /* chain0_0 -> chain 7_1: - * A chain with a bad critical extension. + * A chain whose end cert has a bad critical extension. */ static const BYTE chain7_1[] = { 0x30,0x82,0x01,0x93,0x30,0x81,0xfd,0xa0,0x03,0x02,0x01,0x02,0x02,0x01,0x01, @@ -2504,6 +2504,70 @@ static const BYTE chain29_1[] = { 0x3a,0xe9,0x27,0xa4,0x57,0x27,0x34,0xa7,0x42,0xde,0x78,0x1a,0x71,0x80,0x23, 0xd6,0xd7,0x22,0xf0,0x24,0x0d,0x71,0xf1,0x2b,0xd0,0xd8,0x76,0x3d,0xef,0x4c, 0xce,0x1c,0x3b,0x83,0x1b,0x63,0x10,0x6c,0x63,0xe5,0x69 }; +/* chain0_0 -> chain30_1 -> chain30_2 + * A chain whose intermediate certificate has an unsupported critical + * extension. + */ +static const BYTE chain30_1[] = { +0x30,0x82,0x01,0xc0,0x30,0x82,0x01,0x2b,0xa0,0x03,0x02,0x01,0x02,0x02,0x01, +0x01,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,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,0x35,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x17,0x0d,0x30,0x37,0x31,0x30,0x30,0x31,0x30,0x30,0x30, +0x30,0x30,0x30,0x5a,0x30,0x10,0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03, +0x13,0x05,0x43,0x65,0x72,0x74,0x32,0x30,0x81,0x9d,0x30,0x0b,0x06,0x09,0x2a, +0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x03,0x81,0x8d,0x00,0x30,0x81,0x89, +0x02,0x81,0x81,0x00,0xb8,0x52,0xda,0xc5,0x4b,0x3f,0xe5,0x33,0x0e,0x67,0x5f, +0x48,0x21,0xdc,0x7e,0xef,0x37,0x33,0xba,0xff,0xb4,0xc6,0xdc,0xb6,0x17,0x8e, +0x20,0x55,0x07,0x12,0xd2,0x7b,0x3c,0xce,0x30,0xc5,0xa7,0x48,0x9f,0x6e,0xfe, +0xb8,0xbe,0xdb,0x9f,0x9b,0x17,0x60,0x16,0xde,0xc6,0x8b,0x47,0xd1,0x57,0x71, +0x3c,0x93,0xfc,0xbd,0xec,0x44,0x32,0x3b,0xb9,0xcf,0x6b,0x05,0x72,0xa7,0x87, +0x8e,0x7e,0xd4,0x9a,0x87,0x1c,0x2f,0xb7,0x82,0x40,0xfc,0x6a,0x80,0x83,0x68, +0x28,0xce,0x84,0xf4,0x0b,0x2e,0x44,0xcb,0x53,0xac,0x85,0x85,0xb5,0x46,0x36, +0x98,0x3c,0x10,0x02,0xaa,0x02,0xbc,0x8b,0xa2,0x23,0xb2,0xd3,0x51,0x9a,0x22, +0x4a,0xe3,0xaa,0x4e,0x7c,0xda,0x38,0xcf,0x49,0x98,0x72,0xa3,0x02,0x03,0x01, +0x00,0x01,0xa3,0x30,0x30,0x2e,0x30,0x0e,0x06,0x03,0x55,0x1d,0x0f,0x01,0x01, +0xff,0x04,0x04,0x03,0x02,0x00,0x04,0x30,0x0f,0x06,0x03,0x55,0x1d,0x13,0x01, +0x01,0xff,0x04,0x05,0x30,0x03,0x01,0x01,0xff,0x30,0x0b,0x06,0x02,0x2a,0x03, +0x01,0x01,0xff,0x04,0x02,0x30,0x00,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86, +0xf7,0x0d,0x01,0x01,0x05,0x03,0x81,0x81,0x00,0x51,0x3e,0x35,0x1b,0x66,0x3c, +0xca,0x5e,0xf3,0xf9,0x1b,0xd5,0x03,0x13,0xf8,0xcf,0x87,0xdf,0xed,0x75,0xa6, +0xcd,0x4b,0x1c,0x15,0xd3,0xd8,0x58,0x85,0x85,0x2c,0x64,0x31,0xbd,0xbb,0xad, +0xff,0x38,0x64,0xc5,0x16,0x43,0x14,0x0e,0x71,0x35,0xf3,0xe9,0xca,0xf9,0xf4, +0x69,0xa7,0x67,0xa8,0x0f,0xc9,0xcf,0x6f,0x22,0xe5,0x39,0xb8,0xfc,0xe7,0x50, +0x82,0xf7,0xa4,0xaa,0x29,0xe1,0xa9,0xb5,0x03,0x5e,0x0b,0x5f,0x9c,0x8e,0x29, +0x64,0xe5,0xb6,0xed,0xde,0x04,0x0e,0xdb,0xad,0xa3,0xc6,0x2a,0xb0,0x12,0x86, +0x60,0xd4,0xff,0xd8,0xea,0x85,0x54,0x34,0xca,0xc1,0x85,0x4e,0xb5,0x15,0x96, +0xb7,0xa5,0x64,0x7b,0xc7,0x76,0xcb,0x04,0x75,0x9e,0x1e,0xbd,0x62,0x79,0xc5, +0x1f,0x32 }; +static const BYTE chain30_2[] = { +0x30,0x82,0x01,0x8d,0x30,0x81,0xf9,0xa0,0x03,0x02,0x01,0x02,0x02,0x01,0x01, +0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x30,0x10, +0x31,0x0e,0x30,0x0c,0x06,0x03,0x55,0x04,0x03,0x13,0x05,0x43,0x65,0x72,0x74, +0x32,0x30,0x1e,0x17,0x0d,0x30,0x37,0x30,0x39,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,0x33,0x30,0x81,0x9d,0x30,0x0b,0x06,0x09,0x2a,0x86, +0x48,0x86,0xf7,0x0d,0x01,0x01,0x01,0x03,0x81,0x8d,0x00,0x30,0x81,0x89,0x02, +0x81,0x81,0x00,0xc3,0x31,0x35,0xc3,0x9d,0x8a,0x87,0x20,0xc6,0x32,0xe9,0xb1, +0xf6,0x8f,0xf9,0x05,0x73,0x1d,0xa7,0xde,0xab,0x15,0x8a,0x9c,0x7f,0x11,0x7e, +0x77,0xa0,0x42,0x80,0xf4,0x79,0xda,0x98,0x7b,0x00,0xfa,0x8f,0x0c,0xd0,0xeb, +0x8a,0x80,0xed,0x07,0xfc,0x64,0x71,0x03,0xc1,0xd6,0x2f,0x9b,0xde,0x42,0x63, +0xd9,0x79,0xea,0xdd,0x10,0xe8,0x68,0xc8,0x69,0x4f,0x4a,0x39,0x23,0x87,0xca, +0xd1,0xc9,0x77,0x14,0x30,0x85,0x9e,0xf7,0x79,0xf9,0x07,0xb7,0x7c,0x55,0xcb, +0xa7,0xd5,0xb8,0x44,0xb5,0x20,0xb5,0x01,0x5c,0xa2,0xd1,0xd5,0xad,0x0f,0x87, +0xaf,0x37,0xd1,0x39,0x0c,0x0d,0xd5,0xde,0x26,0x7a,0xed,0xf9,0x2a,0xb1,0x60, +0x65,0x2d,0x08,0x24,0x51,0x1d,0xb0,0x0a,0xb5,0x13,0xc7,0x02,0x03,0x01,0x00, +0x01,0x30,0x0b,0x06,0x09,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x01,0x01,0x05,0x03, +0x81,0x81,0x00,0x14,0x75,0x85,0xcc,0x68,0xfe,0x98,0x6f,0xf6,0x67,0x00,0x5b, +0x0c,0xfc,0x36,0x18,0xf4,0x56,0x46,0x7c,0xb9,0xfa,0x6c,0xe6,0x37,0xaf,0x69, +0x37,0x93,0x8c,0x35,0x3a,0x1b,0x58,0x2f,0xe2,0x06,0x39,0x85,0x3f,0x73,0xcf, +0xe1,0x3f,0x27,0x19,0x60,0xc3,0x1b,0xf6,0x69,0x3b,0x8e,0x57,0x7b,0xd8,0xb9, +0xc6,0x9f,0x13,0x72,0x22,0x04,0x8f,0x5c,0x54,0x13,0x8c,0x63,0xe3,0x6b,0x70, +0x98,0xec,0xcc,0xe1,0x93,0xb1,0x4b,0x30,0x4c,0xde,0xe8,0x3c,0x68,0x38,0x44, +0x5e,0xe2,0x2b,0xf5,0xa1,0xee,0x02,0x7e,0x09,0x15,0xff,0xc9,0xf6,0xaf,0xf5, +0xcc,0xeb,0xfc,0xe7,0x3c,0x92,0xdb,0x31,0xab,0x1e,0xb8,0x9e,0xf0,0x5e,0xa3, +0x93,0xfe,0xab,0x26,0x7b,0x01,0xa8,0x98,0x88,0xbb,0xee }; typedef struct _CONST_DATA_BLOB { @@ -3113,6 +3177,21 @@ static const CERT_TRUST_STATUS elementStatus29[] = { static const SimpleChainStatusCheck simpleStatus29[] = { { sizeof(elementStatus29) / sizeof(elementStatus29[0]), elementStatus29 }, }; +static CONST_DATA_BLOB chain30[] = { + { sizeof(chain0_0), chain0_0 }, + { sizeof(chain30_1), chain30_1 }, + { sizeof(chain30_2), chain30_2 }, +}; +static const CERT_TRUST_STATUS elementStatus30[] = { + { CERT_TRUST_NO_ERROR, CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT, + CERT_TRUST_HAS_NAME_MATCH_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT, + CERT_TRUST_IS_SELF_SIGNED | CERT_TRUST_HAS_NAME_MATCH_ISSUER }, +}; +static const SimpleChainStatusCheck simpleStatus30[] = { + { sizeof(elementStatus30) / sizeof(elementStatus30[0]), elementStatus30 }, +}; static CONST_DATA_BLOB selfSignedChain[] = { { sizeof(selfSignedCert), selfSignedCert } }; @@ -3399,6 +3478,20 @@ static ChainCheck chainCheck[] = { 1, simpleStatus28 }, 0 }, /* chain29 is handled separately elsewhere */ + /* Microsoft incorrectly ignores unknown/unsupported critical extensions on + * older Windows versions, so ignore the error on Windows. + */ + { { sizeof(chain30) / sizeof(chain30[0]), chain30 }, + { { CERT_TRUST_IS_NOT_TIME_NESTED | CERT_TRUST_IS_NOT_VALID_FOR_USAGE | + CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT | + CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT | + CERT_TRUST_INVALID_EXTENSION | + CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT, + CERT_TRUST_HAS_PREFERRED_ISSUER }, + { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_INVALID_EXTENSION | + CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT, 0 }, + 1, simpleStatus30 }, + TODO_ERROR }, { { 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/tests: Test the base and SSL policies against a certificate with an invalid critical extension .
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: d5bcf21c9100898c30e77ece81a27d3f70db77d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5bcf21c9100898c30e77ece8… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 5 21:12:50 2010 -0700 crypt32/tests: Test the base and SSL policies against a certificate with an invalid critical extension. --- dlls/crypt32/tests/chain.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 9d90ba3..c31fb30 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3962,6 +3962,11 @@ static const ChainPolicyCheck stanfordPolicyCheckWithoutMatchingName = { { 0, CERT_E_CN_NO_MATCH, 0, 0, NULL}, NULL, 0 }; +static const ChainPolicyCheck invalidExtensionPolicyCheck = { + { sizeof(chain30) / sizeof(chain30[0]), chain30 }, + { 0, CERT_E_CRITICAL, 0, 1, NULL}, NULL, TODO_ERROR +}; + static const ChainPolicyCheck authenticodePolicyCheck[] = { { { sizeof(chain0) / sizeof(chain0[0]), chain0 }, { 0, CERT_E_UNTRUSTEDROOT, 0, 1, NULL }, NULL, 0 }, @@ -4190,6 +4195,12 @@ static void check_base_policy(void) CERT_CHAIN_POLICY_IGNORE_NOT_TIME_VALID_FLAG; checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, &invalidUsageBasePolicyCheck, 0, &oct2007, &policyPara); + /* Test chain30, which has an invalid critical extension in an intermediate + * cert, against the base policy. + */ + policyPara.dwFlags = CERT_CHAIN_POLICY_ALLOW_UNKNOWN_CA_FLAG; + checkChainPolicyStatus(CERT_CHAIN_POLICY_BASE, NULL, + &invalidExtensionPolicyCheck, 0, &oct2007, &policyPara); } static void check_ssl_policy(void) @@ -4377,6 +4388,13 @@ static void check_ssl_policy(void) &winehqPolicyCheckWithMatchingName, 0, &oct2007, &policyPara); CertFreeCertificateChainEngine(engine); CertCloseStore(testRoot, 0); + /* Test chain30, which has an invalid critical extension in an intermediate + * cert, against the SSL policy. + */ + sslPolicyPara.fdwChecks = SECURITY_FLAG_IGNORE_UNKNOWN_CA; + sslPolicyPara.pwszServerName = NULL; + checkChainPolicyStatus(CERT_CHAIN_POLICY_SSL, NULL, + &invalidExtensionPolicyCheck, 0, &oct2007, &policyPara); } static void testVerifyCertChainPolicy(void)

1 0

Juan Lang : crypt32: Set CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT when appropriate.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: b1899c2066562309b039559108080a06bb51a089 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1899c2066562309b03955910… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 5 19:09:36 2010 -0700 crypt32: Set CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT when appropriate. --- dlls/crypt32/chain.c | 3 ++- dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index 266e6ab..ffb5fb4 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1971,7 +1971,8 @@ static void CRYPT_CheckSimpleChain(PCertificateChainEngine engine, if (!CRYPT_CriticalExtensionsSupported( chain->rgpElement[i]->pCertContext)) chain->rgpElement[i]->TrustStatus.dwErrorStatus |= - CERT_TRUST_INVALID_EXTENSION; + CERT_TRUST_INVALID_EXTENSION | + CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT; CRYPT_CombineTrustStatus(&chain->TrustStatus, &chain->rgpElement[i]->TrustStatus); } diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index c31fb30..4e5861a 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3491,7 +3491,7 @@ static ChainCheck chainCheck[] = { { CERT_TRUST_IS_UNTRUSTED_ROOT | CERT_TRUST_INVALID_EXTENSION | CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT, 0 }, 1, simpleStatus30 }, - TODO_ERROR }, + 0 }, { { 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/tests: Add name to test to help identify test failures.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 6ff8184e1500f06cd6ce76130b484d3e8b284c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ff8184e1500f06cd6ce76130… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 5 20:47:37 2010 -0700 crypt32/tests: Add name to test to help identify test failures. --- dlls/crypt32/tests/chain.c | 145 ++++++++++++++++++++++++++----------------- 1 files changed, 88 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ff8184e1500f06cd6ce7…

1 0

Juan Lang : crypt32/tests: Add macros to declare tests.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 5b79eb977b867ccf3d2819e2e1c992a146ecb6ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b79eb977b867ccf3d2819e2e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 5 21:23:27 2010 -0700 crypt32/tests: Add macros to declare tests. --- dlls/crypt32/tests/chain.c | 205 ++++++++++++++++++-------------------------- 1 files changed, 82 insertions(+), 123 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5b79eb977b867ccf3d281…

1 0

Juan Lang : crypt32: Set correct error when encountering unsupported critical extensions in the base and SSL policy .
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: 25a8d301c10bd1c4cc80af04cd2abbd79f4d11a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25a8d301c10bd1c4cc80af04c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Tue Oct 5 21:25:33 2010 -0700 crypt32: Set correct error when encountering unsupported critical extensions in the base and SSL policy. --- dlls/crypt32/chain.c | 18 ++++++++++++++++++ dlls/crypt32/tests/chain.c | 2 +- 2 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ffb5fb4..056838b 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -2954,6 +2954,16 @@ static BOOL WINAPI verify_base_policy(LPCSTR szPolicyOID, CERT_TRUST_IS_NOT_VALID_FOR_USAGE, &pPolicyStatus->lChainIndex, &pPolicyStatus->lElementIndex); } + if (!pPolicyStatus->dwError && + pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT && + !(checks & CERT_CHAIN_POLICY_IGNORE_NOT_SUPPORTED_CRITICAL_EXT_FLAG)) + { + pPolicyStatus->dwError = CERT_E_CRITICAL; + find_element_with_error(pChainContext, + CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } return TRUE; } @@ -3377,6 +3387,14 @@ static BOOL WINAPI verify_ssl_policy(LPCSTR szPolicyOID, CERT_TRUST_IS_OFFLINE_REVOCATION, &pPolicyStatus->lChainIndex, &pPolicyStatus->lElementIndex); } + else if (pChainContext->TrustStatus.dwErrorStatus & + CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT) + { + pPolicyStatus->dwError = CERT_E_CRITICAL; + find_element_with_error(pChainContext, + CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT, &pPolicyStatus->lChainIndex, + &pPolicyStatus->lElementIndex); + } else pPolicyStatus->dwError = NO_ERROR; /* We only need bother checking whether the name in the end certificate diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index 5a2b17e..b6a01bf 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -3964,7 +3964,7 @@ static const ChainPolicyCheck stanfordPolicyCheckWithoutMatchingName = { static const ChainPolicyCheck invalidExtensionPolicyCheck = { { sizeof(chain30) / sizeof(chain30[0]), chain30 }, - { 0, CERT_E_CRITICAL, 0, 1, NULL}, NULL, TODO_ERROR + { 0, CERT_E_CRITICAL, 0, 1, NULL}, NULL, 0 }; static const ChainPolicyCheck authenticodePolicyCheck[] = {

1 0

Hans Leidekker : advapi32: Fix a buffer size query in LsaLookupSids.
by Alexandre Julliard 06 Oct '10

06 Oct '10

Module: wine Branch: master Commit: ee18ead5457761c2a330d0005bb5bf1b8711ca80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee18ead5457761c2a330d0005… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 6 15:45:30 2010 +0200 advapi32: Fix a buffer size query in LsaLookupSids. --- dlls/advapi32/lsa.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/advapi32/lsa.c b/dlls/advapi32/lsa.c index e12e312..863ddb2 100644 --- a/dlls/advapi32/lsa.c +++ b/dlls/advapi32/lsa.c @@ -483,7 +483,9 @@ NTSTATUS WINAPI LsaLookupSids( (*Names)[i].Name.Length = 0; (*Names)[i].Name.MaximumLength = 0; (*Names)[i].Name.Buffer = NULL; - if (LookupAccountSidW(NULL, Sids[i], NULL, &name_size, NULL, &domain_size, &use)) + + if (!LookupAccountSidW(NULL, Sids[i], NULL, &name_size, NULL, &domain_size, &use) && + GetLastError() == ERROR_INSUFFICIENT_BUFFER) { LSA_UNICODE_STRING domain; @@ -502,11 +504,11 @@ NTSTATUS WINAPI LsaLookupSids( domain.Buffer = NULL; } - (*Names)[i].Use = use; (*Names)[i].Name.Length = (name_size - 1) * sizeof(WCHAR); (*Names)[i].Name.MaximumLength = name_size * sizeof(WCHAR); - (*Names)[i].Name.Buffer = HeapAlloc(GetProcessHeap(),0,name_size * sizeof(WCHAR)); + (*Names)[i].Name.Buffer = HeapAlloc(GetProcessHeap(), 0, name_size * sizeof(WCHAR)); LookupAccountSidW(NULL, Sids[i], (*Names)[i].Name.Buffer, &name_size, domain.Buffer, &domain_size, &use); + (*Names)[i].Use = use; if (domain_size) (*Names)[i].DomainIndex = build_domain(*ReferencedDomains, &domain);

1 0