lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Rename HMAC operation structure

Browse Source 
Prefix with 'mbedtls_psa' as per the other types which implement some
sort of algorithm in software.

Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
This commit is contained in:
Steven Cooreman
2021-04-29 17:49:11 +02:00
parent a2a1b803da
commit 4f7cae6cbe
5 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/psa_crypto.c
View File

@ -3406,7 +3406,7 @@ static psa_status_t psa_key_derivation_tls12_prf_generate_next_block(
{
psa_algorithm_t hash_alg = PSA_ALG_HKDF_GET_HASH( alg );
uint8_t hash_length = PSA_HASH_LENGTH( hash_alg );
psa_hmac_internal_data_t backup = MBEDTLS_PSA_HMAC_OPERATION_INIT;
mbedtls_psa_hmac_operation_t backup = MBEDTLS_PSA_HMAC_OPERATION_INIT;
psa_status_t status, cleanup_status;
/* We can't be wanting more output after block 0xff, otherwise

13
library/psa_crypto_mac.c
View File

@ -69,13 +69,13 @@ static size_t psa_get_hash_block_size( psa_algorithm_t alg )
}
}
psa_status_t psa_hmac_abort_internal( psa_hmac_internal_data_t *hmac )
psa_status_t psa_hmac_abort_internal( mbedtls_psa_hmac_operation_t *hmac )
{
mbedtls_platform_zeroize( hmac->opad, sizeof( hmac->opad ) );
return( psa_hash_abort( &hmac->hash_ctx ) );
}
psa_status_t psa_hmac_setup_internal( psa_hmac_internal_data_t *hmac,
psa_status_t psa_hmac_setup_internal( mbedtls_psa_hmac_operation_t *hmac,
const uint8_t *key,
size_t key_length,
psa_algorithm_t hash_alg )
@ -139,14 +139,14 @@ cleanup:
return( status );
}
psa_status_t psa_hmac_update_internal( psa_hmac_internal_data_t *hmac,
psa_status_t psa_hmac_update_internal( mbedtls_psa_hmac_operation_t *hmac,
const uint8_t *data,
size_t data_length )
{
return( psa_hash_update( &hmac->hash_ctx, data, data_length ) );
}
psa_status_t psa_hmac_finish_internal( psa_hmac_internal_data_t *hmac,
psa_status_t psa_hmac_finish_internal( mbedtls_psa_hmac_operation_t *hmac,
uint8_t *mac,
size_t mac_size )
{
@ -184,8 +184,9 @@ exit:
return( status );
}
psa_status_t psa_hmac_clone_internal( const psa_hmac_internal_data_t *source,
psa_hmac_internal_data_t *destination )
psa_status_t psa_hmac_clone_internal(
const mbedtls_psa_hmac_operation_t *source,
mbedtls_psa_hmac_operation_t *destination )
{
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;

13
library/psa_crypto_mac.h
View File

@ -39,7 +39,7 @@
* \return Any error code reported by psa_hash_compute(), psa_hash_setup() or
* psa_hash_update().
*/
psa_status_t psa_hmac_setup_internal( psa_hmac_internal_data_t *hmac,
psa_status_t psa_hmac_setup_internal( mbedtls_psa_hmac_operation_t *hmac,
const uint8_t *key,
size_t key_length,
psa_algorithm_t hash_alg );
@ -59,7 +59,7 @@ psa_status_t psa_hmac_setup_internal( psa_hmac_internal_data_t *hmac,
* Success.
* \return Any error code reported by psa_hash_update().
*/
psa_status_t psa_hmac_update_internal( psa_hmac_internal_data_t *hmac,
psa_status_t psa_hmac_update_internal( mbedtls_psa_hmac_operation_t *hmac,
const uint8_t *data,
size_t data_length );
@ -78,7 +78,7 @@ psa_status_t psa_hmac_update_internal( psa_hmac_internal_data_t *hmac,
* \return Any error code reported by psa_hash_setup(), psa_hash_update() or
* psa_hash_finish().
*/
psa_status_t psa_hmac_finish_internal( psa_hmac_internal_data_t *hmac,
psa_status_t psa_hmac_finish_internal( mbedtls_psa_hmac_operation_t *hmac,
uint8_t *mac,
size_t mac_size );
@ -96,8 +96,9 @@ psa_status_t psa_hmac_finish_internal( psa_hmac_internal_data_t *hmac,
* Success.
* \return Any error code reported by psa_hash_clone().
*/
psa_status_t psa_hmac_clone_internal( const psa_hmac_internal_data_t *source,
psa_hmac_internal_data_t *destination );
psa_status_t psa_hmac_clone_internal(
const mbedtls_psa_hmac_operation_t *source,
mbedtls_psa_hmac_operation_t *destination );
/** Internal API for aborting an HMAC operation, using PSA hash primitives.
*
@ -110,7 +111,7 @@ psa_status_t psa_hmac_clone_internal( const psa_hmac_internal_data_t *source,
* Success.
* \return Any error code reported by psa_hash_abort().
*/
psa_status_t psa_hmac_abort_internal( psa_hmac_internal_data_t *hmac );
psa_status_t psa_hmac_abort_internal( mbedtls_psa_hmac_operation_t *hmac );
/** Calculate the MAC (message authentication code) of a message using Mbed TLS.
*