merge smc into crypto module. add 2dim array helpers

1 files changed, 33 insertions, 12 deletions

diff --git a/test_crypto.c b/test_crypto.c
index 5cc2ed1..a42a643 100644
--- a/test_crypto.c
+++ b/test_crypto.c
@@ -18,15 +18,33 @@
  * @file test_crypto.c
  * @brief testing crypto and smc functions.
  */
+
+/* For testing static functions and variables we include the whole source */
+#include "crypto.c"
+
 #include "brandt.h"
 #include "crypto.h"
-#include "smc.h"
 #include "test.h"
 
-extern gcry_ctx_t       ec_ctx;
-extern gcry_mpi_point_t ec_gen;
-extern gcry_mpi_point_t ec_zero;
-extern gcry_mpi_t       ec_n;
+
+int
+test_smc_2d_array ()
+{
+	gcry_mpi_point_t **array;
+	uint16_t         size1 = 3;
+	uint16_t         size2 = 7;
+	uint16_t         i, j;
+
+	array = smc_init2 (size1, size2);
+	check (array, "memory allocation failed");
+
+	for (i = 0; i < size1; i++)
+		for (j = 0; j < size2; j++)
+			check (array[i][j], "point has not been initialized");
+
+	smc_free2 (array, size1, size2);
+}
+
 
 int
 test_smc_zkp_dl ()
@@ -38,7 +56,7 @@ test_smc_zkp_dl ()
 	gcry_mpi_point_t g = gcry_mpi_point_new (0);
 	gcry_mpi_point_t v = gcry_mpi_point_new (0);
 
-	brandt_ec_keypair_create (g, c);
+	ec_keypair_create (g, c);
 
 	if (0 == tests_run)
 	{
@@ -46,7 +64,7 @@ test_smc_zkp_dl ()
 		gcry_mpi_ec_mul (g, GCRYMPI_CONST_ONE, ec_gen, ec_ctx);
 	}
 
-	brandt_ec_keypair_create_base (v, x, g);
+	ec_keypair_create_base (v, x, g);
 
 	smc_zkp_dl (v, g, x, a, c, r);
 	check (!smc_zkp_dl_check (v, g, a, c, r), "zkp dl wrong");
@@ -77,8 +95,8 @@ test_smc_zkp_2dle ()
 	gcry_mpi_point_t v = gcry_mpi_point_new (0);
 	gcry_mpi_point_t w = gcry_mpi_point_new (0);
 
-	brandt_ec_keypair_create (g1, c);
-	brandt_ec_keypair_create (g2, c);
+	ec_keypair_create (g1, c);
+	ec_keypair_create (g2, c);
 
 	if (0 == tests_run)
 	{
@@ -87,7 +105,7 @@ test_smc_zkp_2dle ()
 		gcry_mpi_ec_mul (g2, GCRYMPI_CONST_ONE, ec_gen, ec_ctx);
 	}
 
-	brandt_ec_keypair_create_base (v, x, g1);
+	ec_keypair_create_base (v, x, g1);
 	gcry_mpi_ec_mul (w, x, g2, ec_ctx);
 
 	smc_zkp_2dle (v, w, g1, g2, x, a, b, c, r);
@@ -128,7 +146,7 @@ test_smc_zkp_0og ()
 	gcry_mpi_point_t b1 = gcry_mpi_point_new (0);
 	gcry_mpi_point_t b2 = gcry_mpi_point_new (0);
 
-	brandt_ec_keypair_create (y, c);
+	ec_keypair_create (y, c);
 
 	smc_zkp_0og (alpha, (tests_run % 2 ? ec_zero : ec_gen), y, beta, a1, a2, b1,
 	             b2, c, d1, d2, r1, r2);
@@ -161,10 +179,13 @@ test_smc_zkp_0og ()
 int
 main (int argc, char *argv[])
 {
-	int repeat = 32;
+	int repeat = 8;
 
 	BRANDT_init ();
 
+	/* tests that need to run only once */
+	run (test_smc_2d_array);
+
 	for (tests_run = 0; tests_run < repeat; tests_run++)
 	{
 		run (test_smc_zkp_dl);