[PATCH v4 1/3] bcrypt: Return correct error from key_asymmetric_encrypt() if key is missing.

[Paul Gofman]

From: Paul Gofman

---
 dlls/bcrypt/gnutls.c       | 2 ++
 dlls/bcrypt/tests/bcrypt.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index bb79e885652..a67030a3ae0 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -2205,6 +2205,8 @@ static NTSTATUS key_asymmetric_encrypt( void *args )
     NTSTATUS status = STATUS_SUCCESS;
     int ret;

+    if (!key_data(params->key)->a.pubkey) return STATUS_INVALID_HANDLE;
+
     d.data = params->input;
     d.size = params->input_len;
     if ((ret = pgnutls_pubkey_encrypt_data(key_data(params->key)->a.pubkey, 0, &d, &e)))
diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 39cdd015c90..3bcdda0cf47 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -2284,12 +2284,12 @@ static void test_rsa_encrypt(void)
     ret = BCryptGenerateKeyPair(rsa, &key, 512, 0);
     ok(ret == STATUS_SUCCESS, "got %lx\n", ret);

-    todo_wine {
     /* Not finalized key */
     ret = BCryptEncrypt(key, input, sizeof(input), NULL, NULL, 0, NULL, 0, &encrypted_size, 0);
     ok(ret == STATUS_INVALID_HANDLE, "got %lx\n", ret);
     BCryptFinalizeKeyPair(key, 0);

+    todo_wine {
     /*   No padding    */
     memset(input_no_padding, 0, sizeof(input_no_padding));
     strcpy((char *)input_no_padding, "Hello World");