mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-04 13:20:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fail if a padding disabled by the build-time configuration is selected

Browse Source 
Signed-off-by: Ronald Cron <ronald.cron@arm.com>
This commit is contained in:
Ronald Cron 2021-06-08 10:22:28 +02:00
parent 266b6d2121
commit 3a0375fff4
3 changed files with 29 additions and 4 deletions
library
rsa.c
programs/pkey
rsa_sign_pss.c
tests/suites
test_suite_rsa.function

17
library/rsa.c

@ -500,9 +500,20 @@ void mbedtls_rsa_init( mbedtls_rsa_context *ctx )
int mbedtls_rsa_set_padding( mbedtls_rsa_context *ctx, int padding, int mbedtls_rsa_set_padding( mbedtls_rsa_context *ctx, int padding,
mbedtls_md_type_t hash_id ) mbedtls_md_type_t hash_id )
{ {
if( ( padding != MBEDTLS_RSA_PKCS_V15 ) && switch( padding )
( padding != MBEDTLS_RSA_PKCS_V21 ) ) {
return( MBEDTLS_ERR_RSA_INVALID_PADDING ); #if defined(MBEDTLS_PKCS1_V15)
case MBEDTLS_RSA_PKCS_V15:
break;
#endif
#if defined(MBEDTLS_PKCS1_V21)
case MBEDTLS_RSA_PKCS_V21:
break;
#endif
default:
return( MBEDTLS_ERR_RSA_INVALID_PADDING );
}
if( ( padding == MBEDTLS_RSA_PKCS_V21 ) && if( ( padding == MBEDTLS_RSA_PKCS_V21 ) &&
( hash_id != MBEDTLS_MD_NONE ) ) ( hash_id != MBEDTLS_MD_NONE ) )

2
programs/pkey/rsa_sign_pss.c

@ -119,7 +119,7 @@ int main( int argc, char *argv[] )
MBEDTLS_RSA_PKCS_V21, MBEDTLS_RSA_PKCS_V21,
MBEDTLS_MD_SHA256 ) ) != 0 ) MBEDTLS_MD_SHA256 ) ) != 0 )
{ {
mbedtls_printf( " failed\n ! Invalid padding\n" ); mbedtls_printf( " failed\n ! Padding not supported\n" );
goto exit; goto exit;
} }

14
tests/suites/test_suite_rsa.function

@ -36,6 +36,20 @@ void rsa_invalid_param( )
invalid_hash_id ), invalid_hash_id ),
MBEDTLS_ERR_RSA_INVALID_PADDING ); MBEDTLS_ERR_RSA_INVALID_PADDING );
#if !defined(MBEDTLS_PKCS1_V15)
TEST_EQUAL( mbedtls_rsa_set_padding( &ctx,
MBEDTLS_RSA_PKCS_V15,
MBEDTLS_MD_NONE ),
MBEDTLS_ERR_RSA_INVALID_PADDING );
#endif
#if !defined(MBEDTLS_PKCS1_V21)
TEST_EQUAL( mbedtls_rsa_set_padding( &ctx,
MBEDTLS_RSA_PKCS_V21,
MBEDTLS_MD_NONE ),
MBEDTLS_ERR_RSA_INVALID_PADDING );
#endif
exit: exit:
mbedtls_rsa_free( &ctx ); mbedtls_rsa_free( &ctx );
} }