Skip to content

W
wine-winehq
Commit ce20f6c6 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files
Options

rsaenh/tests: Fix the remaining test failures on Win9x up to W2K.

parent d1a7e41b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 7 deletions
dlls/rsaenh/tests/rsaenh.c
View file @ ce20f6c6
...@@ -1577,9 +1577,8 @@ static void test_rsa_encrypt(void) ...@@ -1577,9 +1577,8 @@ static void test_rsa_encrypt(void)
/* but its private key may not be. */ /* but its private key may not be. */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
result = CryptExportKey(hRSAKey, 0, PRIVATEKEYBLOB, 0, NULL, &dwLen); result = CryptExportKey(hRSAKey, 0, PRIVATEKEYBLOB, 0, NULL, &dwLen);
ok(!result && ok((!result && GetLastError() == NTE_BAD_KEY_STATE) ||
(GetLastError() == NTE_BAD_KEY_STATE || broken(result), /* Win9x/NT4 */
broken(GetLastError() == 0xdeadbeef) /* Win9x/NT4 */),
"expected NTE_BAD_KEY_STATE, got %08x\n", GetLastError()); "expected NTE_BAD_KEY_STATE, got %08x\n", GetLastError());
/* Setting the permissions of the key exchange key isn't allowed, either. */ /* Setting the permissions of the key exchange key isn't allowed, either. */
dwVal |= CRYPT_EXPORT; dwVal |= CRYPT_EXPORT;
...@@ -1612,9 +1611,8 @@ static void test_rsa_encrypt(void) ...@@ -1612,9 +1611,8 @@ static void test_rsa_encrypt(void)
/* but its private key may not be. */ /* but its private key may not be. */
SetLastError(0xdeadbeef); SetLastError(0xdeadbeef);
result = CryptExportKey(hRSAKey, 0, PRIVATEKEYBLOB, 0, NULL, &dwLen); result = CryptExportKey(hRSAKey, 0, PRIVATEKEYBLOB, 0, NULL, &dwLen);
ok(!result && ok((!result && GetLastError() == NTE_BAD_KEY_STATE) ||
(GetLastError() == NTE_BAD_KEY_STATE || broken(result), /* Win9x/NT4 */
broken(GetLastError() == 0xdeadbeef) /* Win9x/NT4 */),
"expected NTE_BAD_KEY_STATE, got %08x\n", GetLastError()); "expected NTE_BAD_KEY_STATE, got %08x\n", GetLastError());
/* Setting the permissions of the signature key isn't allowed, either. */ /* Setting the permissions of the signature key isn't allowed, either. */
dwVal |= CRYPT_EXPORT; dwVal |= CRYPT_EXPORT;
...@@ -2159,7 +2157,10 @@ static void test_key_permissions(void) ...@@ -2159,7 +2157,10 @@ static void test_key_permissions(void)
/* Turning off the key's export permissions is "allowed".. */ /* Turning off the key's export permissions is "allowed".. */
dwVal &= ~CRYPT_EXPORT; dwVal &= ~CRYPT_EXPORT;
result = CryptSetKeyParam(hKey1, KP_PERMISSIONS, (BYTE *)&dwVal, 0); result = CryptSetKeyParam(hKey1, KP_PERMISSIONS, (BYTE *)&dwVal, 0);
ok(result, "%08x\n", GetLastError()); ok(result ||
broken(!result && GetLastError() == NTE_BAD_DATA) || /* W2K */
broken(!result && GetLastError() == NTE_BAD_FLAGS), /* Win9x/WinME/NT4 */
"%08x\n", GetLastError());
/* but it has no effect. */ /* but it has no effect. */
dwVal = 0xdeadbeef; dwVal = 0xdeadbeef;
dwLen = sizeof(DWORD); dwLen = sizeof(DWORD);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment