eden-emu/mbedtls
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed f_rng param from mbedtls_rsa_rsassa_pss_verify

Browse source 
Commit removes f_rng parameter from
mbedtls_rsa_rsassa_pss_verify function in
preparation of mode parameter removal.

Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
This commit is contained in:
Thomas Daubney 2021-05-19 12:01:35 +01:00
parent 08f4c9c571
commit 718a53db2c
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/mbedtls/rsa.h
View file

@ -1054,9 +1054,6 @@ int mbedtls_rsa_rsassa_pkcs1_v15_verify( mbedtls_rsa_context *ctx,
* return #MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED. * return #MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED.
* *
* \param ctx The initialized RSA public key context to use. * \param ctx The initialized RSA public key context to use.
* \param f_rng The RNG function to use. If \p mode is #MBEDTLS_RSA_PRIVATE,
* this is used for blinding and should be provided; see
* mbedtls_rsa_private() for more. Otherwise, it is ignored.
* \param mode The mode of operation. This must be either * \param mode The mode of operation. This must be either
* #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE (deprecated). * #MBEDTLS_RSA_PUBLIC or #MBEDTLS_RSA_PRIVATE (deprecated).
* \param md_alg The message-digest algorithm used to hash the original data. * \param md_alg The message-digest algorithm used to hash the original data.
@ -1076,7 +1073,6 @@ int mbedtls_rsa_rsassa_pkcs1_v15_verify( mbedtls_rsa_context *ctx,
* \return An \c MBEDTLS_ERR_RSA_XXX error code on failure. * \return An \c MBEDTLS_ERR_RSA_XXX error code on failure.
*/ */
int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx, int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx,
int (*f_rng)(void *, unsigned char *, size_t),
int mode, int mode,
mbedtls_md_type_t md_alg, mbedtls_md_type_t md_alg,
unsigned int hashlen, unsigned int hashlen,

1
library/psa_crypto_rsa.c
View file

@ -502,7 +502,6 @@ static psa_status_t rsa_verify_hash(
{ {
mbedtls_rsa_set_padding( rsa, MBEDTLS_RSA_PKCS_V21, md_alg ); mbedtls_rsa_set_padding( rsa, MBEDTLS_RSA_PKCS_V21, md_alg );
ret = mbedtls_rsa_rsassa_pss_verify( rsa, ret = mbedtls_rsa_rsassa_pss_verify( rsa,
mbedtls_psa_get_random,
MBEDTLS_RSA_PUBLIC, MBEDTLS_RSA_PUBLIC,
MBEDTLS_MD_NONE, MBEDTLS_MD_NONE,
(unsigned int) hash_length, (unsigned int) hash_length,

5
library/rsa.c
View file

@ -2297,7 +2297,6 @@ exit:
* Simplified PKCS#1 v2.1 RSASSA-PSS-VERIFY function * Simplified PKCS#1 v2.1 RSASSA-PSS-VERIFY function
*/ */
int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx, int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx,
int (*f_rng)(void *, unsigned char *, size_t),
int mode, int mode,
mbedtls_md_type_t md_alg, mbedtls_md_type_t md_alg,
unsigned int hashlen, unsigned int hashlen,
@ -2317,7 +2316,7 @@ int mbedtls_rsa_rsassa_pss_verify( mbedtls_rsa_context *ctx,
? (mbedtls_md_type_t) ctx->hash_id ? (mbedtls_md_type_t) ctx->hash_id
: md_alg; : md_alg;
return( mbedtls_rsa_rsassa_pss_verify_ext( ctx, f_rng, NULL, mode, return( mbedtls_rsa_rsassa_pss_verify_ext( ctx, NULL, NULL, mode,
md_alg, hashlen, hash, md_alg, hashlen, hash,
mgf1_hash_id, MBEDTLS_RSA_SALT_LEN_ANY, mgf1_hash_id, MBEDTLS_RSA_SALT_LEN_ANY,
sig ) ); sig ) );
@ -2424,7 +2423,7 @@ int mbedtls_rsa_pkcs1_verify( mbedtls_rsa_context *ctx,
#if defined(MBEDTLS_PKCS1_V21) #if defined(MBEDTLS_PKCS1_V21)
case MBEDTLS_RSA_PKCS_V21: case MBEDTLS_RSA_PKCS_V21:
return mbedtls_rsa_rsassa_pss_verify( ctx, NULL, MBEDTLS_RSA_PUBLIC, md_alg, return mbedtls_rsa_rsassa_pss_verify( ctx, MBEDTLS_RSA_PUBLIC, md_alg,
hashlen, hash, sig ); hashlen, hash, sig );
#endif #endif

8
tests/suites/test_suite_rsa.function
View file

@ -315,22 +315,22 @@ void rsa_invalid_param( )
buf ) ); buf ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA, TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA,
mbedtls_rsa_rsassa_pss_verify( NULL, NULL, mbedtls_rsa_rsassa_pss_verify( NULL,
MBEDTLS_RSA_PUBLIC, MBEDTLS_RSA_PUBLIC,
0, sizeof( buf ), 0, sizeof( buf ),
buf, buf ) ); buf, buf ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA, TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA,
mbedtls_rsa_rsassa_pss_verify( &ctx, NULL, mbedtls_rsa_rsassa_pss_verify( &ctx,
MBEDTLS_RSA_PUBLIC, MBEDTLS_RSA_PUBLIC,
0, sizeof( buf ), 0, sizeof( buf ),
NULL, buf ) ); NULL, buf ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA, TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA,
mbedtls_rsa_rsassa_pss_verify( &ctx, NULL, mbedtls_rsa_rsassa_pss_verify( &ctx,
MBEDTLS_RSA_PUBLIC, MBEDTLS_RSA_PUBLIC,
0, sizeof( buf ), 0, sizeof( buf ),
buf, NULL ) ); buf, NULL ) );
TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA, TEST_INVALID_PARAM_RET( MBEDTLS_ERR_RSA_BAD_INPUT_DATA,
mbedtls_rsa_rsassa_pss_verify( &ctx, NULL, mbedtls_rsa_rsassa_pss_verify( &ctx,
MBEDTLS_RSA_PUBLIC, MBEDTLS_RSA_PUBLIC,
MBEDTLS_MD_SHA1, MBEDTLS_MD_SHA1,
0, NULL, 0, NULL,