yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Introduce and use mbedtls_ecjpake_to_psa_error() to translate various ECP/MPI errors to expected PSA errors

Browse source 
Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
This commit is contained in:
Neil Armstrong 2022-06-15 15:25:45 +02:00
parent 1e855601ca
commit db05cbfb86
1 changed files with 29 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
library/psa_crypto_pake.c
View file

@ -113,6 +113,29 @@ enum psa_pake_sequence
PSA_PAKE_SEQ_END = 7, PSA_PAKE_SEQ_END = 7,
}; };
#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
static psa_status_t mbedtls_ecjpake_to_psa_error( int ret )
{
switch( ret )
{
case MBEDTLS_ERR_MPI_BAD_INPUT_DATA:
case MBEDTLS_ERR_ECP_BAD_INPUT_DATA:
case MBEDTLS_ERR_ECP_INVALID_KEY:
case MBEDTLS_ERR_ECP_VERIFY_FAILED:
return( PSA_ERROR_DATA_INVALID );
case MBEDTLS_ERR_MPI_BUFFER_TOO_SMALL:
case MBEDTLS_ERR_ECP_BUFFER_TOO_SMALL:
return( PSA_ERROR_BUFFER_TOO_SMALL );
case MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE:
return( PSA_ERROR_NOT_SUPPORTED );
case MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED:
return( PSA_ERROR_CORRUPTION_DETECTED );
default:
return( PSA_ERROR_GENERIC_ERROR );
}
}
#endif
#if defined(MBEDTLS_PSA_BUILTIN_PAKE) #if defined(MBEDTLS_PSA_BUILTIN_PAKE)
psa_status_t psa_pake_setup( psa_pake_operation_t *operation, psa_status_t psa_pake_setup( psa_pake_operation_t *operation,
const psa_pake_cipher_suite_t *cipher_suite) const psa_pake_cipher_suite_t *cipher_suite)
@ -297,7 +320,7 @@ static psa_status_t psa_pake_ecjpake_setup( psa_pake_operation_t *operation )
slot = NULL; slot = NULL;
if( ret != 0 ) if( ret != 0 )
return( mbedtls_to_psa_error( ret ) ); return( mbedtls_ecjpake_to_psa_error( ret ) );
operation->buffer = mbedtls_calloc( 1, PSA_PAKE_BUFFER_SIZE ); operation->buffer = mbedtls_calloc( 1, PSA_PAKE_BUFFER_SIZE );
if( operation->buffer == NULL ) if( operation->buffer == NULL )
@ -415,7 +438,7 @@ psa_status_t psa_pake_output( psa_pake_operation_t *operation,
if( ret != 0 ) if( ret != 0 )
{ {
psa_pake_abort( operation ); psa_pake_abort( operation );
return( mbedtls_to_psa_error( ret ) ); return( mbedtls_ecjpake_to_psa_error( ret ) );
} }
operation->buffer_offset = 0; operation->buffer_offset = 0;
@ -432,7 +455,7 @@ psa_status_t psa_pake_output( psa_pake_operation_t *operation,
if( ret != 0 ) if( ret != 0 )
{ {
psa_pake_abort( operation ); psa_pake_abort( operation );
return( mbedtls_to_psa_error( ret ) ); return( mbedtls_ecjpake_to_psa_error( ret ) );
} }
operation->buffer_offset = 0; operation->buffer_offset = 0;
@ -613,7 +636,7 @@ psa_status_t psa_pake_input( psa_pake_operation_t *operation,
if( ret != 0 ) if( ret != 0 )
{ {
psa_pake_abort( operation ); psa_pake_abort( operation );
return( mbedtls_to_psa_error( ret ) ); return( mbedtls_ecjpake_to_psa_error( ret ) );
} }
} }
else if( operation->state == PSA_PAKE_INPUT_X4S && else if( operation->state == PSA_PAKE_INPUT_X4S &&
@ -629,7 +652,7 @@ psa_status_t psa_pake_input( psa_pake_operation_t *operation,
if( ret != 0 ) if( ret != 0 )
{ {
psa_pake_abort( operation ); psa_pake_abort( operation );
return( mbedtls_to_psa_error( ret ) ); return( mbedtls_ecjpake_to_psa_error( ret ) );
} }
} }
@ -676,7 +699,7 @@ psa_status_t psa_pake_get_implicit_key(psa_pake_operation_t *operation,
if( ret != 0) if( ret != 0)
{ {
psa_pake_abort( operation ); psa_pake_abort( operation );
return( mbedtls_to_psa_error( ret ) ); return( mbedtls_ecjpake_to_psa_error( ret ) );
} }
status = psa_key_derivation_input_bytes( output, status = psa_key_derivation_input_bytes( output,