[PATCH 0/2] MR2280: bcrypt: Add wow64 support for PSS padding.

[PATCH 1/2] bcrypt: Factor out wow64 padding conversion.

[Sven Baars]

From: Sven Baars

---
 dlls/bcrypt/gnutls.c | 52 +++++++++++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index 89e5c91776d..a84c2a33ba5 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -2302,6 +2302,34 @@ struct key32
     } u;
 };

+union padding
+{
+    BCRYPT_PKCS1_PADDING_INFO pkcs1;
+};
+
+union padding32
+{
+    struct
+    {
+        PTR32 pszAlgId;
+    } pkcs1;
+};
+
+static union padding *get_padding( union padding32 *padding32, union padding *padding, ULONG flags)
+{
+    if (!padding32) return NULL;
+
+    switch (flags)
+    {
+    case BCRYPT_PAD_PKCS1:
+        padding->pkcs1.pszAlgId = ULongToPtr( padding32->pkcs1.pszAlgId );
+        return padding;
+    default:
+        break;
+    }
+    return NULL;
+}
+
 static struct key *get_symmetric_key( struct key32 *key32, struct key *key )
 {
     key->hdr            = key32->hdr;
@@ -2576,12 +2604,12 @@ static NTSTATUS wow64_key_asymmetric_sign( void *args )

NTSTATUS ret;
     struct key key;
-    BCRYPT_PKCS1_PADDING_INFO padding;
+    union padding padding;
     struct key32 *key32 = ULongToPtr( params32->key );
     struct key_asymmetric_sign_params params =
     {
         get_asymmetric_key( key32, &key ),
-        NULL, /* padding */
+        get_padding(ULongToPtr( params32->padding ), &padding, params32->flags),
         ULongToPtr(params32->input),
         params32->input_len,
         ULongToPtr(params32->output),
@@ -2590,14 +2618,6 @@ static NTSTATUS wow64_key_asymmetric_sign( void *args )
         params32->flags
     };

-    if (params32->flags & BCRYPT_PAD_PKCS1)
-    {
-        PTR32 *info = ULongToPtr( params32->padding );
-        if (!info) return STATUS_INVALID_PARAMETER;
-        padding.pszAlgId = ULongToPtr( *info );
-        params.padding = &padding;
-    }
-
     ret = key_asymmetric_sign( &params );
     put_asymmetric_key32( &key, key32 );
     return ret;
@@ -2618,12 +2638,12 @@ static NTSTATUS wow64_key_asymmetric_verify( void *args )

NTSTATUS ret;
     struct key key;
-    BCRYPT_PKCS1_PADDING_INFO padding;
+    union padding padding;
     struct key32 *key32 = ULongToPtr( params32->key );
     struct key_asymmetric_verify_params params =
     {
         get_asymmetric_key( key32, &key ),
-        NULL, /* padding */
+        get_padding(ULongToPtr( params32->padding ), &padding, params32->flags),
         ULongToPtr(params32->hash),
         params32->hash_len,
         ULongToPtr(params32->signature),
@@ -2631,14 +2651,6 @@ static NTSTATUS wow64_key_asymmetric_verify( void *args )
         params32->flags
     };

-    if (params32->flags & BCRYPT_PAD_PKCS1)
-    {
-        PTR32 *info = ULongToPtr( params32->padding );
-        if (!info) return STATUS_INVALID_PARAMETER;
-        padding.pszAlgId = ULongToPtr( *info );
-        params.padding = &padding;
-    }
-
     ret = key_asymmetric_verify( &params );
     put_asymmetric_key32( &key, key32 );
     return ret;

[PATCH 2/2] bcrypt: Add wow64 support for PSS padding.

[Sven Baars]

From: Sven Baars

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

diff --git a/dlls/bcrypt/gnutls.c b/dlls/bcrypt/gnutls.c
index a84c2a33ba5..3c64a3643ef 100644
--- a/dlls/bcrypt/gnutls.c
+++ b/dlls/bcrypt/gnutls.c
@@ -2305,6 +2305,7 @@ struct key32
 union padding
 {
     BCRYPT_PKCS1_PADDING_INFO pkcs1;
+    BCRYPT_PSS_PADDING_INFO pss;
 };

union padding32
@@ -2313,6 +2314,11 @@ union padding32
     {
         PTR32 pszAlgId;
     } pkcs1;
+    struct
+    {
+        PTR32 pszAlgId;
+        ULONG cbSalt;
+    } pss;
 };

static union padding *get_padding( union padding32 *padding32, union padding *padding, ULONG flags)
@@ -2324,6 +2330,10 @@ static union padding *get_padding( union padding32 *padding32, union padding *pa
     case BCRYPT_PAD_PKCS1:
         padding->pkcs1.pszAlgId = ULongToPtr( padding32->pkcs1.pszAlgId );
         return padding;
+    case BCRYPT_PAD_PSS:
+        padding->pss.pszAlgId = ULongToPtr( padding32->pss.pszAlgId );
+        padding->pss.cbSalt = padding32->pss.cbSalt;
+        return padding;
     default:
         break;
     }

[PATCH 0/2] MR2280: bcrypt: Add wow64 support for PSS padding. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.