Fix memory leaks.

Signed-off-by: Pol Henarejos <[email protected]>
Mbed-TLS · Feb 7, 2023 · 45003eb · 45003eb
1 parent 436d8aa
commit 45003eb
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 16 deletions.
diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function
@@ -641,15 +641,12 @@ void ecp_read_binary(int id, data_t *buf, char *x, char *y, char *z,
 
     if (ret == 0) {
         TEST_ASSERT(mbedtls_mpi_cmp_mpi(&P.X, &X) == 0);
-#if defined(MBEDTLS_ECP_MONTGOMERY_ENABLED)
         if (mbedtls_ecp_get_type(&grp) == MBEDTLS_ECP_TYPE_MONTGOMERY) {
             TEST_ASSERT(mbedtls_mpi_cmp_int(&Y, 0) == 0);
             TEST_ASSERT(P.Y.p == NULL);
             TEST_ASSERT(mbedtls_mpi_cmp_int(&Z, 1) == 0);
             TEST_ASSERT(mbedtls_mpi_cmp_int(&P.Z, 1) == 0);
-        } else
-#endif
-        {
+        } else {
             TEST_ASSERT(mbedtls_mpi_cmp_mpi(&P.Y, &Y) == 0);
             TEST_ASSERT(mbedtls_mpi_cmp_mpi(&P.Z, &Z) == 0);
 

diff --git a/tests/suites/test_suite_eddsa.function b/tests/suites/test_suite_eddsa.function
@@ -45,13 +45,15 @@ void eddsa_sign(int gid, int eddsa_type, data_t *key, data_t *message, data_t *e
             TEST_ASSERT(mbedtls_sha512(message->x, message->len, sha_buf, 0) == 0);
         }
 
-        data = sha_buf;
-        data_size = sha_buf_size;
+        TEST_ASSERT(mbedtls_eddsa_sign(&ctx.grp, &r, &s, &ctx.d, sha_buf, sha_buf_size, eddsa_type,
+                                       ed_ctx->x, ed_ctx->len, &mbedtls_test_rnd_pseudo_rand,
+                                       &rnd_info) == 0);
+    } else {
+        TEST_ASSERT(mbedtls_eddsa_sign(&ctx.grp, &r, &s, &ctx.d, data, data_size, eddsa_type,
+                                       ed_ctx->x, ed_ctx->len, &mbedtls_test_rnd_pseudo_rand,
+                                       &rnd_info) == 0);
     }
 
-    TEST_ASSERT(mbedtls_eddsa_sign(&ctx.grp, &r, &s, &ctx.d, data, data_size, eddsa_type, ed_ctx->x,
-                                   ed_ctx->len, &mbedtls_test_rnd_pseudo_rand,
-                                   &rnd_info) == 0);
     mbedtls_mpi_write_binary_le(&r, sign_buf, sign_buf_size);
     mbedtls_mpi_write_binary_le(&s, sign_buf + key->len, sign_buf_size - key->len);
 
@@ -90,8 +92,7 @@ void eddsa_point_edwards(int gid, data_t *key, data_t *tv)
                                           &rnd_info) == 0);
 
     TEST_ASSERT(mbedtls_ecp_point_write_binary(&ctx.grp, &ctx.Q, MBEDTLS_ECP_PF_COMPRESSED, &olen,
-                                               buf,
-                                               buf_size) == 0);
+                                               buf, buf_size) == 0);
 
     ASSERT_COMPARE(tv->x, tv->len, buf, buf_size);
 
@@ -145,13 +146,13 @@ void eddsa_verify(int gid,
             TEST_ASSERT(mbedtls_sha512(message->x, message->len, sha_buf, 0) == 0);
         }
 
-        data = sha_buf;
-        data_size = sha_buf_size;
+        TEST_ASSERT(mbedtls_eddsa_verify(&ctx.grp, sha_buf, sha_buf_size, &ctx.Q, &r, &s,
+                                         eddsa_type, ed_ctx->x, ed_ctx->len) == 0);
+    } else {
+        TEST_ASSERT(mbedtls_eddsa_verify(&ctx.grp, data, data_size, &ctx.Q, &r, &s, eddsa_type,
+                                         ed_ctx->x, ed_ctx->len) == 0);
     }
 
-    TEST_ASSERT(mbedtls_eddsa_verify(&ctx.grp, data, data_size, &ctx.Q, &r, &s, eddsa_type,
-                                     ed_ctx->x, ed_ctx->len) == 0);
-
 exit:
     mbedtls_mpi_free(&r);
     mbedtls_mpi_free(&s);