Ge van Geldorp : crypt32/tests: Fix cert test on Win7.
Alexandre Julliard
julliard at winehq.org
Tue Sep 22 13:56:52 CDT 2009
Module: wine
Branch: master
Commit: d20d4929141bc7a8dc763428f5322c84753c6e67
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d20d4929141bc7a8dc763428f5322c84753c6e67
Author: Ge van Geldorp <ggeldorp at vmware.com>
Date: Tue Sep 15 20:58:56 2009 +0200
crypt32/tests: Fix cert test on Win7.
---
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 415f9c7..a989346 100644
--- a/dlls/crypt32/tests/cert.c
+++ b/dlls/crypt32/tests/cert.c
@@ -3143,7 +3143,8 @@ static void testGetPublicKeyLength(void)
ret, GetLastError());
SetLastError(0xdeadbeef);
ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info);
- ok(ret == 56, "Expected length 56, got %d\n", ret);
+ ok(ret == 56 || broken(ret == 0 && GetLastError() == NTE_BAD_LEN) /* Win7 */,
+ "Expected length 56, got %d\n", ret);
/* An RSA key with the DH OID */
info.Algorithm.pszObjId = oid_rsa_dh;
SetLastError(0xdeadbeef);
@@ -3157,12 +3158,14 @@ static void testGetPublicKeyLength(void)
info.Algorithm.pszObjId = oid_rsa_rsa;
SetLastError(0xdeadbeef);
ret = CertGetPublicKeyLength(X509_ASN_ENCODING, &info);
- ok(ret == 56, "Expected length 56, got %d\n", ret);
+ ok(ret == 56 || broken(ret == 0 && GetLastError() == NTE_BAD_LEN) /* Win7 */,
+ "Expected length 56, got %d\n", ret);
/* With the RSA OID and a message encoding */
info.Algorithm.pszObjId = oid_rsa_rsa;
SetLastError(0xdeadbeef);
ret = CertGetPublicKeyLength(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, &info);
- ok(ret == 56, "Expected length 56, got %d\n", ret);
+ ok(ret == 56 || broken(ret == 0 && GetLastError() == NTE_BAD_LEN) /* Win7 */,
+ "Expected length 56, got %d\n", ret);
}
START_TEST(cert)
More information about the wine-cvs
mailing list