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

Rework psa_pake_abort

Browse Source 
- Fix potential issue with freeing password
- Clean operation object even if psa_driver_wrapper_pake_abort fails
- Remove redundant code

Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-01-31 19:59:20 +01:00
parent f62b3bb087
commit d69dca9fc4
1 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/psa_crypto.c
View File

@ -7830,38 +7830,22 @@ psa_status_t psa_pake_get_implicit_key(
psa_status_t psa_pake_abort( psa_status_t psa_pake_abort(
psa_pake_operation_t *operation) psa_pake_operation_t *operation)
{ {
psa_status_t status = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; psa_status_t status = PSA_SUCCESS;
if (operation->id != 0) { if (operation->stage == PSA_PAKE_OPERATION_STAGE_COMPUTATION) {
status = psa_driver_wrapper_pake_abort(operation); status = psa_driver_wrapper_pake_abort(operation);
if (status != PSA_SUCCESS) {
return status;
}
} }
if (operation->data.inputs.password_len > 0) { if (operation->stage == PSA_PAKE_OPERATION_STAGE_COLLECT_INPUTS &&
operation->data.inputs.password_len > 0) {
mbedtls_platform_zeroize(operation->data.inputs.password, mbedtls_platform_zeroize(operation->data.inputs.password,
operation->data.inputs.password_len); operation->data.inputs.password_len);
mbedtls_free(operation->data.inputs.password); mbedtls_free(operation->data.inputs.password);
} }
memset(&operation->data, 0, sizeof(operation->data)); memset(operation, 0, sizeof(psa_pake_operation_t));
if (operation->alg == PSA_ALG_JPAKE) { return status;
psa_jpake_computation_stage_t *computation_stage =
&operation->computation_stage.jpake;
computation_stage->input_step = PSA_PAKE_STEP_INVALID;
computation_stage->output_step = PSA_PAKE_STEP_INVALID;
computation_stage->state = PSA_PAKE_STATE_INVALID;
computation_stage->sequence = PSA_PAKE_SEQ_INVALID;
}
operation->alg = PSA_ALG_NONE;
operation->stage = PSA_PAKE_OPERATION_STAGE_SETUP;
operation->id = 0;
return PSA_SUCCESS;
} }
#endif /* MBEDTLS_PSA_CRYPTO_C */ #endif /* MBEDTLS_PSA_CRYPTO_C */