Dmitry Timoshkov : crypt32/tests: Fix test failures under newer Windows versions.
Alexandre Julliard
julliard at winehq.org
Tue Nov 10 15:30:25 CST 2020
Module: wine
Branch: master
Commit: 0c8ce3aab57d0f81889438f0e9d1a9cb5adee342
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c8ce3aab57d0f81889438f0e9d1a9cb5adee342
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Tue Nov 10 10:22:13 2020 +0300
crypt32/tests: Fix test failures under newer Windows versions.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/crypt32/tests/cert.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c
index 7d6d07fe025..d9f839c72d2 100644
--- a/dlls/crypt32/tests/cert.c
+++ b/dlls/crypt32/tests/cert.c
@@ -3886,17 +3886,19 @@ static void testAcquireCertPrivateKey(void)
/* Missing private key */
ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, NULL, NULL);
- ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY,
+ ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_PROV_TYPE /* win10 */),
"Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError());
ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec,
&callerFree);
- ok(!ret && GetLastError() == CRYPT_E_NO_KEY_PROPERTY,
+ ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_PROV_TYPE /* win10 */),
"Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError());
CertSetCertificateContextProperty(cert, CERT_KEY_PROV_INFO_PROP_ID, 0,
&keyProvInfo);
ret = pCryptAcquireCertificatePrivateKey(cert, 0, NULL, &csp, &keySpec,
&callerFree);
- ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY || GetLastError() == NTE_BAD_KEYSET /* win8 */),
+ ok(!ret && (GetLastError() == CRYPT_E_NO_KEY_PROPERTY ||
+ GetLastError() == NTE_BAD_KEYSET /* win8 */ ||
+ GetLastError() == NTE_BAD_PROV_TYPE /* win10 */),
"Expected CRYPT_E_NO_KEY_PROPERTY, got %08x\n", GetLastError());
pCryptAcquireContextA(&csp, cspNameA, MS_DEF_PROV_A, PROV_RSA_FULL,
More information about the wine-cvs
mailing list