- test for external iterator

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

diff --git a/src/util/test_crypto_aes.c b/src/util/test_crypto_aes.c
index 968c7f40f8250455bc047cecbcbeaba82e46443e..1c5897c1e8cd4d0db5dae1205d9759775f1819b9 100644 (file)
--- a/src/util/test_crypto_aes.c
+++ b/src/util/test_crypto_aes.c
@@ -39,22 +39,21 @@ testSymcipher ()
   char res[100];
 
   GNUNET_CRYPTO_aes_create_session_key (&key);
-  size = GNUNET_CRYPTO_aes_encrypt (TESTSTRING,
-                                    strlen (TESTSTRING) + 1,
-                                    &key,
-                                    (const struct
-                                     GNUNET_CRYPTO_AesInitializationVector *)
-                                    INITVALUE, result);
+  size =
+      GNUNET_CRYPTO_aes_encrypt (TESTSTRING, strlen (TESTSTRING) + 1, &key,
+                                 (const struct
+                                  GNUNET_CRYPTO_AesInitializationVector *)
+                                 INITVALUE, result);
   if (size == -1)
   {
     printf ("symciphertest failed: encryptBlock returned %d\n", size);
     return 1;
   }
-  size = GNUNET_CRYPTO_aes_decrypt (result, size,
-                                    &key,
-                                    (const struct
-                                     GNUNET_CRYPTO_AesInitializationVector *)
-                                    INITVALUE, res);
+  size =
+      GNUNET_CRYPTO_aes_decrypt (result, size, &key,
+                                 (const struct
+                                  GNUNET_CRYPTO_AesInitializationVector *)
+                                 INITVALUE, res);
   if (strlen (TESTSTRING) + 1 != size)
   {
     printf ("symciphertest failed: decryptBlock returned %d\n", size);
@@ -96,22 +95,9 @@ verifyCrypto ()
   ret = 0;
 
   memcpy (key.key, raw_key, GNUNET_CRYPTO_AES_KEY_LENGTH);
-  key.crc32 =
-      htonl (GNUNET_CRYPTO_crc32_n (&key, GNUNET_CRYPTO_AES_KEY_LENGTH));
-
-  if (ntohl (key.crc32) != (unsigned int) 38125195LL)
-  {
-    printf ("Static key has different CRC: %u - %u\n",
-            ntohl (key.crc32), key.crc32);
-
-    ret = 1;
-    goto error;
-  }
 
   if (GNUNET_CRYPTO_AES_KEY_LENGTH !=
-      GNUNET_CRYPTO_aes_encrypt (plain,
-                                 GNUNET_CRYPTO_AES_KEY_LENGTH,
-                                 &key,
+      GNUNET_CRYPTO_aes_encrypt (plain, GNUNET_CRYPTO_AES_KEY_LENGTH, &key,
                                  (const struct
                                   GNUNET_CRYPTO_AesInitializationVector *)
                                  "testtesttesttest", result))
@@ -131,9 +117,7 @@ verifyCrypto ()
   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,
+      GNUNET_CRYPTO_aes_decrypt (result, GNUNET_CRYPTO_AES_KEY_LENGTH, &key,
                                  (const struct
                                   GNUNET_CRYPTO_AesInitializationVector *)
                                  "testtesttesttest", res))
@@ -163,7 +147,6 @@ main (int argc, char *argv[])
   int failureCount = 0;
 
   GNUNET_log_setup ("test-crypto-aes", "WARNING", NULL);
-  GNUNET_CRYPTO_random_disable_entropy_gathering ();
   GNUNET_assert (strlen (INITVALUE) >
                  sizeof (struct GNUNET_CRYPTO_AesInitializationVector));
   failureCount += testSymcipher ();