cuberite/polarssl
1
0
Fork 0
mirror of https://github.com/cuberite/polarssl.git synced 2025-10-15 00:33:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Simplify padding check and get rid of psa_sig_md in rsa_decrypt_wrap()

Browse Source 
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2022-03-16 15:30:31 +01:00
parent 169e61add6
commit 8e80504b46
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/pk_wrap.c
View File

@ -227,24 +227,14 @@ static int rsa_decrypt_wrap( void *ctx,
int key_len; int key_len;
unsigned char buf[MBEDTLS_PK_RSA_PRV_DER_MAX_BYTES]; unsigned char buf[MBEDTLS_PK_RSA_PRV_DER_MAX_BYTES];
mbedtls_pk_info_t pk_info = mbedtls_rsa_info; mbedtls_pk_info_t pk_info = mbedtls_rsa_info;
psa_algorithm_t psa_sig_md;
((void) f_rng); ((void) f_rng);
((void) p_rng); ((void) p_rng);
#if !defined(MBEDTLS_RSA_ALT) #if !defined(MBEDTLS_RSA_ALT)
switch( rsa->padding ) if( rsa->padding != MBEDTLS_RSA_PKCS_V15 )
{ return( MBEDTLS_ERR_RSA_INVALID_PADDING );
case MBEDTLS_RSA_PKCS_V15: #endif /* !MBEDTLS_RSA_ALT */
psa_sig_md = PSA_ALG_RSA_PKCS1V15_CRYPT;
break;
default:
return( MBEDTLS_ERR_RSA_INVALID_PADDING );
}
#else
psa_sig_md = PSA_ALG_RSA_PKCS1V15_CRYPT;
#endif
if( ilen != mbedtls_rsa_get_len( rsa ) ) if( ilen != mbedtls_rsa_get_len( rsa ) )
return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA ); return( MBEDTLS_ERR_RSA_BAD_INPUT_DATA );
@ -259,7 +249,7 @@ static int rsa_decrypt_wrap( void *ctx,
psa_set_key_type( &attributes, PSA_KEY_TYPE_RSA_KEY_PAIR ); psa_set_key_type( &attributes, PSA_KEY_TYPE_RSA_KEY_PAIR );
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_DECRYPT ); psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_DECRYPT );
psa_set_key_algorithm( &attributes, psa_sig_md ); psa_set_key_algorithm( &attributes, PSA_ALG_RSA_PKCS1V15_CRYPT );
status = psa_import_key( &attributes, status = psa_import_key( &attributes,
buf + sizeof( buf ) - key_len, key_len, buf + sizeof( buf ) - key_len, key_len,
@ -270,8 +260,10 @@ static int rsa_decrypt_wrap( void *ctx,
goto cleanup; goto cleanup;
} }
status = psa_asymmetric_decrypt( key_id, psa_sig_md, input, ilen, status = psa_asymmetric_decrypt( key_id, PSA_ALG_RSA_PKCS1V15_CRYPT,
NULL, 0, output, osize, olen ); input, ilen,
NULL, 0,
output, osize, olen );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
{ {
ret = mbedtls_pk_error_from_psa_rsa( status ); ret = mbedtls_pk_error_from_psa_rsa( status );