Paul Vriens : crypt32/tests: Fix some tests ( logical || with non-zero constant).
Alexandre Julliard
julliard at winehq.org
Tue Jun 23 10:02:43 CDT 2009
Module: wine
Branch: master
Commit: e2715a615276d62384794c2153fc0a708038fc7b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2715a615276d62384794c2153fc0a708038fc7b
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Tue Jun 23 07:49:12 2009 +0200
crypt32/tests: Fix some tests (logical || with non-zero constant).
---
dlls/crypt32/tests/cert.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c
index 322fa2f..1b60b80 100644
--- a/dlls/crypt32/tests/cert.c
+++ b/dlls/crypt32/tests/cert.c
@@ -1624,12 +1624,14 @@ static void testSignCert(HCRYPTPROV csp, const CRYPT_DATA_BLOB *toBeSigned,
algoID.pszObjId = (LPSTR)sigOID;
ret = CryptSignCertificate(0, 0, 0, toBeSigned->pbData, toBeSigned->cbData,
&algoID, NULL, NULL, &size);
- ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || NTE_BAD_ALGID),
+ ok(!ret &&
+ (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_ALGID),
"Expected ERROR_INVALID_PARAMETER or NTE_BAD_ALGID, got %08x\n",
GetLastError());
ret = CryptSignCertificate(0, AT_SIGNATURE, 0, toBeSigned->pbData,
toBeSigned->cbData, &algoID, NULL, NULL, &size);
- ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || NTE_BAD_ALGID),
+ ok(!ret &&
+ (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_ALGID),
"Expected ERROR_INVALID_PARAMETER or NTE_BAD_ALGID, got %08x\n",
GetLastError());
@@ -1851,7 +1853,8 @@ static void testSignAndEncodeCert(void)
algID.pszObjId = oid_rsa_md5rsa;
ret = CryptSignAndEncodeCertificate(0, 0, X509_ASN_ENCODING,
X509_CERT_TO_BE_SIGNED, &info, &algID, NULL, NULL, &size);
- ok(!ret && (GetLastError() == ERROR_INVALID_PARAMETER || NTE_BAD_ALGID),
+ ok(!ret &&
+ (GetLastError() == ERROR_INVALID_PARAMETER || GetLastError() == NTE_BAD_ALGID),
"Expected ERROR_INVALID_PARAMETER or NTE_BAD_ALGID, got %08x\n",
GetLastError());
algID.pszObjId = oid_rsa_md5;
More information about the wine-cvs
mailing list