mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
84 lines
3.9 KiB
Diff
84 lines
3.9 KiB
Diff
From 873d431347aa25effc70e47566e562c122a5edc8 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Lackner <sebastian@fds-team.de>
|
|
Date: Mon, 26 Dec 2016 04:23:31 +0100
|
|
Subject: bcrypt: Handle NULL pointers in BCryptDuplicateHash and add tests.
|
|
|
|
---
|
|
dlls/bcrypt/bcrypt_main.c | 1 +
|
|
dlls/bcrypt/tests/bcrypt.c | 26 +++++++++++++++++++++++++-
|
|
2 files changed, 26 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c
|
|
index a9006a4..d1516cc 100644
|
|
--- a/dlls/bcrypt/bcrypt_main.c
|
|
+++ b/dlls/bcrypt/bcrypt_main.c
|
|
@@ -681,6 +681,7 @@ NTSTATUS WINAPI BCryptDuplicateHash( BCRYPT_HASH_HANDLE handle, BCRYPT_HASH_HAND
|
|
TRACE( "%p, %p, %p, %u, %u\n", handle, handle_copy, object, object_count, flags );
|
|
|
|
if (!hash_orig || hash_orig->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE;
|
|
+ if (!handle_copy) return STATUS_INVALID_PARAMETER;
|
|
if (!(hash_copy = HeapAlloc( GetProcessHeap(), 0, sizeof(*hash_copy) )))
|
|
return STATUS_NO_MEMORY;
|
|
|
|
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
|
|
index 997b298..bfe3a7e 100644
|
|
--- a/dlls/bcrypt/tests/bcrypt.c
|
|
+++ b/dlls/bcrypt/tests/bcrypt.c
|
|
@@ -33,6 +33,7 @@ static NTSTATUS (WINAPI *pBCryptCreateHash)(BCRYPT_ALG_HANDLE, BCRYPT_HASH_HANDL
|
|
ULONG, ULONG);
|
|
static NTSTATUS (WINAPI *pBCryptHash)(BCRYPT_ALG_HANDLE, UCHAR *, ULONG, UCHAR *, ULONG, UCHAR *, ULONG);
|
|
static NTSTATUS (WINAPI *pBCryptHashData)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
|
|
+static NTSTATUS (WINAPI *pBCryptDuplicateHash)(BCRYPT_HASH_HANDLE, BCRYPT_HASH_HANDLE *, UCHAR *, ULONG, ULONG);
|
|
static NTSTATUS (WINAPI *pBCryptFinishHash)(BCRYPT_HASH_HANDLE, PUCHAR, ULONG, ULONG);
|
|
static NTSTATUS (WINAPI *pBCryptDestroyHash)(BCRYPT_HASH_HANDLE);
|
|
static NTSTATUS (WINAPI *pBCryptGenRandom)(BCRYPT_ALG_HANDLE, PUCHAR, ULONG, ULONG);
|
|
@@ -173,7 +174,7 @@ static void test_sha1(void)
|
|
static const char expected[] = "961fa64958818f767707072755d7018dcd278e94";
|
|
static const char expected_hmac[] = "2472cf65d0e090618d769d3e46f0d9446cf212da";
|
|
BCRYPT_ALG_HANDLE alg;
|
|
- BCRYPT_HASH_HANDLE hash;
|
|
+ BCRYPT_HASH_HANDLE hash, hash2;
|
|
UCHAR buf[512], buf_hmac[1024], sha1[20], sha1_hmac[20];
|
|
ULONG size, len;
|
|
char str[41];
|
|
@@ -260,6 +261,28 @@ static void test_sha1(void)
|
|
test_hash_length(hash, 20);
|
|
test_alg_name(hash, "SHA1");
|
|
|
|
+ ret = pBCryptDuplicateHash(NULL, &hash2, NULL, 0, 0);
|
|
+ ok(ret == STATUS_INVALID_HANDLE, "got %08x\n", ret);
|
|
+
|
|
+ ret = pBCryptDuplicateHash(hash, NULL, NULL, 0, 0);
|
|
+ ok(ret == STATUS_INVALID_PARAMETER, "got %08x\n", ret);
|
|
+
|
|
+ hash2 = (void *)0xdeadbeef;
|
|
+ ret = pBCryptDuplicateHash(hash, &hash2, NULL, 0, 0);
|
|
+ ok(ret == STATUS_SUCCESS || broken(ret == STATUS_INVALID_PARAMETER) /* < Win 7 */, "got %08x\n", ret);
|
|
+
|
|
+ if (ret == STATUS_SUCCESS)
|
|
+ {
|
|
+ memset(sha1_hmac, 0, sizeof(sha1_hmac));
|
|
+ ret = pBCryptFinishHash(hash2, sha1_hmac, sizeof(sha1_hmac), 0);
|
|
+ ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
|
|
+ format_hash( sha1_hmac, sizeof(sha1_hmac), str );
|
|
+ ok(!strcmp(str, expected_hmac), "got %s\n", str);
|
|
+
|
|
+ ret = pBCryptDestroyHash(hash2);
|
|
+ ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
|
|
+ }
|
|
+
|
|
memset(sha1_hmac, 0, sizeof(sha1_hmac));
|
|
ret = pBCryptFinishHash(hash, sha1_hmac, sizeof(sha1_hmac), 0);
|
|
ok(ret == STATUS_SUCCESS, "got %08x\n", ret);
|
|
@@ -1179,6 +1202,7 @@ START_TEST(bcrypt)
|
|
pBCryptCreateHash = (void *)GetProcAddress(module, "BCryptCreateHash");
|
|
pBCryptHash = (void *)GetProcAddress(module, "BCryptHash");
|
|
pBCryptHashData = (void *)GetProcAddress(module, "BCryptHashData");
|
|
+ pBCryptDuplicateHash = (void *)GetProcAddress(module, "BCryptDuplicateHash");
|
|
pBCryptFinishHash = (void *)GetProcAddress(module, "BCryptFinishHash");
|
|
pBCryptDestroyHash = (void *)GetProcAddress(module, "BCryptDestroyHash");
|
|
pBCryptGenRandom = (void *)GetProcAddress(module, "BCryptGenRandom");
|
|
--
|
|
2.9.0
|
|
|