fix

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

diff --git a/src/util/test_crypto_rsa.c b/src/util/test_crypto_rsa.c
index e71decca8d2f250d73a8c758b66afb9422df4464..6a2c1b3553d34fd4356f78707b45503cebf64f44 100644 (file)
--- a/src/util/test_crypto_rsa.c
+++ b/src/util/test_crypto_rsa.c
@@ -4,7 +4,7 @@
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 3, or (at your
      option) any later version.
 
      GNUnet is distributed in the hope that it will be useful, but
@@ -56,35 +56,34 @@ testEncryptDecrypt ()
   for (i = 0; i < ITER; i++)
     {
       fprintf (stderr, ".");
-      if (GNUNET_SYSERR == GNUNET_CRYPTO_rsa_encrypt (TESTSTRING,
-                                                      strlen (TESTSTRING) + 1,
-                                                      &pkey, &target))
-        {
-          fprintf (stderr, "GNUNET_CRYPTO_rsa_encrypt returned SYSERR\n");
-          ok++;
-          continue;
-        }
-      if (-1 == GNUNET_CRYPTO_rsa_decrypt (hostkey,
-                                           &target, result,
-                                           strlen (TESTSTRING) + 1))
-        {
-          fprintf (stderr, "GNUNET_CRYPTO_rsa_decrypt returned SYSERR\n");
-          ok++;
-          continue;
+      if (GNUNET_SYSERR ==
+         GNUNET_CRYPTO_rsa_encrypt (TESTSTRING, strlen (TESTSTRING) + 1,
+                                    &pkey, &target))
+       {
+         fprintf (stderr, "GNUNET_CRYPTO_rsa_encrypt returned SYSERR\n");
+         ok++;
+         continue;
+       }
+      if (-1 ==
+         GNUNET_CRYPTO_rsa_decrypt (hostkey, &target, result,
+                                    strlen (TESTSTRING) + 1))
+       {
+         fprintf (stderr, "GNUNET_CRYPTO_rsa_decrypt returned SYSERR\n");
+         ok++;
+         continue;
 
-        }
+       }
       if (strncmp (TESTSTRING, result, strlen (TESTSTRING)) != 0)
-        {
-          printf ("%s != %.*s - testEncryptDecrypt failed!\n",
-                  TESTSTRING, MAX_TESTVAL, result);
-          ok++;
-          continue;
-        }
+       {
+         printf ("%s != %.*s - testEncryptDecrypt failed!\n", TESTSTRING,
+                 (int) MAX_TESTVAL, result);
+         ok++;
+         continue;
+       }
     }
-  printf ("%d RSA encrypt/decrypt operations %llums (%d failures)\n",
-          ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          value, ok);
+  printf ("%d RSA encrypt/decrypt operations %llums (%d failures)\n", ITER,
+         (unsigned long long)
+         GNUNET_TIME_absolute_get_duration (start).rel_value, ok);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   if (ok == 0)
     return GNUNET_OK;
@@ -112,19 +111,18 @@ testEncryptPerformance ()
   for (i = 0; i < ITER; i++)
     {
       fprintf (stderr, ".");
-      if (GNUNET_SYSERR == GNUNET_CRYPTO_rsa_encrypt (TESTSTRING,
-                                                      strlen (TESTSTRING) + 1,
-                                                      &pkey, &target))
-        {
-          fprintf (stderr, "GNUNET_CRYPTO_rsa_encrypt returned SYSERR\n");
-          ok++;
-          continue;
-        }
+      if (GNUNET_SYSERR ==
+         GNUNET_CRYPTO_rsa_encrypt (TESTSTRING, strlen (TESTSTRING) + 1,
+                                    &pkey, &target))
+       {
+         fprintf (stderr, "GNUNET_CRYPTO_rsa_encrypt returned SYSERR\n");
+         ok++;
+         continue;
+       }
     }
-  printf ("%d RSA encrypt operations %llu ms (%d failures)\n",
-          ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          value, ok);
+  printf ("%d RSA encrypt operations %llu ms (%d failures)\n", ITER,
+         (unsigned long long)
+         GNUNET_TIME_absolute_get_duration (start).rel_value, ok);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   if (ok != 0)
     return GNUNET_SYSERR;
@@ -154,36 +152,36 @@ testEncryptDecryptSK ()
     {
       fprintf (stderr, ".");
       GNUNET_CRYPTO_aes_create_session_key (&insk);
-      if (GNUNET_SYSERR == GNUNET_CRYPTO_rsa_encrypt (&insk,
-                                                      sizeof (struct
-                                                              GNUNET_CRYPTO_AesSessionKey),
-                                                      &pkey, &target))
-        {
-          fprintf (stderr, "GNUNET_CRYPTO_rsa_encrypt returned SYSERR\n");
-          ok++;
-          continue;
-        }
-      if (-1 == GNUNET_CRYPTO_rsa_decrypt (hostkey,
-                                           &target, &outsk,
-                                           sizeof (struct
-                                                   GNUNET_CRYPTO_AesSessionKey)))
-        {
-          fprintf (stderr, "GNUNET_CRYPTO_rsa_decrypt returned SYSERR\n");
-          ok++;
-          continue;
-        }
+      if (GNUNET_SYSERR ==
+         GNUNET_CRYPTO_rsa_encrypt (&insk,
+                                    sizeof (struct
+                                            GNUNET_CRYPTO_AesSessionKey),
+                                    &pkey, &target))
+       {
+         fprintf (stderr, "GNUNET_CRYPTO_rsa_encrypt returned SYSERR\n");
+         ok++;
+         continue;
+       }
+      if (-1 ==
+         GNUNET_CRYPTO_rsa_decrypt (hostkey, &target, &outsk,
+                                    sizeof (struct
+                                            GNUNET_CRYPTO_AesSessionKey)))
+       {
+         fprintf (stderr, "GNUNET_CRYPTO_rsa_decrypt returned SYSERR\n");
+         ok++;
+         continue;
+       }
       if (0 !=
-          memcmp (&insk, &outsk, sizeof (struct GNUNET_CRYPTO_AesSessionKey)))
-        {
-          printf ("testEncryptDecryptSK failed!\n");
-          ok++;
-          continue;
-        }
+         memcmp (&insk, &outsk, sizeof (struct GNUNET_CRYPTO_AesSessionKey)))
+       {
+         printf ("testEncryptDecryptSK failed!\n");
+         ok++;
+         continue;
+       }
     }
