[PATCH 0/2] MR1820: bcrypt: Use privkey if pubkey is absent in key_asymmetric_encrypt().

[PATCH 1/2] bcrypt: Use privkey if pubkey is absent in key_asymmetric_encrypt().

[Paul Gofman]

From: Paul Gofman

---
 dlls/bcrypt/gnutls.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index bb79e885652..ed4e5176e80 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -2203,16 +2203,38 @@ static NTSTATUS key_asymmetric_encrypt( void *args )
     const struct key_asymmetric_encrypt_params *params = args;
     gnutls_datum_t d, e = { 0 };
     NTSTATUS status = STATUS_SUCCESS;
+    gnutls_pubkey_t pubkey;
     int ret;

d.data = params->input;
     d.size = params->input_len;
-    if ((ret = pgnutls_pubkey_encrypt_data(key_data(params->key)->a.pubkey, 0, &d, &e)))
+
+    if (!(pubkey = key_data(params->key)->a.pubkey))
+    {
+        if (!key_data(params->key)->a.privkey) return STATUS_INVALID_HANDLE;
+
+        if ((ret = pgnutls_pubkey_init( &pubkey )))
+        {
+            pgnutls_perror( ret );
+            return STATUS_INTERNAL_ERROR;
+        }
+        if ((ret = pgnutls_pubkey_import_privkey( pubkey, key_data(params->key)->a.privkey, 0, 0 )))
+        {
+            pgnutls_perror( ret );
+            pgnutls_pubkey_deinit( pubkey );
+            return STATUS_INTERNAL_ERROR;
+        }
+    }
+
+    if ((ret = pgnutls_pubkey_encrypt_data(pubkey, 0, &d, &e)))
     {
         pgnutls_perror( ret );
         return STATUS_INTERNAL_ERROR;
     }

+    if (pubkey != key_data(params->key)->a.pubkey)
+        pgnutls_pubkey_deinit( pubkey );
+
     *params->ret_len = e.size;
     if (params->output_len >= e.size) memcpy( params->output, e.data, *params->ret_len );
     else if (params->output_len == 0) status = STATUS_SUCCESS;

[PATCH 2/2] bcrypt/tests: Test BCRYPT_PAD_NONE encryption result in test_rsa_encrypt().

[Paul Gofman]

From: Paul Gofman

---
 dlls/bcrypt/tests/bcrypt.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c
index 39cdd015c90..d5adf9038c0 100644
--- a/dlls/bcrypt/tests/bcrypt.c
+++ b/dlls/bcrypt/tests/bcrypt.c
@@ -2262,6 +2262,14 @@ static UCHAR rsaPublicBlobWithInvalidPublicExpSize[] =
     0x87, 0x75, 0x33, 0x15, 0xb8, 0xde, 0x32, 0x30, 0xb4, 0x5e, 0xfd
 };

+static const UCHAR rsa_encrypted_no_padding[] =
+{
+    0x4a, 0xc1, 0xfa, 0x4f, 0xe0, 0x3f, 0x36, 0x9a, 0x64, 0xbf, 0x2e, 0x00, 0xb4, 0xb5, 0x40, 0xbe,
+    0x2d, 0x9a, 0x14, 0xf6, 0x8f, 0xa5, 0xc2, 0xe2, 0x20, 0xaf, 0x21, 0x79, 0xc6, 0x32, 0x7e, 0xea,
+    0x73, 0x00, 0x01, 0xbb, 0x9a, 0x19, 0x73, 0x41, 0x96, 0xae, 0x88, 0x6e, 0x36, 0x56, 0xe9, 0x9c,
+    0xac, 0x04, 0x82, 0xa8, 0x00, 0xdb, 0x4e, 0x29, 0x61, 0x7e, 0xaf, 0x64, 0xdb, 0xa2, 0x70, 0x0f,
+};
+
 static void test_rsa_encrypt(void)
 {
     static UCHAR input[] = "Hello World!";
@@ -2283,13 +2291,15 @@ static void test_rsa_encrypt(void)
     ok(ret == STATUS_SUCCESS, "got %lx\n", ret);
     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);
+    BCryptDestroyKey(key);
+
+    ret = BCryptImportKeyPair(rsa, NULL, BCRYPT_RSAPRIVATE_BLOB, &key, rsaPrivateBlob, sizeof(rsaPrivateBlob), 0);
+    ok(ret == STATUS_SUCCESS, "got %#lx\n", ret);

+    todo_wine {
     /*   No padding    */
     memset(input_no_padding, 0, sizeof(input_no_padding));
     strcpy((char *)input_no_padding, "Hello World");
@@ -2313,6 +2323,7 @@ static void test_rsa_encrypt(void)
     ret = BCryptEncrypt(key, input_no_padding, sizeof(input_no_padding), NULL, NULL, 0, encrypted_b, encrypted_size, &encrypted_size, BCRYPT_PAD_NONE);
     ok(ret == STATUS_SUCCESS, "got %lx\n", ret);
     ok(!memcmp(encrypted_a, encrypted_b, encrypted_size), "Both outputs should be the same\n");
+    ok(!memcmp(encrypted_b, rsa_encrypted_no_padding, encrypted_size), "Data mismatch.\n");

BCryptDecrypt(key, encrypted_a, encrypted_size, NULL, NULL, 0, NULL, 0, &decrypted_size, BCRYPT_PAD_NONE);
     decrypted = malloc(decrypted_size);