commit 782a7f5bd6f40ec919baba159661e1977f562ccf
author Thomas Daubney <thomas.daubney@arm.com> Wed May 19 12:27:35 2021 +0100
committer Thomas Daubney <thomas.daubney@arm.com> Wed May 19 12:27:35 2021 +0100
tree a2f55a20ae84205434df4734461f76aa0e023ce2
parent 9e65f791b56634e1bc4fd0b2edebd50cc1beab46

Removes mode param from mbedtls_rsa_rsassa_pss_verify_ext

Commit removes the mode parameter
from the mbedtls_rsa_rsassa_pss_verify_ext
function. This change is propagated
throughout the codebase.

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index 65a4d0c..06021e2 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -367,11 +367,10 @@
             return( MBEDTLS_ERR_RSA_VERIFY_FAILED );
 
         ret = mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_pk_rsa( *ctx ),
-                MBEDTLS_RSA_PUBLIC,
-                md_alg, (unsigned int) hash_len, hash,
-                pss_opts->mgf1_hash_id,
-                pss_opts->expected_salt_len,
-                sig );
+                                                 md_alg, (unsigned int) hash_len, hash,
+                                                 pss_opts->mgf1_hash_id,
+                                                 pss_opts->expected_salt_len,
+                                                 sig );
         if( ret != 0 )
             return( ret );
 

library/rsa.c

diff --git a/library/rsa.c b/library/rsa.c
index db684c8..14eb920 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -2147,7 +2147,6 @@
  * Implementation of the PKCS#1 v2.1 RSASSA-PSS-VERIFY function
  */
 int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
-                               int mode,
                                mbedtls_md_type_t md_alg,
                                unsigned int hashlen,
                                const unsigned char *hash,
@@ -2168,24 +2167,17 @@
     unsigned char buf[MBEDTLS_MPI_MAX_SIZE];
 
     RSA_VALIDATE_RET( ctx != NULL );
-    RSA_VALIDATE_RET( mode == MBEDTLS_RSA_PRIVATE ||
-                      mode == MBEDTLS_RSA_PUBLIC );
     RSA_VALIDATE_RET( sig != NULL );
     RSA_VALIDATE_RET( ( md_alg  == MBEDTLS_MD_NONE &&
                         hashlen == 0 ) ||
                       hash != NULL );
 
-    if( mode == MBEDTLS_RSA_PRIVATE && ctx->padding != MBEDTLS_RSA_PKCS_V21 )
-        return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
-
     siglen = ctx->len;
 
     if( siglen < 16 || siglen > sizeof( buf ) )
         return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
 
-    ret = ( mode == MBEDTLS_RSA_PUBLIC )
-          ? mbedtls_rsa_public(  ctx, sig, buf )
-          : mbedtls_rsa_private( ctx, NULL, NULL, sig, buf );
+    ret = mbedtls_rsa_public(  ctx, sig, buf );
 
     if( ret != 0 )
         return( ret );
@@ -2312,7 +2304,6 @@
                              : md_alg;
 
     return( mbedtls_rsa_rsassa_pss_verify_ext( ctx,
-                                               MBEDTLS_RSA_PUBLIC,
                                                md_alg, hashlen, hash,
                                                mgf1_hash_id,
                                                MBEDTLS_RSA_SALT_LEN_ANY,