-fix time assertion introduce in last patch

[oweals/gnunet.git] / src / util / test_crypto_paillier.c

diff --git a/src/util/test_crypto_paillier.c b/src/util/test_crypto_paillier.c
index 386f21d7c099dd26925730bbc8f973008a30f855..cd8c77e5eaaa904ccdf8583babb500c8c4ba7fda 100644 (file)
--- a/src/util/test_crypto_paillier.c
+++ b/src/util/test_crypto_paillier.c
@@ -21,6 +21,7 @@
 /**
  * @file util/test_crypto_paillier.c
  * @brief testcase paillier crypto
+ * @author Christian Fuchs
  * @author Florian Dold
  */
 #include "platform.h"
@@ -29,7 +30,38 @@
 
 
 int
-main (int argc, char *argv[])
+test_crypto ()
+{
+  gcry_mpi_t plaintext;
+  gcry_mpi_t plaintext_result;
+  struct GNUNET_CRYPTO_PaillierCiphertext ciphertext;
+  struct GNUNET_CRYPTO_PaillierPublicKey public_key;
+  struct GNUNET_CRYPTO_PaillierPrivateKey private_key;
+
+  GNUNET_CRYPTO_paillier_create (&public_key, &private_key);
+
+  GNUNET_assert (NULL != (plaintext = gcry_mpi_new (0)));
+  GNUNET_assert (NULL != (plaintext_result = gcry_mpi_new (0)));
+
+  gcry_mpi_randomize (plaintext, GNUNET_CRYPTO_PAILLIER_BITS / 2, GCRY_WEAK_RANDOM);
+
+  GNUNET_CRYPTO_paillier_encrypt (&public_key, plaintext, 0, &ciphertext);
+
+  GNUNET_CRYPTO_paillier_decrypt (&private_key, &public_key,
+                                  &ciphertext, plaintext_result);
+
+  if (0 != gcry_mpi_cmp (plaintext, plaintext_result))
+  {
+    printf ("paillier failed with plaintext of size %u\n", gcry_mpi_get_nbits (plaintext));
+    gcry_log_debugmpi("\n", plaintext);
+    gcry_log_debugmpi("\n", plaintext_result);
+    return 1;
+  }
+  return 0;
+}
+
+int
+test_hom()
 {
   int ret;
   gcry_mpi_t m1;
@@ -39,25 +71,31 @@ main (int argc, char *argv[])
   struct GNUNET_CRYPTO_PaillierCiphertext c1;
   struct GNUNET_CRYPTO_PaillierCiphertext c2;
   struct GNUNET_CRYPTO_PaillierCiphertext c_result;
-  
   struct GNUNET_CRYPTO_PaillierPublicKey public_key;
   struct GNUNET_CRYPTO_PaillierPrivateKey private_key;
-
+  
   GNUNET_CRYPTO_paillier_create (&public_key, &private_key);
 
-  GNUNET_assert (NULL != (m1 = gcry_mpi_new (GNUNET_CRYPTO_PAILLIER_BITS-1)));
-  GNUNET_assert (NULL != (m2 = gcry_mpi_new (GNUNET_CRYPTO_PAILLIER_BITS-1)));
-  GNUNET_assert (NULL != (hom_result = gcry_mpi_new (GNUNET_CRYPTO_PAILLIER_BITS)));
-  gcry_mpi_randomize (m1, GNUNET_CRYPTO_PAILLIER_BITS-1, GCRY_WEAK_RANDOM);
-  gcry_mpi_randomize (m2, GNUNET_CRYPTO_PAILLIER_BITS-1, GCRY_WEAK_RANDOM);
+  GNUNET_assert (NULL != (m1 = gcry_mpi_new (0)));
+  GNUNET_assert (NULL != (m2 = gcry_mpi_new (0)));
+  GNUNET_assert (NULL != (result = gcry_mpi_new (0)));
+  GNUNET_assert (NULL != (hom_result = gcry_mpi_new (0)));
+  //gcry_mpi_randomize (m1, GNUNET_CRYPTO_PAILLIER_BITS-2, GCRY_WEAK_RANDOM);
+  m1 = gcry_mpi_set_ui(m1,1);
+  gcry_mpi_mul_2exp(m1,m1,GNUNET_CRYPTO_PAILLIER_BITS-3);
+  //gcry_mpi_randomize (m2, GNUNET_CRYPTO_PAILLIER_BITS-2, GCRY_WEAK_RANDOM);
+  m2 = gcry_mpi_set_ui(m2,1);
+  gcry_mpi_mul_2exp(m2,m2,GNUNET_CRYPTO_PAILLIER_BITS-3);
   gcry_mpi_add(result,m1,m2);
 
-  if (1 != (ret = GNUNET_CRYPTO_paillier_encrypt (&public_key, m1, &c1))){
-    printf ("GNUNET_CRYPTO_paillier_encrypt failed, should return 1 allowed operation, got %d!\n", ret);
+  if (1 != (ret = GNUNET_CRYPTO_paillier_encrypt (&public_key, m1, 2, &c1))){
+    printf ("GNUNET_CRYPTO_paillier_encrypt 1 failed, should return 1 allowed operation, got %d!\n", ret);
+    return 1;
+  }
+  if (1 != (ret = GNUNET_CRYPTO_paillier_encrypt (&public_key, m2, 2, &c2))){
+    printf ("GNUNET_CRYPTO_paillier_encrypt 2 failed, should return 1 allowed operation, got %d!\n", ret);
     return 1;
   }
-  
-  GNUNET_CRYPTO_paillier_encrypt (&public_key, m2, &c2);
 
   if (0 != (ret = GNUNET_CRYPTO_paillier_hom_add (&public_key, &c1,&c2, &c_result))){
     printf ("GNUNET_CRYPTO_paillier_hom_add failed, expected 0 remaining operations, got %d!\n", ret);
@@ -66,12 +104,27 @@ main (int argc, char *argv[])
   
   GNUNET_CRYPTO_paillier_decrypt (&private_key, &public_key,
                                   &c_result, hom_result);
-
-  if (0 != gcry_mpi_cmp(result, hom_result))
+  
+  gcry_log_debugmpi("\n", hom_result);
+  gcry_log_debugmpi("\n", result);
+  if (0 != gcry_mpi_cmp(result, hom_result)){
     printf ("GNUNET_CRYPTO_paillier miscalculated!\n");
     return 1;
+  }
   
   return 0;
 }
 
-/* end of test_crypto_paillier.c */
\ No newline at end of file
+
+int
+main (int argc, char *argv[])
+{
+  int ret;
+  ret = test_crypto ();
+  if (0 != ret)
+    return ret;
+  ret = test_hom ();
+  return ret;
+}
+
+/* end of test_crypto_paillier.c */