-encrypt using both AES and TWOFISH, with independent symmetric keys

1 files changed, 26 insertions, 18 deletions

diff --git a/src/util/test_crypto_aes.c b/src/util/test_crypto_aes.c
index 1c5897c1e..a5d49063a 100644
--- a/src/util/test_crypto_aes.c
+++ b/src/util/test_crypto_aes.c
@@ -28,7 +28,7 @@
 #include "gnunet_crypto_lib.h"
 
 #define TESTSTRING "Hello World!"
-#define INITVALUE "InitializationVectorValue"
+#define INITVALUE "InitializationVectorValueinitializationvectorvalue"
 
 static int
 testSymcipher ()
@@ -68,7 +68,8 @@ testSymcipher ()
     return 0;
 }
 
-int
+
+static int
 verifyCrypto ()
 {
   struct GNUNET_CRYPTO_AesSessionKey key;
@@ -77,25 +78,34 @@ verifyCrypto ()
   int ret;
 
   unsigned char plain[] =
-      { 29, 128, 192, 253, 74, 171, 38, 187, 84, 219, 76, 76, 209, 118, 33, 249,
+  {
+    29, 128, 192, 253, 74, 171, 38, 187, 84, 219, 76, 76, 209, 118, 33, 249,
     172, 124, 96, 9, 157, 110, 8, 215, 200, 63, 69, 230, 157, 104, 247, 164
   };
-  unsigned char raw_key[] =
-      { 106, 74, 209, 88, 145, 55, 189, 135, 125, 180, 225, 108, 183, 54, 25,
+  unsigned char raw_key_aes[] =
+  {
+    106, 74, 209, 88, 145, 55, 189, 135, 125, 180, 225, 108, 183, 54, 25,
     169, 129, 188, 131, 75, 227, 245, 105, 10, 225, 15, 115, 159, 148, 184,
     34, 191
   };
+  unsigned char raw_key_twofish[] =
+  {
+    145, 55, 189, 135, 125, 180, 225, 108, 183, 54, 25,
+    169, 129, 188, 131, 75, 227, 245, 105, 10, 225, 15, 115, 159, 148, 184,
+    34, 191, 106, 74, 209, 88
+  };
   unsigned char encrresult[] =
-      { 167, 102, 230, 233, 127, 195, 176, 107, 17, 91, 199, 127, 96, 113, 75,
-    195, 245, 217, 61, 236, 159, 165, 103, 121, 203, 99, 202, 41, 23, 222, 25,
-    102
+  {
+    161, 152, 186, 231, 214, 55, 225, 206, 85, 43, 80, 134, 145, 198, 20, 
+    233, 236, 57, 194, 10, 147, 149, 30, 106, 179, 54, 182, 247, 71, 204, 
+    179, 51, 1
   };
 
   res = NULL;
   ret = 0;
 
-  memcpy (key.key, raw_key, GNUNET_CRYPTO_AES_KEY_LENGTH);
-
+  memcpy (key.aes_key, raw_key_aes, GNUNET_CRYPTO_AES_KEY_LENGTH);
+  memcpy (key.twofish_key, raw_key_twofish, GNUNET_CRYPTO_AES_KEY_LENGTH);
   if (GNUNET_CRYPTO_AES_KEY_LENGTH !=
       GNUNET_CRYPTO_aes_encrypt (plain, GNUNET_CRYPTO_AES_KEY_LENGTH, &key,
                                  (const struct
@@ -107,15 +117,17 @@ verifyCrypto ()
     goto error;
   }
 
-  if (memcmp (encrresult, result, GNUNET_CRYPTO_AES_KEY_LENGTH) != 0)
+  if (0 != memcmp (encrresult, result, GNUNET_CRYPTO_AES_KEY_LENGTH))
   {
+    int i;
     printf ("Encrypted result wrong.\n");
+    for (i=0;i<GNUNET_CRYPTO_AES_KEY_LENGTH;i++)
+      printf ("%u, ", (uint8_t) result[i]);
     ret = 1;
     goto error;
   }
 
   res = GNUNET_malloc (GNUNET_CRYPTO_AES_KEY_LENGTH);
-
   if (GNUNET_CRYPTO_AES_KEY_LENGTH !=
       GNUNET_CRYPTO_aes_decrypt (result, GNUNET_CRYPTO_AES_KEY_LENGTH, &key,
                                  (const struct
@@ -126,21 +138,17 @@ verifyCrypto ()
     ret = 1;
     goto error;
   }
-
-  if (memcmp (res, plain, GNUNET_CRYPTO_AES_KEY_LENGTH) != 0)
+  if (0 != memcmp (res, plain, GNUNET_CRYPTO_AES_KEY_LENGTH))
   {
     printf ("Decrypted result does not match input.\n");
-
     ret = 1;
   }
-
 error:
-
   GNUNET_free_non_null (res);
-
   return ret;
 }
 
+
 int
 main (int argc, char *argv[])
 {