yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-03-29 11:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make HKDF use the generic MAC API

Browse source 
Such that the underlying HMAC can be accelerated if such a driver is present

Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
This commit is contained in:
Steven Cooreman 2021-04-29 19:11:25 +02:00
parent c2cbac017f
commit b27e3506fe
2 changed files with 68 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/psa/crypto_struct.h
View file

@ -173,7 +173,7 @@ typedef struct
{ {
uint8_t *info; uint8_t *info;
size_t info_length; size_t info_length;
mbedtls_psa_hmac_operation_t hmac; psa_mac_operation_t hmac;
uint8_t prk[PSA_HASH_MAX_SIZE]; uint8_t prk[PSA_HASH_MAX_SIZE];
uint8_t output_block[PSA_HASH_MAX_SIZE]; uint8_t output_block[PSA_HASH_MAX_SIZE];
#if PSA_HASH_MAX_SIZE > 0xff #if PSA_HASH_MAX_SIZE > 0xff

100
library/psa_crypto.c
View file

@ -3264,7 +3264,7 @@ psa_status_t psa_key_derivation_abort( psa_key_derivation_operation_t *operation
if( PSA_ALG_IS_HKDF( kdf_alg ) ) if( PSA_ALG_IS_HKDF( kdf_alg ) )
{ {
mbedtls_free( operation->ctx.hkdf.info ); mbedtls_free( operation->ctx.hkdf.info );
status = psa_hmac_abort_internal( &operation->ctx.hkdf.hmac ); status = psa_mac_abort( &operation->ctx.hkdf.hmac );
} }
else else
#endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_HKDF */ #endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_HKDF */
@ -3331,11 +3331,12 @@ psa_status_t psa_key_derivation_set_capacity( psa_key_derivation_operation_t *op
/* Read some bytes from an HKDF-based operation. This performs a chunk /* Read some bytes from an HKDF-based operation. This performs a chunk
* of the expand phase of the HKDF algorithm. */ * of the expand phase of the HKDF algorithm. */
static psa_status_t psa_key_derivation_hkdf_read( psa_hkdf_key_derivation_t *hkdf, static psa_status_t psa_key_derivation_hkdf_read( psa_hkdf_key_derivation_t *hkdf,
psa_algorithm_t hash_alg, psa_algorithm_t hash_alg,
uint8_t *output, uint8_t *output,
size_t output_length ) size_t output_length )
{ {
uint8_t hash_length = PSA_HASH_LENGTH( hash_alg ); uint8_t hash_length = PSA_HASH_LENGTH( hash_alg );
size_t hmac_output_length;
psa_status_t status; psa_status_t status;
if( hkdf->state < HKDF_STATE_KEYED || ! hkdf->info_set ) if( hkdf->state < HKDF_STATE_KEYED || ! hkdf->info_set )
@ -3365,31 +3366,42 @@ static psa_status_t psa_key_derivation_hkdf_read( psa_hkdf_key_derivation_t *hkd
/* We need a new block */ /* We need a new block */
++hkdf->block_number; ++hkdf->block_number;
hkdf->offset_in_block = 0; hkdf->offset_in_block = 0;
status = psa_hmac_setup_internal( &hkdf->hmac,
hkdf->prk, hash_length, psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
hash_alg ); psa_set_key_type( &attributes, PSA_KEY_TYPE_HMAC );
psa_set_key_bits( &attributes,
PSA_BYTES_TO_BITS( hash_length ) );
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_SIGN_HASH );
status = psa_driver_wrapper_mac_sign_setup( &hkdf->hmac,
&attributes,
hkdf->prk, hash_length,
PSA_ALG_HMAC( hash_alg ) );
psa_reset_key_attributes( &attributes );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
if( hkdf->block_number != 1 ) if( hkdf->block_number != 1 )
{ {
status = psa_hmac_update_internal( &hkdf->hmac, status = psa_mac_update( &hkdf->hmac,
hkdf->output_block, hkdf->output_block,
hash_length ); hash_length );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
} }
status = psa_hmac_update_internal( &hkdf->hmac, status = psa_mac_update( &hkdf->hmac,
hkdf->info, hkdf->info,
hkdf->info_length ); hkdf->info_length );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
status = psa_hmac_update_internal( &hkdf->hmac, status = psa_mac_update( &hkdf->hmac,
&hkdf->block_number, 1 ); &hkdf->block_number, 1 );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
status = psa_hmac_finish_internal( &hkdf->hmac, status = psa_mac_sign_finish( &hkdf->hmac,
hkdf->output_block, hkdf->output_block,
sizeof( hkdf->output_block ) ); sizeof( hkdf->output_block ),
&hmac_output_length );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
} }
@ -3829,33 +3841,55 @@ static psa_status_t psa_hkdf_input( psa_hkdf_key_derivation_t *hkdf,
case PSA_KEY_DERIVATION_INPUT_SALT: case PSA_KEY_DERIVATION_INPUT_SALT:
if( hkdf->state != HKDF_STATE_INIT ) if( hkdf->state != HKDF_STATE_INIT )
return( PSA_ERROR_BAD_STATE ); return( PSA_ERROR_BAD_STATE );
status = psa_hmac_setup_internal( &hkdf->hmac, else
data, data_length, {
hash_alg ); /* In a scope block due to scope-local attributes variable */
if( status != PSA_SUCCESS ) psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
return( status ); psa_set_key_type( &attributes, PSA_KEY_TYPE_HMAC );
hkdf->state = HKDF_STATE_STARTED; psa_set_key_bits( &attributes,
return( PSA_SUCCESS ); PSA_BYTES_TO_BITS( data_length ) );
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_SIGN_HASH );
status = psa_driver_wrapper_mac_sign_setup(
&hkdf->hmac,
&attributes,
data, data_length,
PSA_ALG_HMAC( hash_alg ) );
psa_reset_key_attributes( &attributes );
if( status != PSA_SUCCESS )
return( status );
hkdf->state = HKDF_STATE_STARTED;
return( PSA_SUCCESS );
}
case PSA_KEY_DERIVATION_INPUT_SECRET: case PSA_KEY_DERIVATION_INPUT_SECRET:
/* If no salt was provided, use an empty salt. */ /* If no salt was provided, use an empty salt. */
if( hkdf->state == HKDF_STATE_INIT ) if( hkdf->state == HKDF_STATE_INIT )
{ {
status = psa_hmac_setup_internal( &hkdf->hmac, psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
NULL, 0, psa_set_key_type( &attributes, PSA_KEY_TYPE_HMAC );
hash_alg ); psa_set_key_bits( &attributes, 0 );
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_SIGN_HASH );
status = psa_driver_wrapper_mac_sign_setup(
&hkdf->hmac,
&attributes,
NULL, 0,
PSA_ALG_HMAC( hash_alg ) );
psa_reset_key_attributes( &attributes );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
hkdf->state = HKDF_STATE_STARTED; hkdf->state = HKDF_STATE_STARTED;
} }
if( hkdf->state != HKDF_STATE_STARTED ) if( hkdf->state != HKDF_STATE_STARTED )
return( PSA_ERROR_BAD_STATE ); return( PSA_ERROR_BAD_STATE );
status = psa_hmac_update_internal( &hkdf->hmac, status = psa_mac_update( &hkdf->hmac,
data, data_length ); data, data_length );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
status = psa_hmac_finish_internal( &hkdf->hmac, status = psa_mac_sign_finish( &hkdf->hmac,
hkdf->prk, hkdf->prk,
sizeof( hkdf->prk ) ); sizeof( hkdf->prk ),
&data_length );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
hkdf->offset_in_block = PSA_HASH_LENGTH( hash_alg ); hkdf->offset_in_block = PSA_HASH_LENGTH( hash_alg );