commit 235c1947fb668a58646f13ddd3e0efdecb35a527
author Paul Elliott <paul.elliott@arm.com> Tue May 16 15:51:23 2023 +0100
committer Paul Elliott <paul.elliott@arm.com> Tue May 16 17:51:48 2023 +0100
tree b41b69fc89ddc66cd9aef4c99b4e67008182306f
parent 34b08e5005a41d2066707f9dc31f85e6caea772c

Group memory allocations earlier

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

library/ecp_curves.c

diff --git a/library/ecp_curves.c b/library/ecp_curves.c
index 6c588f7..2bbec41 100644
--- a/library/ecp_curves.c
+++ b/library/ecp_curves.c
@@ -5508,6 +5508,13 @@
         return MBEDTLS_ERR_ECP_ALLOC_FAILED;
     }
 
+    mbedtls_mpi_uint *Q = mbedtls_calloc(Q_limbs, ciL);
+
+    if (Q == NULL) {
+        ret =  MBEDTLS_ERR_ECP_ALLOC_FAILED;
+        goto cleanup;
+    }
+
     /* M = A1 */
     memset(M, 0, (M_limbs * ciL));
 
@@ -5524,13 +5531,6 @@
     (void) mbedtls_mpi_core_add(X, X, M, M_limbs);
 
     /* Q = B1, N += B1 */
-    mbedtls_mpi_uint *Q = mbedtls_calloc(Q_limbs, ciL);
-
-    if (Q == NULL) {
-        ret =  MBEDTLS_ERR_ECP_ALLOC_FAILED;
-        goto cleanup;
-    }
-
     memcpy(Q, M, (Q_limbs * ciL));
 
     mbedtls_mpi_core_shift_r(Q, Q_limbs, 224);