[GNUnet-SVN] r29827 - gnunet/src/util

[gnunet]

Author: grothoff
Date: 2013-10-04 00:13:50 +0200 (Fri, 04 Oct 2013)
New Revision: 29827

Modified:
   gnunet/src/util/crypto_symmetric.c
   gnunet/src/util/test_crypto_symmetric.c
Log:
-fix IV

Modified: gnunet/src/util/crypto_symmetric.c
===================================================================
--- gnunet/src/util/crypto_symmetric.c  2013-10-03 22:04:24 UTC (rev 29826)
+++ gnunet/src/util/crypto_symmetric.c  2013-10-03 22:13:50 UTC (rev 29827)
@@ -121,11 +121,11 @@
  * @returns the size of the encrypted block, -1 for errors
  */
 ssize_t
-GNUNET_CRYPTO_symmetric_encrypt (const void *block, size_t len,
-                           const struct GNUNET_CRYPTO_SymmetricSessionKey *
-                           sessionkey,
-                           const struct 
GNUNET_CRYPTO_SymmetricInitializationVector *
-                           iv, void *result)
+GNUNET_CRYPTO_symmetric_encrypt (const void *block, 
+                                 size_t len,
+                                 const struct 
GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
+                                 const struct 
GNUNET_CRYPTO_SymmetricInitializationVector *iv,
+                                 void *result)
 {
   gcry_cipher_hd_t handle;
   char tmp[len];
@@ -156,9 +156,9 @@
  */
 ssize_t
 GNUNET_CRYPTO_symmetric_decrypt (const void *block, size_t size,
-                           const struct GNUNET_CRYPTO_SymmetricSessionKey 
*sessionkey,
-                           const struct 
GNUNET_CRYPTO_SymmetricInitializationVector *iv, 
-                           void *result)
+                                 const struct 
GNUNET_CRYPTO_SymmetricSessionKey *sessionkey,
+                                 const struct 
GNUNET_CRYPTO_SymmetricInitializationVector *iv, 
+                                 void *result)
 {
   gcry_cipher_hd_t handle;
   char tmp[size];

Modified: gnunet/src/util/test_crypto_symmetric.c
===================================================================
--- gnunet/src/util/test_crypto_symmetric.c     2013-10-03 22:04:24 UTC (rev 
29826)
+++ gnunet/src/util/test_crypto_symmetric.c     2013-10-03 22:13:50 UTC (rev 
29827)
@@ -107,9 +107,10 @@
   memcpy (key.twofish_key, raw_key_twofish, GNUNET_CRYPTO_AES_KEY_LENGTH);
   if (GNUNET_CRYPTO_AES_KEY_LENGTH !=
       GNUNET_CRYPTO_symmetric_encrypt (plain, GNUNET_CRYPTO_AES_KEY_LENGTH, 
&key,
-                                 (const struct
-                                  GNUNET_CRYPTO_SymmetricInitializationVector 
*)
-                                 "testtesttesttest", result))
+                                       (const struct
+                                        
GNUNET_CRYPTO_SymmetricInitializationVector *)
+                                       "testtesttesttesttesttesttesttest", 
+                                       result))
   {
     printf ("Wrong return value from encrypt block.\n");
     ret = 1;
@@ -131,7 +132,7 @@
       GNUNET_CRYPTO_symmetric_decrypt (result, GNUNET_CRYPTO_AES_KEY_LENGTH, 
&key,
                                  (const struct
                                   GNUNET_CRYPTO_SymmetricInitializationVector 
*)
-                                 "testtesttesttest", res))
+                                 "testtesttesttesttesttesttesttest", res))
   {
     printf ("Wrong return value from decrypt block.\n");
     ret = 1;