commit 7cc4e816c16df362c0723694d1e2941d2166a70c
author Paul Elliott <paul.elliott@arm.com> Tue Jan 10 17:14:11 2023 +0000
committer Paul Elliott <paul.elliott@arm.com> Wed Feb 15 23:34:29 2023 +0000
tree 75ecda1be7d4c27948772f03fc7b907efc98c870
parent 3225f198030bd07535e163013215d2583e64827c

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

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>

library/psa_crypto.c

diff --git a/library/psa_crypto.c b/library/psa_crypto.c
index f7228bc..efad510 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3419,6 +3419,8 @@
 
 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) || \
     defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA)) && \
     defined(MBEDTLS_ECP_RESTARTABLE)
@@ -3429,10 +3431,7 @@
         max_ops = 1;
     }
 
-    mbedtls_psa_interruptible_max_ops = max_ops;
     mbedtls_ecp_set_max_ops(max_ops);
-#else
-    (void) max_ops;
 #endif /* defined(MBEDTLS_PSA_BUILTIN_ALG_ECDSA) ||
         * defined(MBEDTLS_PSA_BUILTIN_ALG_DETERMINISTIC_ECDSA) &&
         * defined( MBEDTLS_ECP_RESTARTABLE ) */
@@ -3497,8 +3496,9 @@
 #endif
 
             /* Ensure default is set even if
-             * mbedtls_psa_interruptible_get_max_ops() has not been called. */
-            mbedtls_ecp_set_max_ops(mbedtls_psa_interruptible_get_max_ops());
+             * mbedtls_psa_interruptible_set_max_ops() has not been called. */
+            mbedtls_psa_interruptible_set_max_ops(
+                mbedtls_psa_interruptible_get_max_ops());
 
             status = mbedtls_psa_ecp_load_representation(attributes->core.type,
                                                          attributes->core.bits,
@@ -3685,8 +3685,9 @@
             defined(MBEDTLS_ECP_RESTARTABLE)
 
             /* Ensure default is set even if
-             * mbedtls_psa_interruptible_get_max_ops() has not been called. */
-            mbedtls_ecp_set_max_ops(mbedtls_psa_interruptible_get_max_ops());
+             * mbedtls_psa_interruptible_set_max_ops() has not been called. */
+            mbedtls_psa_interruptible_set_max_ops(
+                mbedtls_psa_interruptible_get_max_ops());
 
             status = mbedtls_psa_ecp_load_representation(attributes->core.type,
                                                          attributes->core.bits,