-fix IV

diff --git a/src/util/crypto_symmetric.c b/src/util/crypto_symmetric.c
index 3cc54665232f6ca8fa76b18d0ce5ea2a562c88d6..97e2a4cfbc6ab9a70363a4cbc3558b5efde9f30a 100644 (file)
--- a/src/util/crypto_symmetric.c
+++ b/src/util/crypto_symmetric.c
@@ -121,11 +121,11 @@ setup_cipher_twofish (gcry_cipher_hd_t *handle,
  * @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 @@ GNUNET_CRYPTO_symmetric_encrypt (const void *block, size_t len,
  */
 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];

diff --git a/src/util/test_crypto_symmetric.c b/src/util/test_crypto_symmetric.c
index 90214a4b53d10fc3927d4a1db1c81850e668d5a1..b0321e8ef729b2d95b412297ecf80c8d47a12f00 100644 (file)
--- a/src/util/test_crypto_symmetric.c
+++ b/src/util/test_crypto_symmetric.c
@@ -107,9 +107,10 @@ verifyCrypto ()
   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 @@ verifyCrypto ()
       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;