ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cryptnet/tests: Fix test failures on older NT4.

Browse Source
This commit is contained in:
Juan Lang 2012-02-12 17:58:45 -08:00 committed by Alexandre Julliard
parent ad46dbd4cc
commit 0439500f2c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/cryptnet/tests/cryptnet.c
View File

@ -365,9 +365,12 @@ static void test_retrieveObjectByUrl(void)
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl, ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CRL, 0, 0, (void **)&crl,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
/* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */ /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG
* or OSS_DATA_ERROR.
*/
ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH || ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH ||
broken(GetLastError() == CRYPT_E_ASN1_BADTAG)), broken(GetLastError() == CRYPT_E_ASN1_BADTAG ||
GetLastError() == OSS_DATA_ERROR)),
"got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError()); "got 0x%x/%u (expected CRYPT_E_NO_MATCH)\n", GetLastError(), GetLastError());
/* only newer versions of cryptnet do the cleanup */ /* only newer versions of cryptnet do the cleanup */
@ -698,6 +701,11 @@ static void test_verifyRevocation(void)
* bad authority key ID extension and can't be matched with the issuer * bad authority key ID extension and can't be matched with the issuer
* cert, hence the revocation status should be unknown. * cert, hence the revocation status should be unknown.
*/ */
if (!ret && GetLastError() == ERROR_FILE_NOT_FOUND)
{
win_skip("CERT_CONTEXT_REVOCATION_TYPE unsupported, skipping\n");
return;
}
ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK || ok(!ret && (GetLastError() == CRYPT_E_NO_REVOCATION_CHECK ||
broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)), broken(GetLastError() == CRYPT_E_REVOKED /* Win2k */)),
"expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError()); "expected CRYPT_E_NO_REVOCATION_CHECK, got %08x\n", GetLastError());