commit ac1331211e9f9c9d371a8e327c2fc8a95e90b239
author Thomas Daubney <thomas.daubney@arm.com> Tue May 18 19:26:39 2021 +0100
committer Thomas Daubney <thomas.daubney@arm.com> Tue May 18 20:07:13 2021 +0100
tree e6ecb01a06dd591a168bf039491d5b412d37733d
parent 28b55850bdf836d83fe240a455c819a7f3bd7174

Removes f_rng parameter from mbedtls_rsa_pkcs1_verify

Commit removes f_rng parameter from
mbedtls_rsa_pkcs1_verify as a prerequisite
to removing the mode parameter. f_rng no
longer has relevance in this function if
mode is removed.

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

library/pk_wrap.c

diff --git a/library/pk_wrap.c b/library/pk_wrap.c
index 9f4c187..fbcfdb1 100644
--- a/library/pk_wrap.c
+++ b/library/pk_wrap.c
@@ -90,7 +90,7 @@
     if( sig_len < rsa_len )
         return( MBEDTLS_ERR_RSA_VERIFY_FAILED );
 
-    if( ( ret = mbedtls_rsa_pkcs1_verify( rsa, NULL, NULL,
+    if( ( ret = mbedtls_rsa_pkcs1_verify( rsa, NULL,
                                   MBEDTLS_RSA_PUBLIC, md_alg,
                                   (unsigned int) hash_len, hash, sig ) ) != 0 )
         return( ret );

library/psa_crypto_rsa.c

diff --git a/library/psa_crypto_rsa.c b/library/psa_crypto_rsa.c
index 4f41596..1ab57c6 100644
--- a/library/psa_crypto_rsa.c
+++ b/library/psa_crypto_rsa.c
@@ -490,7 +490,6 @@
         mbedtls_rsa_set_padding( rsa, MBEDTLS_RSA_PKCS_V15,
                                  MBEDTLS_MD_NONE );
         ret = mbedtls_rsa_pkcs1_verify( rsa,
-                                        mbedtls_psa_get_random,
                                         MBEDTLS_PSA_RANDOM_STATE,
                                         MBEDTLS_RSA_PUBLIC,
                                         md_alg,

library/rsa.c

diff --git a/library/rsa.c b/library/rsa.c
index b241b8f..7545a79 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -2414,7 +2414,6 @@
  * Do an RSA operation and check the message digest
  */
 int mbedtls_rsa_pkcs1_verify( mbedtls_rsa_context *ctx,
-                      int (*f_rng)(void *, unsigned char *, size_t),
                       void *p_rng,
                       int mode,
                       mbedtls_md_type_t md_alg,
@@ -2434,13 +2433,13 @@
     {
 #if defined(MBEDTLS_PKCS1_V15)
         case MBEDTLS_RSA_PKCS_V15:
-            return mbedtls_rsa_rsassa_pkcs1_v15_verify( ctx, f_rng, p_rng, mode, md_alg,
+            return mbedtls_rsa_rsassa_pkcs1_v15_verify( ctx, NULL, p_rng, mode, md_alg,
                                                 hashlen, hash, sig );
 #endif
 
 #if defined(MBEDTLS_PKCS1_V21)
         case MBEDTLS_RSA_PKCS_V21:
-            return mbedtls_rsa_rsassa_pss_verify( ctx, f_rng, p_rng, mode, md_alg,
+            return mbedtls_rsa_rsassa_pss_verify( ctx, NULL, p_rng, mode, md_alg,
                                           hashlen, hash, sig );
 #endif
 
@@ -2707,7 +2706,7 @@
     if( verbose != 0 )
         mbedtls_printf( "passed\n  PKCS#1 sig. verify: " );
 
-    if( mbedtls_rsa_pkcs1_verify( &rsa, NULL, NULL,
+    if( mbedtls_rsa_pkcs1_verify( &rsa, NULL,
                                   MBEDTLS_RSA_PUBLIC, MBEDTLS_MD_SHA1, 0,
                                   sha1sum, rsa_ciphertext ) != 0 )
     {