From 0f2c82b7962c8b8d65c9f6b1cbb59993c9bc38ab Mon Sep 17 00:00:00 2001 From: Juan Lang Date: Thu, 14 Feb 2008 10:12:21 -0800 Subject: [PATCH] Fix CryptVerifySignatureW test failures on Win98SE and NT4 --- dlls/advapi32/tests/crypt.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/tests/crypt.c b/dlls/advapi32/tests/crypt.c index 4f5f431..d6453d4 100644 --- a/dlls/advapi32/tests/crypt.c +++ b/dlls/advapi32/tests/crypt.c @@ -400,6 +400,11 @@ static void test_verify_sig(void) SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(0, NULL, 0, 0, NULL, 0); + if (!ret && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) + { + skip("CryptVerifySignatureW is not implemented\n"); + return; + } ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); ret = pCryptAcquireContextA(&prov, szKeySet, NULL, PROV_RSA_FULL, @@ -420,12 +425,16 @@ static void test_verify_sig(void) "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(hash, NULL, 0, key, NULL, 0); - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, - "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == NTE_BAD_SIGNATURE || + GetLastError() == ERROR_INVALID_PARAMETER), + "Expected NTE_BAD_SIGNATURE or ERROR_INVALID_PARAMETER, got %08x\n", + GetLastError()); SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(hash, NULL, sizeof(bogus), key, NULL, 0); - ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, - "Expected NTE_BAD_SIGNATURE, got %08x\n", GetLastError()); + ok(!ret && (GetLastError() == NTE_BAD_SIGNATURE || + GetLastError() == ERROR_INVALID_PARAMETER), + "Expected NTE_BAD_SIGNATURE or ERROR_INVALID_PARAMETER, got %08x\n", + GetLastError()); SetLastError(0xdeadbeef); ret = pCryptVerifySignatureW(hash, bogus, 0, key, NULL, 0); ok(!ret && GetLastError() == NTE_BAD_SIGNATURE, -- 1.4.1