From ba935e337edb9b1114698b0613fb23989276ffa3 Mon Sep 17 00:00:00 2001 From: Reece Dunn Date: Sun, 7 Sep 2008 11:56:56 +0100 Subject: [PATCH] crypt32: fixed the testGetCertChain tests on Vista. --- dlls/crypt32/tests/chain.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/tests/chain.c b/dlls/crypt32/tests/chain.c index ccb4cfc..bb0e2b2 100644 --- a/dlls/crypt32/tests/chain.c +++ b/dlls/crypt32/tests/chain.c @@ -1612,14 +1612,18 @@ static void testGetCertChain(void) SetLastError(0xdeadbeef); ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, ¶, 0, NULL, &chain); - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + ok(!ret, "Expected CertGetCertificateChain to fail\n"); + ok(GetLastError() == ERROR_INVALID_DATA || + GetLastError() == CRYPT_E_ASN1_BADTAG /* Vista/win2k8 */, + "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); para.cbSize = sizeof(para); SetLastError(0xdeadbeef); ret = pCertGetCertificateChain(NULL, cert, NULL, NULL, ¶, 0, NULL, &chain); - ok(!ret && GetLastError() == ERROR_INVALID_DATA, - "Expected ERROR_INVALID_DATA, got %d\n", GetLastError()); + ok(!ret, "Expected CertGetCertificateChain to fail\n"); + ok(GetLastError() == ERROR_INVALID_DATA || + GetLastError() == CRYPT_E_ASN1_BADTAG /* Vista/win2k8 */, + "Expected ERROR_INVALID_DATA, got %08x\n", GetLastError()); CertFreeCertificateContext(cert); for (i = 0; i < sizeof(chainCheck) / sizeof(chainCheck[0]); i++) -- 1.5.6.1.1071.g76fb