mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-02-11 00:40:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move raw key derivation input to a new function

Browse Source
This commit is contained in:
Janos Follath 2019-06-12 16:05:43 +01:00
parent b80a94e2ea
commit ef83f5e98e
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
library/psa_crypto.c
View File

@ -4791,6 +4791,25 @@ static psa_status_t psa_tls12_prf_input( psa_tls12_prf_key_derivation_t *prf,
#endif /* PSA_PRE_1_0_KEY_DERIVATION */ #endif /* PSA_PRE_1_0_KEY_DERIVATION */
#endif /* MBEDTLS_MD_C */ #endif /* MBEDTLS_MD_C */
static psa_status_t psa_key_derivation_input_raw(
psa_key_derivation_operation_t *operation,
const uint8_t *data,
size_t data_length )
{
if( operation->capacity != 0 )
return( PSA_ERROR_INVALID_ARGUMENT );
operation->ctx.buffer.data = mbedtls_calloc( 1, data_length );
if( operation->ctx.buffer.data == NULL )
return( PSA_ERROR_INSUFFICIENT_MEMORY );
memcpy( operation->ctx.buffer.data, data, data_length );
operation->ctx.buffer.size = data_length;
operation->capacity = data_length;
return PSA_SUCCESS;
}
static psa_status_t psa_key_derivation_input_internal( static psa_status_t psa_key_derivation_input_internal(
psa_key_derivation_operation_t *operation, psa_key_derivation_operation_t *operation,
psa_key_derivation_step_t step, psa_key_derivation_step_t step,
@ -4802,15 +4821,7 @@ static psa_status_t psa_key_derivation_input_internal(
if( kdf_alg == PSA_ALG_SELECT_RAW ) if( kdf_alg == PSA_ALG_SELECT_RAW )
{ {
if( operation->capacity != 0 ) status = psa_key_derivation_input_raw( operation, data, data_length );
return( PSA_ERROR_INVALID_ARGUMENT );
operation->ctx.buffer.data = mbedtls_calloc( 1, data_length );
if( operation->ctx.buffer.data == NULL )
return( PSA_ERROR_INSUFFICIENT_MEMORY );
memcpy( operation->ctx.buffer.data, data, data_length );
operation->ctx.buffer.size = data_length;
operation->capacity = data_length;
status = PSA_SUCCESS;
} }
else else
#if defined(MBEDTLS_MD_C) #if defined(MBEDTLS_MD_C)