lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Use macros to manage buffer copies

Browse Source 
Signed-off-by: David Horstmann <david.horstmann@arm.com>
This commit is contained in:
David Horstmann
2023-11-29 17:07:13 +00:00
parent 410823730b
commit e9a88ab0d5
1 changed files with 43 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
library/psa_crypto.c
View File

@ -110,6 +110,45 @@ mbedtls_psa_drbg_context_t *const mbedtls_psa_random_state =
if (global_data.initialized == 0) \ if (global_data.initialized == 0) \
return PSA_ERROR_BAD_STATE; return PSA_ERROR_BAD_STATE;
/* Substitute an input buffer for a local copy of itself.
* Assumptions:
* - psa_status_t status exists
* - An exit label is declared
* - The name <buffer>_copy is not used for the given value of <buffer>
*/
#define SWAP_FOR_LOCAL_INPUT(input, length) \
psa_crypto_local_input_t input ## _copy = PSA_CRYPTO_LOCAL_INPUT_INIT; \
status = psa_crypto_local_input_alloc(input, length, &input ## _copy); \
if (status != PSA_SUCCESS) { \
goto exit; \
} \
input = input ## _copy.buffer;
#define FREE_LOCAL_INPUT(input) \
psa_crypto_local_input_free(&input ## _copy);
/* Substitute an output buffer for a local copy of itself.
* Assumptions:
* - psa_status_t status exists
* - An exit label is declared
* - The name <buffer>_copy is not used for the given value of <buffer>
*/
#define SWAP_FOR_LOCAL_OUTPUT(output, length) \
psa_crypto_local_output_t output ## _copy = PSA_CRYPTO_LOCAL_OUTPUT_INIT; \
status = psa_crypto_local_output_alloc(output, length, &output ## _copy); \
if (status != PSA_SUCCESS) { \
goto exit; \
} \
output = output ## _copy.buffer;
#define FREE_LOCAL_OUTPUT(output) \
psa_status_t local_output_free_status; \
local_output_free_status = psa_crypto_local_output_free(&output ## _copy); \
if (local_output_free_status != PSA_SUCCESS) { \
status = local_output_free_status; \
}
int psa_can_do_hash(psa_algorithm_t hash_alg) int psa_can_do_hash(psa_algorithm_t hash_alg)
{ {
(void) hash_alg; (void) hash_alg;
@ -4342,19 +4381,8 @@ psa_status_t psa_cipher_encrypt(mbedtls_svc_key_id_t key,
size_t default_iv_length = 0; size_t default_iv_length = 0;
psa_key_attributes_t attributes; psa_key_attributes_t attributes;
psa_crypto_local_input_t local_input = PSA_CRYPTO_LOCAL_INPUT_INIT; SWAP_FOR_LOCAL_INPUT(input, input_length);
status = psa_crypto_local_input_alloc(input, input_length, &local_input); SWAP_FOR_LOCAL_OUTPUT(output, output_size);
if (status != PSA_SUCCESS) {
goto exit;
}
input = local_input.buffer;
psa_crypto_local_output_t local_output = PSA_CRYPTO_LOCAL_OUTPUT_INIT;
status = psa_crypto_local_output_alloc(output, output_size, &local_output);
if (status != PSA_SUCCESS) {
goto exit;
}
output = local_output.buffer;
if (!PSA_ALG_IS_CIPHER(alg)) { if (!PSA_ALG_IS_CIPHER(alg)) {
status = PSA_ERROR_INVALID_ARGUMENT; status = PSA_ERROR_INVALID_ARGUMENT;
@ -4411,8 +4439,8 @@ exit:
*output_length = 0; *output_length = 0;
} }
psa_crypto_local_input_free(&local_input); FREE_LOCAL_INPUT(input);
psa_crypto_local_output_free(&local_output); FREE_LOCAL_OUTPUT(output);
return status; return status;
} }