advapi32/tests: Fix some test failures on several platforms.
This commit is contained in:
parent
df4b68b772
commit
f555aef269
|
@ -988,15 +988,21 @@ static void test_rc2_keylen(void)
|
||||||
ret = pCryptImportKey(provider, (BYTE*)&key_blob,
|
ret = pCryptImportKey(provider, (BYTE*)&key_blob,
|
||||||
sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
|
sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
|
||||||
0, 0, &hkey);
|
0, 0, &hkey);
|
||||||
ok(!ret && GetLastError() == NTE_BAD_DATA,
|
ok(!ret && (GetLastError() == NTE_BAD_DATA ||
|
||||||
"expected NTE_BAD_DATA, got %08x\n", GetLastError());
|
GetLastError() == NTE_BAD_LEN || /* Win7 */
|
||||||
|
GetLastError() == NTE_BAD_TYPE || /* W2K */
|
||||||
|
GetLastError() == NTE_PERM), /* Win9x, WinMe and NT4 */
|
||||||
|
"unexpected error %08x\n", GetLastError());
|
||||||
/* but importing an 8-bit (7-byte) key does.. */
|
/* but importing an 8-bit (7-byte) key does.. */
|
||||||
key_blob.key_size = 7;
|
key_blob.key_size = 7;
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
ret = pCryptImportKey(provider, (BYTE*)&key_blob,
|
ret = pCryptImportKey(provider, (BYTE*)&key_blob,
|
||||||
sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
|
sizeof(BLOBHEADER)+sizeof(DWORD)+key_blob.key_size,
|
||||||
0, 0, &hkey);
|
0, 0, &hkey);
|
||||||
ok(ret, "CryptAcquireContext error %08x\n", GetLastError());
|
ok(ret ||
|
||||||
|
broken(!ret && GetLastError() == NTE_BAD_TYPE) || /* W2K */
|
||||||
|
broken(!ret && GetLastError() == NTE_PERM), /* Win9x, WinMe and NT4 */
|
||||||
|
"CryptAcquireContext error %08x\n", GetLastError());
|
||||||
pCryptDestroyKey(hkey);
|
pCryptDestroyKey(hkey);
|
||||||
/* as does importing a 16-byte key with the base provider when
|
/* as does importing a 16-byte key with the base provider when
|
||||||
* CRYPT_IPSEC_HMAC_KEY is specified.
|
* CRYPT_IPSEC_HMAC_KEY is specified.
|
||||||
|
|
Loading…
Reference in New Issue