Move the MAC operation structure into the driver headers
Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index c153217..ed847b2 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -2277,7 +2277,7 @@
/* Initialize the MAC operation structure. Once this function has been
* called, psa_mac_abort can run and will do the right thing. */
-static psa_status_t psa_mac_init( psa_mac_operation_t *operation,
+static psa_status_t psa_mac_init( mbedtls_psa_mac_operation_t *operation,
psa_algorithm_t alg )
{
psa_status_t status = PSA_ERROR_NOT_SUPPORTED;
@@ -2325,8 +2325,11 @@
}
#endif /* MBEDTLS_PSA_BUILTIN_ALG_HMAC */
-psa_status_t psa_mac_abort( psa_mac_operation_t *operation )
+psa_status_t psa_mac_abort( psa_mac_operation_t *psa_operation )
{
+ /* Temporary recast to avoid changing a lot of lines */
+ mbedtls_psa_mac_operation_t* operation = &psa_operation->ctx.mbedtls_ctx;
+
if( operation->alg == 0 )
{
/* The object has (apparently) been initialized but it is not
@@ -2374,7 +2377,7 @@
}
#if defined(MBEDTLS_PSA_BUILTIN_ALG_CMAC)
-static psa_status_t psa_cmac_setup( psa_mac_operation_t *operation,
+static psa_status_t psa_cmac_setup( mbedtls_psa_mac_operation_t *operation,
psa_key_slot_t *slot )
{
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
@@ -2463,7 +2466,7 @@
}
#endif /* MBEDTLS_PSA_BUILTIN_ALG_HMAC */
-static psa_status_t psa_mac_setup( psa_mac_operation_t *operation,
+static psa_status_t psa_mac_setup( psa_mac_operation_t *psa_operation,
mbedtls_svc_key_id_t key,
psa_algorithm_t alg,
int is_sign )
@@ -2474,6 +2477,9 @@
psa_key_usage_t usage =
is_sign ? PSA_KEY_USAGE_SIGN_HASH : PSA_KEY_USAGE_VERIFY_HASH;
+ /* Temporary recast to avoid changing a lot of lines */
+ mbedtls_psa_mac_operation_t* operation = &psa_operation->ctx.mbedtls_ctx;
+
/* A context must be freshly initialized before it can be set up. */
if( operation->alg != 0 )
{
@@ -2557,7 +2563,7 @@
exit:
if( status != PSA_SUCCESS )
{
- psa_mac_abort( operation );
+ psa_mac_abort( psa_operation );
}
else
{
@@ -2583,10 +2589,13 @@
return( psa_mac_setup( operation, key, alg, 0 ) );
}
-psa_status_t psa_mac_update( psa_mac_operation_t *operation,
+psa_status_t psa_mac_update( psa_mac_operation_t *psa_operation,
const uint8_t *input,
size_t input_length )
{
+ /* Temporary recast to avoid changing a lot of lines */
+ mbedtls_psa_mac_operation_t* operation = &psa_operation->ctx.mbedtls_ctx;
+
psa_status_t status = PSA_ERROR_BAD_STATE;
if( ! operation->key_set )
return( PSA_ERROR_BAD_STATE );
@@ -2618,7 +2627,7 @@
}
if( status != PSA_SUCCESS )
- psa_mac_abort( operation );
+ psa_mac_abort( psa_operation );
return( status );
}
@@ -2662,7 +2671,7 @@
}
#endif /* MBEDTLS_PSA_BUILTIN_ALG_HMAC */
-static psa_status_t psa_mac_finish_internal( psa_mac_operation_t *operation,
+static psa_status_t psa_mac_finish_internal( mbedtls_psa_mac_operation_t *operation,
uint8_t *mac,
size_t mac_size )
{
@@ -2701,11 +2710,14 @@
}
}
-psa_status_t psa_mac_sign_finish( psa_mac_operation_t *operation,
+psa_status_t psa_mac_sign_finish( psa_mac_operation_t *psa_operation,
uint8_t *mac,
size_t mac_size,
size_t *mac_length )
{
+ /* Temporary recast to avoid changing a lot of lines */
+ mbedtls_psa_mac_operation_t* operation = &psa_operation->ctx.mbedtls_ctx;
+
psa_status_t status;
if( operation->alg == 0 )
@@ -2731,21 +2743,24 @@
if( status == PSA_SUCCESS )
{
- status = psa_mac_abort( operation );
+ status = psa_mac_abort( psa_operation );
if( status == PSA_SUCCESS )
*mac_length = operation->mac_size;
else
memset( mac, '!', mac_size );
}
else
- psa_mac_abort( operation );
+ psa_mac_abort( psa_operation );
return( status );
}
-psa_status_t psa_mac_verify_finish( psa_mac_operation_t *operation,
+psa_status_t psa_mac_verify_finish( psa_mac_operation_t *psa_operation,
const uint8_t *mac,
size_t mac_length )
{
+ /* Temporary recast to avoid changing a lot of lines */
+ mbedtls_psa_mac_operation_t* operation = &psa_operation->ctx.mbedtls_ctx;
+
uint8_t actual_mac[PSA_MAC_MAX_SIZE];
psa_status_t status;
@@ -2774,9 +2789,9 @@
cleanup:
if( status == PSA_SUCCESS )
- status = psa_mac_abort( operation );
+ status = psa_mac_abort( psa_operation );
else
- psa_mac_abort( operation );
+ psa_mac_abort( psa_operation );
mbedtls_platform_zeroize( actual_mac, sizeof( actual_mac ) );