yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-30 12:44:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use shared function for error translation

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2018-11-16 10:15:09 +01:00 committed by Hanno Becker
parent 1e48ebd306
commit f4427678ae
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/pk_wrap.c
View File

@ -761,30 +761,6 @@ static int pk_opaque_can_do( mbedtls_pk_type_t type )
type == MBEDTLS_PK_ECDSA ); type == MBEDTLS_PK_ECDSA );
} }
/* translate PSA errors to best PK approximation */
static int pk_err_from_psa( psa_status_t status )
{
switch( status )
{
case PSA_SUCCESS:
return( 0 );
case PSA_ERROR_NOT_SUPPORTED:
return( MBEDTLS_ERR_PK_FEATURE_UNAVAILABLE );
case PSA_ERROR_INSUFFICIENT_MEMORY:
return( MBEDTLS_ERR_PK_ALLOC_FAILED );
case PSA_ERROR_COMMUNICATION_FAILURE:
case PSA_ERROR_HARDWARE_FAILURE:
case PSA_ERROR_TAMPERING_DETECTED:
return( MBEDTLS_ERR_PK_HW_ACCEL_FAILED );
case PSA_ERROR_INSUFFICIENT_ENTROPY:
return( MBEDTLS_ERR_ECP_RANDOM_FAILED );
case PSA_ERROR_BAD_STATE:
return( MBEDTLS_ERR_PK_BAD_INPUT_DATA );
default: /* should never happen */
return( MBEDTLS_ERR_PK_HW_ACCEL_FAILED );
}
}
/* /*
* Simultaneously convert and move raw MPI from the beginning of a buffer * Simultaneously convert and move raw MPI from the beginning of a buffer
* to an ASN.1 MPI at the end of the buffer. * to an ASN.1 MPI at the end of the buffer.
@ -882,7 +858,7 @@ static int pk_opaque_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
* buggy anyway). */ * buggy anyway). */
status = psa_get_key_information( *key, NULL, &bits ); status = psa_get_key_information( *key, NULL, &bits );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( pk_err_from_psa( status ) ); return( mbedtls_psa_err_translate_pk( status ) );
buf_len = MBEDTLS_ECDSA_MAX_SIG_LEN( bits ); buf_len = MBEDTLS_ECDSA_MAX_SIG_LEN( bits );
@ -890,7 +866,7 @@ static int pk_opaque_sign_wrap( void *ctx, mbedtls_md_type_t md_alg,
status = psa_asymmetric_sign( *key, alg, hash, hash_len, status = psa_asymmetric_sign( *key, alg, hash, hash_len,
sig, buf_len, sig_len ); sig, buf_len, sig_len );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( pk_err_from_psa( status ) ); return( mbedtls_psa_err_translate_pk( status ) );
/* transcode it to ASN.1 sequence */ /* transcode it to ASN.1 sequence */
return( pk_ecdsa_sig_asn1_from_psa( sig, sig_len, buf_len ) ); return( pk_ecdsa_sig_asn1_from_psa( sig, sig_len, buf_len ) );