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

Ensure max ops gets set regardless of having built-in implementation

Browse source 
Set the psa level global anyway, regardless of having a built in
implementation, to match the set function. Also, ensure that value returned
is the same as value passed in, irregardless of internal implementation
requirements.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>
This commit is contained in:
Paul Elliott 2023-01-10 17:14:11 +00:00
parent 3225f19803
commit 7cc4e816c1
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
library/psa_crypto.c
View file

@ -3419,6 +3419,8 @@ static uint32_t mbedtls_psa_interruptible_max_ops =
void mbedtls_psa_interruptible_set_max_ops(uint32_t max_ops) void mbedtls_psa_interruptible_set_max_ops(uint32_t max_ops)
{ {
mbedtls_psa_interruptible_max_ops = max_ops;
#if (defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) || \ #if (defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) || \
defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA)) && \ defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA)) && \
defined(MBEDTLS_ECP_RESTARTABLE) defined(MBEDTLS_ECP_RESTARTABLE)
@ -3429,10 +3431,7 @@ void mbedtls_psa_interruptible_set_max_ops(uint32_t max_ops)
max_ops = 1; max_ops = 1;
} }
mbedtls_psa_interruptible_max_ops = max_ops;
mbedtls_ecp_set_max_ops(max_ops); mbedtls_ecp_set_max_ops(max_ops);
#else
(void) max_ops;
#endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) || #endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) ||
* defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA) && * defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA) &&
* defined( MBEDTLS_ECP_RESTARTABLE ) */ * defined( MBEDTLS_ECP_RESTARTABLE ) */
@ -3497,8 +3496,9 @@ psa_status_t mbedtls_psa_sign_hash_start(
#endif #endif
/* Ensure default is set even if /* Ensure default is set even if
* mbedtls_psa_interruptible_get_max_ops() has not been called. */ * mbedtls_psa_interruptible_set_max_ops() has not been called. */
mbedtls_ecp_set_max_ops(mbedtls_psa_interruptible_get_max_ops()); mbedtls_psa_interruptible_set_max_ops(
mbedtls_psa_interruptible_get_max_ops());
status = mbedtls_psa_ecp_load_representation(attributes->core.type, status = mbedtls_psa_ecp_load_representation(attributes->core.type,
attributes->core.bits, attributes->core.bits,
@ -3685,8 +3685,9 @@ psa_status_t mbedtls_psa_verify_hash_start(
defined(MBEDTLS_ECP_RESTARTABLE) defined(MBEDTLS_ECP_RESTARTABLE)
/* Ensure default is set even if /* Ensure default is set even if
* mbedtls_psa_interruptible_get_max_ops() has not been called. */ * mbedtls_psa_interruptible_set_max_ops() has not been called. */
mbedtls_ecp_set_max_ops(mbedtls_psa_interruptible_get_max_ops()); mbedtls_psa_interruptible_set_max_ops(
mbedtls_psa_interruptible_get_max_ops());
status = mbedtls_psa_ecp_load_representation(attributes->core.type, status = mbedtls_psa_ecp_load_representation(attributes->core.type,
attributes->core.bits, attributes->core.bits,