yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move to computation stage only on successfull setup

Browse source 
Signed-off-by: Przemek Stekiel <przemyslaw.stekiel@mobica.com>
This commit is contained in:
Przemek Stekiel 2023-02-24 08:39:04 +01:00
parent 083745e097
commit d93de32267
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
library/psa_crypto.c
View file

@ -7503,8 +7503,6 @@ static psa_status_t psa_pake_complete_inputs(
status = psa_driver_wrapper_pake_setup(operation, &inputs); status = psa_driver_wrapper_pake_setup(operation, &inputs);
operation->stage = PSA_PAKE_OPERATION_STAGE_COMPUTATION;
/* Driver is responsible for creating its own copy of the password. */ /* Driver is responsible for creating its own copy of the password. */
mbedtls_platform_zeroize(inputs.password, inputs.password_len); mbedtls_platform_zeroize(inputs.password, inputs.password_len);
mbedtls_free(inputs.password); mbedtls_free(inputs.password);
@ -7512,6 +7510,7 @@ static psa_status_t psa_pake_complete_inputs(
if (status == PSA_SUCCESS) { if (status == PSA_SUCCESS) {
#if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE) #if defined(MBEDTLS_PSA_BUILTIN_ALG_JPAKE)
if (operation->alg == PSA_ALG_JPAKE) { if (operation->alg == PSA_ALG_JPAKE) {
operation->stage = PSA_PAKE_OPERATION_STAGE_COMPUTATION;
psa_jpake_computation_stage_t *computation_stage = psa_jpake_computation_stage_t *computation_stage =
&operation->computation_stage.jpake; &operation->computation_stage.jpake;
computation_stage->state = PSA_PAKE_STATE_READY; computation_stage->state = PSA_PAKE_STATE_READY;

8
library/psa_crypto_pake.c
View file

@ -257,9 +257,11 @@ psa_status_t mbedtls_psa_pake_setup(mbedtls_psa_pake_operation_t *operation,
{ status = PSA_ERROR_NOT_SUPPORTED; } { status = PSA_ERROR_NOT_SUPPORTED; }
error: error:
/* When driver fails with PSA_ERROR_NOT_SUPPORTED the built-in implementation is executed (if available) /* In case of failure of the setup of a multipart operation, the PSA driver interface
and it will reallocate the password leading to the memory leak. * specifies that the core does not call any other driver entry point thus does not
Call abort explicitly to clean up allocated memory for password on failure. */ * call mbedtls_psa_pake_abort(). Therefore call it here to do the needed clean
* up like freeing the memory that may have been allocated to store the password.
*/
mbedtls_psa_pake_abort(operation); mbedtls_psa_pake_abort(operation);
return status; return status;
} }