eden-emu/mbedtls
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use output block as U_accumulator

Browse source 
Signed-off-by: Kusumit Ghoderao <Kusumit.Ghoderao@silabs.com>
This commit is contained in:
Kusumit Ghoderao 2023-06-14 15:55:11 +05:30
parent d9ec1afd13
commit 257ea00199
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

28
library/psa_crypto.c
View file

@ -5485,7 +5485,7 @@ static psa_status_t psa_key_derivation_pbkdf2_generate_block(
psa_mac_operation_t mac_operation = PSA_MAC_OPERATION_INIT; psa_mac_operation_t mac_operation = PSA_MAC_OPERATION_INIT;
size_t mac_output_length; size_t mac_output_length;
uint8_t U_i[PSA_MAC_MAX_SIZE]; uint8_t U_i[PSA_MAC_MAX_SIZE];
uint8_t U_accumulator[PSA_MAC_MAX_SIZE]; uint8_t *U_accumulator = pbkdf2->output_block;
uint64_t i; uint64_t i;
uint8_t block_counter[4]; uint8_t block_counter[4];
@ -5499,28 +5499,28 @@ static psa_status_t psa_key_derivation_pbkdf2_generate_block(
pbkdf2->password_length, pbkdf2->password_length,
prf_alg); prf_alg);
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
goto cleanup; return status;
} }
status = psa_mac_update(&mac_operation, pbkdf2->salt, pbkdf2->salt_length); status = psa_mac_update(&mac_operation, pbkdf2->salt, pbkdf2->salt_length);
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
goto cleanup; return status;
} }
status = psa_mac_update(&mac_operation, block_counter, 4UL); status = psa_mac_update(&mac_operation, block_counter, sizeof(block_counter));
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
goto cleanup; return status;
} }
status = psa_mac_sign_finish(&mac_operation, U_i, sizeof(U_i), status = psa_mac_sign_finish(&mac_operation, U_i, sizeof(U_i),
&mac_output_length); &mac_output_length);
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
goto cleanup; return status;
} }
if (mac_output_length != prf_output_length) { if (mac_output_length != prf_output_length) {
status = PSA_ERROR_INVALID_ARGUMENT; status = PSA_ERROR_CORRUPTION_DETECTED;
goto cleanup; return status;
} }
memcpy(U_accumulator, U_i, mac_output_length); memcpy(U_accumulator, U_i, prf_output_length);
for (i = 1; i < pbkdf2->input_cost; i++) { for (i = 1; i < pbkdf2->input_cost; i++) {
status = psa_driver_wrapper_mac_compute(attributes, status = psa_driver_wrapper_mac_compute(attributes,
@ -5530,19 +5530,11 @@ static psa_status_t psa_key_derivation_pbkdf2_generate_block(
U_i, sizeof(U_i), U_i, sizeof(U_i),
&mac_output_length); &mac_output_length);
if (status != PSA_SUCCESS) { if (status != PSA_SUCCESS) {
goto cleanup; return status;
} }
mbedtls_xor(U_accumulator, U_accumulator, U_i, prf_output_length); mbedtls_xor(U_accumulator, U_accumulator, U_i, prf_output_length);
} }
memcpy(pbkdf2->output_block, U_accumulator, prf_output_length);
cleanup:
/* Zeroise buffers to clear sensitive data from memory. */
mbedtls_platform_zeroize(U_accumulator, PSA_MAC_MAX_SIZE);
mbedtls_platform_zeroize(U_i, PSA_MAC_MAX_SIZE);
return status;
} }
static psa_status_t psa_key_derivation_pbkdf2_read( static psa_status_t psa_key_derivation_pbkdf2_read(