commit 7b1dc85919c40ba4a6329e621b6bacad08e6d775
author Neil Armstrong <narmstrong@baylibre.com> Wed Mar 16 15:35:41 2022 +0100
committer Neil Armstrong <narmstrong@baylibre.com> Wed Mar 16 15:36:06 2022 +0100
tree cb45bfd5b93502274b58f85ae2a43e1660b7ed01
parent 3770e2483f7f9cf0101e9f3294d8fcf81705dcab

Simplify padding check and get rid of psa_sig_md in rsa_encrypt_wrap()

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>

library/pk_wrap.c

diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index d105e39..04db6f8 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -241,23 +241,13 @@
     int key_len;
     unsigned char buf[MBEDTLS_PK_RSA_PUB_DER_MAX_BYTES];
     mbedtls_pk_info_t pk_info = mbedtls_rsa_info;
-    psa_algorithm_t psa_alg_md;
 
     ((void) f_rng);
     ((void) p_rng);
 
 #if !defined(MBEDTLS_RSA_ALT)
-    switch( rsa->padding )
-    {
-        case MBEDTLS_RSA_PKCS_V15:
-            psa_alg_md = PSA_ALG_RSA_PKCS1V15_CRYPT;
-            break;
-
-        default:
-            return( MBEDTLS_ERR_RSA_INVALID_PADDING );
-    }
-#else
-    psa_alg_md = PSA_ALG_RSA_PKCS1V15_CRYPT;
+    if( rsa->padding != MBEDTLS_RSA_PKCS_V15 )
+        return( MBEDTLS_ERR_RSA_INVALID_PADDING );
 #endif
 
     *olen = mbedtls_rsa_get_len( rsa );
@@ -274,7 +264,7 @@
         return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
 
     psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_ENCRYPT );
-    psa_set_key_algorithm( &attributes, psa_alg_md );
+    psa_set_key_algorithm( &attributes, PSA_ALG_RSA_PKCS1V15_CRYPT );
     psa_set_key_type( &attributes, PSA_KEY_TYPE_RSA_PUBLIC_KEY );
 
     status = psa_import_key( &attributes,
@@ -286,8 +276,10 @@
         goto cleanup;
     }
 
-    status = psa_asymmetric_encrypt( key_id, psa_alg_md, input, ilen,
-                                     NULL, 0, output, osize, olen);
+    status = psa_asymmetric_encrypt( key_id, PSA_ALG_RSA_PKCS1V15_CRYPT,
+                                     input, ilen,
+                                     NULL, 0,
+                                     output, osize, olen );
     if( status != PSA_SUCCESS )
     {
         ret = mbedtls_pk_error_from_psa_rsa( status );