commit eefe47292ca04717ffca05e3b6abbc5429cc96c9
author Paul Elliott <paul.elliott@arm.com> Mon Feb 06 15:59:09 2023 +0000
committer Paul Elliott <paul.elliott@arm.com> Wed Feb 15 23:34:29 2023 +0000
tree 9d865cdf8938e947d7049b4addc4df1d5ac67d73
parent c9774411d4b90d32b6f0821aca4d53dec461f8c4

Move loading of public part of ECP into function

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 882cb96..62828bd 100644
--- a/library/psa_crypto.c
+++ b/library/psa_crypto.c
@@ -3762,20 +3762,10 @@
         return status;
     }
 
-    /* Check whether the public part is loaded. If not, load it. */
-    if (mbedtls_ecp_is_zero(&operation->ctx->Q)) {
-        int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
+    int ret = mbedtls_psa_ecp_load_public_part(operation->ctx);
 
-        ret = mbedtls_ecp_mul(&operation->ctx->grp,
-                              &operation->ctx->Q,
-                              &operation->ctx->d,
-                              &operation->ctx->grp.G,
-                              mbedtls_psa_get_random,
-                              MBEDTLS_PSA_RANDOM_STATE);
-
-        if (ret != 0) {
-            return mbedtls_to_psa_error(ret);
-        }
+    if (ret != 0) {
+        return mbedtls_to_psa_error(ret);
     }
 
     mbedtls_ecdsa_restart_init(&operation->restart_ctx);