commit 578e9abcbda986bcdc48fb76a010f12278a874b7
author Thomas Daubney <thomas.daubney@arm.com> Wed May 19 12:14:57 2021 +0100
committer Thomas Daubney <thomas.daubney@arm.com> Wed May 19 12:14:57 2021 +0100
tree d764ff002ebaa87c4f08b7a18d849fb327c0c095
parent 5ee4cc031c590df8fb4e5c36c2652af9d9d80e34

Removes p_rng param from mbedtls_rsa_rsassa_pss_verify_ext

Commit removes p_rng parameter from the
mbedtls_rsa_rsassa_pss_verify_ext function
in preparation for removal of the mode
parameter.

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

library/pk.c

diff --git a/library/pk.c b/library/pk.c
index 6d29663..e0dedec 100644
--- a/library/pk.c
+++ b/library/pk.c
@@ -367,7 +367,7 @@
             return( MBEDTLS_ERR_RSA_VERIFY_FAILED );
 
         ret = mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_pk_rsa( *ctx ),
-                NULL, NULL, MBEDTLS_RSA_PUBLIC,
+                NULL, MBEDTLS_RSA_PUBLIC,
                 md_alg, (unsigned int) hash_len, hash,
                 pss_opts->mgf1_hash_id,
                 pss_opts->expected_salt_len,

library/rsa.c

diff --git a/library/rsa.c b/library/rsa.c
index d3b4bf0..6b18fe7 100644
--- a/library/rsa.c
+++ b/library/rsa.c
@@ -2148,7 +2148,6 @@
  */
 int mbedtls_rsa_rsassa_pss_verify_ext( mbedtls_rsa_context *ctx,
                                int (*f_rng)(void *, unsigned char *, size_t),
-                               void *p_rng,
                                int mode,
                                mbedtls_md_type_t md_alg,
                                unsigned int hashlen,
@@ -2187,7 +2186,7 @@
 
     ret = ( mode == MBEDTLS_RSA_PUBLIC )
           ? mbedtls_rsa_public(  ctx, sig, buf )
-          : mbedtls_rsa_private( ctx, f_rng, p_rng, sig, buf );
+          : mbedtls_rsa_private( ctx, f_rng, NULL, sig, buf );
 
     if( ret != 0 )
         return( ret );
@@ -2313,7 +2312,7 @@
                              ? (mbedtls_md_type_t) ctx->hash_id
                              : md_alg;
 
-    return( mbedtls_rsa_rsassa_pss_verify_ext( ctx, NULL, NULL,
+    return( mbedtls_rsa_rsassa_pss_verify_ext( ctx, NULL,
                                                MBEDTLS_RSA_PUBLIC,
                                                md_alg, hashlen, hash,
                                                mgf1_hash_id,