crypt32/tests: Fix test failures under newer Windows versions.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

crypt32/tests: Fix test failures under newer Windows versions.
0c8ce3aa · Dmitry Timoshkov · Alexandre Julliard · 35886486 · 0c8ce3aa
Commit 0c8ce3aa authored Nov 10, 2020 by Dmitry Timoshkov Committed by Alexandre Julliard Nov 10, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

cert.c dlls/crypt32/tests/cert.c +5 -3

No files found.
--- 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,