Hans Leidekker : bcrypt: Return an error when BCryptFinalizeKeyPair() is called twice.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9ff16aa1cb3e7fd0e8c2ff0a0389875eeaf993ca
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=9ff16aa1cb3e7fd0e8c2ff0a0...

Author: Hans Leidekker <hans(a)codeweavers.com>
Date:   Thu Mar 10 11:05:06 2022 +0100

bcrypt: Return an error when BCryptFinalizeKeyPair() is called twice.

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/bcrypt/gnutls.c       | 1 +
 dlls/bcrypt/tests/bcrypt.c | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index e1b32be32a4..6862c5cdcf2 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -846,6 +846,7 @@ static NTSTATUS key_asymmetric_generate( void *args )
     int ret;
 
     if (!libgnutls_handle) return STATUS_INTERNAL_ERROR;
+    if (key_data(key)->privkey) return STATUS_INVALID_HANDLE;
 
     switch (key->alg_id)
     {
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 8982e0ae90b..efb5843fa4e 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -2157,6 +2157,9 @@ static void test_RSA(void)
     ret = BCryptImportKeyPair(alg, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0);
     ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
 
+    ret = BCryptFinalizeKeyPair(key, 0);
+    ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret);
+
     size = 0;
     buf = HeapAlloc(GetProcessHeap(), 0, sizeof(rsaPrivateBlob));
     ret = BCryptExportKey(key, NULL, BCRYPT_RSAPRIVATE_BLOB, buf, sizeof(rsaPrivateBlob), &size, 0);
@@ -2565,6 +2568,9 @@ static void test_BCryptSignHash(void)
     ret = BCryptFinalizeKeyPair(key, 0);
     ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);
 
+    ret = BCryptFinalizeKeyPair(key, 0);
+    ok(ret == STATUS_INVALID_HANDLE, "got %#lx\n", ret);
+
     len = 0;
     memset(sig, 0, sizeof(sig));