[GNUnet-SVN] r31974 - in gnunet/src: include util

[gnunet]

Author: cfuchs
Date: 2014-01-21 10:34:09 +0100 (Tue, 21 Jan 2014)
New Revision: 31974

Modified:
   gnunet/src/include/gnunet_crypto_lib.h
   gnunet/src/util/crypto_paillier.c
Log:
- header sync

Modified: gnunet/src/include/gnunet_crypto_lib.h
===================================================================
--- gnunet/src/include/gnunet_crypto_lib.h      2014-01-21 09:31:38 UTC (rev 
31973)
+++ gnunet/src/include/gnunet_crypto_lib.h      2014-01-21 09:34:09 UTC (rev 
31974)
@@ -1346,7 +1346,7 @@
  */
 void
 GNUNET_CRYPTO_paillier_encrypt (const struct GNUNET_CRYPTO_PaillierPublicKey 
*public_key,
-                                const struct GNUNET_CRYPTO_PaillierPlaintext 
*plaintext,
+                                const gcry_mpi_t m,
                                 struct GNUNET_CRYPTO_PaillierCiphertext 
*ciphertext);
 
 
@@ -1362,7 +1362,7 @@
 GNUNET_CRYPTO_paillier_decrypt (const struct GNUNET_CRYPTO_PaillierPrivateKey 
*private_key,
                                 const struct GNUNET_CRYPTO_PaillierPublicKey 
*public_key,
                                 const struct GNUNET_CRYPTO_PaillierCiphertext 
*ciphertext,
-                                struct GNUNET_CRYPTO_PaillierPlaintext 
*plaintext);
+                                gcry_mpi_t m);
 
 
 /**

Modified: gnunet/src/util/crypto_paillier.c
===================================================================
--- gnunet/src/util/crypto_paillier.c   2014-01-21 09:31:38 UTC (rev 31973)
+++ gnunet/src/util/crypto_paillier.c   2014-01-21 09:34:09 UTC (rev 31974)
@@ -150,7 +150,7 @@
 GNUNET_CRYPTO_paillier_decrypt (const struct GNUNET_CRYPTO_PaillierPrivateKey 
*private_key,
                                 const struct GNUNET_CRYPTO_PaillierPublicKey 
*public_key,
                                 const struct GNUNET_CRYPTO_PaillierCiphertext 
*ciphertext,
-                                gcry_mpi_t *m)
+                                gcry_mpi_t m)
 {
   gcry_mpi_t mu;
   gcry_mpi_t lambda;
@@ -159,9 +159,8 @@
   gcry_mpi_t c;
 
   GNUNET_assert (0 != (n_square = gcry_mpi_new (0)));
-  if (NULL == *m)
-    GNUNET_assert (0 != (m = gcry_mpi_new (0)));
 
+
   GNUNET_CRYPTO_mpi_scan_unsigned (&lambda, private_key->lambda, sizeof 
private_key->lambda);
   GNUNET_CRYPTO_mpi_scan_unsigned (&mu, private_key->mu, sizeof 
private_key->mu);
   GNUNET_CRYPTO_mpi_scan_unsigned (&n, public_key, sizeof *public_key);