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

cryptnet/tests: Partially revert commit de6e33f306. 

It introduced new (old) test failures on some still-tested Windows
versions.
This commit is contained in:
Juan Lang 2011-03-10 11:22:57 -08:00 committed by Alexandre Julliard
parent 819eb52866
commit 016795a9bf
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,8 +365,9 @@ 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 */ /* w2k3,XP, newer w2k: CRYPT_E_NO_MATCH, older w2k: CRYPT_E_ASN1_BADTAG */
ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH), ok(!ret && (GetLastError() == CRYPT_E_NO_MATCH ||
broken(GetLastError() == CRYPT_E_NO_MATCH)),
"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 */
@ -405,8 +406,9 @@ static void test_retrieveObjectByUrl(void)
cert = (PCCERT_CONTEXT)0xdeadbeef; cert = (PCCERT_CONTEXT)0xdeadbeef;
ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0,
(void **)&cert, NULL, NULL, NULL, &aux); (void **)&cert, NULL, NULL, NULL, &aux);
/* w2k: success */ /* w2k: failure with E_INVALIDARG */
ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ok(ret || broken(GetLastError() == E_INVALIDARG),
"got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n",
ret, GetLastError(), GetLastError()); ret, GetLastError(), GetLastError());
if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef) if (cert && cert != (PCCERT_CONTEXT)0xdeadbeef)
CertFreeCertificateContext(cert); CertFreeCertificateContext(cert);
@ -415,8 +417,9 @@ static void test_retrieveObjectByUrl(void)
aux.cbSize = sizeof(aux); aux.cbSize = sizeof(aux);
ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0, ret = CryptRetrieveObjectByUrlA(url, CONTEXT_OID_CERTIFICATE, 0, 0,
(void **)&cert, NULL, NULL, NULL, &aux); (void **)&cert, NULL, NULL, NULL, &aux);
/* w2k: success */ /* w2k: failure with E_INVALIDARG */
ok(ret, "got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n", ok(ret || broken(GetLastError() == E_INVALIDARG),
"got %u with 0x%x/%u (expected '!=0' or '0' with E_INVALIDARG)\n",
ret, GetLastError(), GetLastError()); ret, GetLastError(), GetLastError());
if (!ret) { if (!ret) {
/* no more tests useful */ /* no more tests useful */