ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-07-26 11:50:40 +08:00
Code Issues Releases Wiki Activity

Guard memcpy so that it won't fail on null input pointer

Browse Source 
Signed-off-by: Ryan Everett <ryan.everett@arm.com>
This commit is contained in:
Ryan Everett 2024-02-07 17:24:59 +00:00
parent b41c3c9582
commit 5d2e82f0ce
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/psa_crypto.c
View File

@ -6864,12 +6864,12 @@ static psa_status_t psa_pbkdf2_hmac_set_password(psa_algorithm_t hash_alg,
{ {
psa_status_t status = PSA_SUCCESS; psa_status_t status = PSA_SUCCESS;
if (input_len > PSA_HASH_BLOCK_LENGTH(hash_alg)) { if (input_len > PSA_HASH_BLOCK_LENGTH(hash_alg)) {
status = psa_hash_compute(hash_alg, input, input_len, output, return psa_hash_compute(hash_alg, input, input_len, output,
PSA_HMAC_MAX_HASH_BLOCK_SIZE, output_len); PSA_HMAC_MAX_HASH_BLOCK_SIZE, output_len);
} else { } else if (input_len > 0) {
memcpy(output, input, input_len); memcpy(output, input, input_len);
*output_len = PSA_HASH_BLOCK_LENGTH(hash_alg);
} }
*output_len = PSA_HASH_BLOCK_LENGTH(hash_alg);
return status; return status;
} }
#endif /* MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC */ #endif /* MBEDTLS_PSA_BUILTIN_ALG_PBKDF2_HMAC */