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

Implement buffer copy code in psa_hash_compare

Browse Source 
Signed-off-by: Thomas Daubney <thomas.daubney@arm.com>
This commit is contained in:
Thomas Daubney 2024-01-18 15:46:26 +00:00
parent 31d8c0bdb4
commit 51ffac9f40
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/psa_crypto.c
View File

@ -2493,17 +2493,23 @@ exit:
} }
psa_status_t psa_hash_compare(psa_algorithm_t alg, psa_status_t psa_hash_compare(psa_algorithm_t alg,
const uint8_t *input, size_t input_length, const uint8_t *input_external, size_t input_length,
const uint8_t *hash, size_t hash_length) const uint8_t *hash_external, size_t hash_length)
{ {
uint8_t actual_hash[PSA_HASH_MAX_SIZE]; uint8_t actual_hash[PSA_HASH_MAX_SIZE];
size_t actual_hash_length; size_t actual_hash_length;
psa_status_t status = PSA_ERROR_CORRUPTION_DETECTED;
LOCAL_INPUT_DECLARE(input_external, input);
LOCAL_INPUT_DECLARE(hash_external, hash);
if (!PSA_ALG_IS_HASH(alg)) { if (!PSA_ALG_IS_HASH(alg)) {
return PSA_ERROR_INVALID_ARGUMENT; status = PSA_ERROR_INVALID_ARGUMENT;
return status;
} }
psa_status_t status = psa_driver_wrapper_hash_compute( LOCAL_INPUT_ALLOC(input_external, input_length, input);
status = psa_driver_wrapper_hash_compute(
alg, input, input_length, alg, input, input_length,
actual_hash, sizeof(actual_hash), actual_hash, sizeof(actual_hash),
&actual_hash_length); &actual_hash_length);
@ -2514,12 +2520,18 @@ psa_status_t psa_hash_compare(psa_algorithm_t alg,
status = PSA_ERROR_INVALID_SIGNATURE; status = PSA_ERROR_INVALID_SIGNATURE;
goto exit; goto exit;
} }
LOCAL_INPUT_ALLOC(hash_external, hash_length, hash);
if (mbedtls_ct_memcmp(hash, actual_hash, actual_hash_length) != 0) { if (mbedtls_ct_memcmp(hash, actual_hash, actual_hash_length) != 0) {
status = PSA_ERROR_INVALID_SIGNATURE; status = PSA_ERROR_INVALID_SIGNATURE;
} }
exit: exit:
mbedtls_platform_zeroize(actual_hash, sizeof(actual_hash)); mbedtls_platform_zeroize(actual_hash, sizeof(actual_hash));
LOCAL_INPUT_FREE(input_external, input);
LOCAL_INPUT_FREE(hash_external, hash);
return status; return status;
} }