-  printf ("%d RSA encrypt/decrypt SK operations %llus (%d failures)\n",
-          ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          value, ok);
+  printf ("%d RSA encrypt/decrypt SK operations %llums (%d failures)\n", ITER,
+         (unsigned long long)
+         GNUNET_TIME_absolute_get_duration (start).rel_value, ok);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   if (ok != 0)
     return GNUNET_SYSERR;
@@ -213,32 +211,31 @@ testSignVerify ()
     {
       fprintf (stderr, ".");
       if (GNUNET_SYSERR == GNUNET_CRYPTO_rsa_sign (hostkey, &purp, &sig))
-        {
-          fprintf (stderr, "GNUNET_CRYPTO_rsa_sign returned SYSERR\n");
-          ok = GNUNET_SYSERR;
-          continue;
-        }
+       {
+         fprintf (stderr, "GNUNET_CRYPTO_rsa_sign returned SYSERR\n");
+         ok = GNUNET_SYSERR;
+         continue;
+       }
       if (GNUNET_SYSERR ==
-          GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_TEST,
-                                    &purp, &sig, &pkey))
-        {
-          printf ("GNUNET_CRYPTO_rsa_verify failed!\n");
-          ok = GNUNET_SYSERR;
-          continue;
-        }
+         GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_TEST, &purp,
+                                   &sig, &pkey))
+       {
+         printf ("GNUNET_CRYPTO_rsa_verify failed!\n");
+         ok = GNUNET_SYSERR;
+         continue;
+       }
       if (GNUNET_SYSERR !=
-          GNUNET_CRYPTO_rsa_verify (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_HELLO,
-                                    &purp, &sig, &pkey))
-        {
-          printf ("GNUNET_CRYPTO_rsa_verify failed to fail!\n");
-          ok = GNUNET_SYSERR;
-          continue;
-        }
+         GNUNET_CRYPTO_rsa_verify
+         (GNUNET_SIGNATURE_PURPOSE_TRANSPORT_PONG_OWN, &purp, &sig, &pkey))
+       {
+         printf ("GNUNET_CRYPTO_rsa_verify failed to fail!\n");
+         ok = GNUNET_SYSERR;
+         continue;
+       }
     }
-  printf ("%d RSA sign/verify operations %llums\n",
-          ITER,
-          (unsigned long long) GNUNET_TIME_absolute_get_duration (start).
-          value);
+  printf ("%d RSA sign/verify operations %llums\n", ITER,
+         (unsigned long long)
+         GNUNET_TIME_absolute_get_duration (start).rel_value);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   return ok;
 }
@@ -266,14 +263,15 @@ testSignPerformance ()
     {
       fprintf (stderr, ".");
       if (GNUNET_SYSERR == GNUNET_CRYPTO_rsa_sign (hostkey, &purp, &sig))
-        {
-          fprintf (stderr, "GNUNET_CRYPTO_rsa_sign returned SYSERR\n");
-          ok = GNUNET_SYSERR;
-          continue;
-        }
+       {
+         fprintf (stderr, "GNUNET_CRYPTO_rsa_sign returned SYSERR\n");
+         ok = GNUNET_SYSERR;
+         continue;
+       }
     }
   printf ("%d RSA sign operations %llu ms\n", ITER,
-          GNUNET_TIME_absolute_get_duration (start).value);
+         (unsigned long long)
+         GNUNET_TIME_absolute_get_duration (start).rel_value);
   GNUNET_CRYPTO_rsa_key_free (hostkey);
   return ok;
 }
@@ -288,14 +286,17 @@ testCreateFromFile ()
   struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded p2;
 
   key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+  GNUNET_assert (NULL != key);
   GNUNET_CRYPTO_rsa_key_get_public (key, &p1);
   GNUNET_CRYPTO_rsa_key_free (key);
   key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+  GNUNET_assert (NULL != key);
   GNUNET_CRYPTO_rsa_key_get_public (key, &p2);
   GNUNET_assert (0 == memcmp (&p1, &p2, sizeof (p1)));
   GNUNET_CRYPTO_rsa_key_free (key);
   GNUNET_assert (0 == UNLINK (KEYFILE));
   key = GNUNET_CRYPTO_rsa_key_create_from_file (KEYFILE);
+  GNUNET_assert (NULL != key);
   GNUNET_CRYPTO_rsa_key_get_public (key, &p2);
   GNUNET_assert (0 != memcmp (&p1, &p2, sizeof (p1)));
   GNUNET_CRYPTO_rsa_key_free (key);
@@ -332,4 +333,4 @@ main (int argc, char *argv[])
       return -1;
     }
   return 0;
-}                               /* end of main */
+}                              /* end of main */