Link libgnunetblockgroup to libgnunetblock

[oweals/gnunet.git] / src / util / gnunet-ecc.c

diff --git a/src/util/gnunet-ecc.c b/src/util/gnunet-ecc.c
index 25852dc6753d67beef1376392b70cb0066a0eca0..ddfd9b1c3082c540d416170f3512e9ade7ed32b4 100644 (file)
--- a/src/util/gnunet-ecc.c
+++ b/src/util/gnunet-ecc.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2012, 2013 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012, 2013 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 
 /**
@@ -28,6 +28,9 @@
 #include "gnunet_testing_lib.h"
 #include <gcrypt.h>
 
+/**
+ * Number of characters a Base32-encoded public key requires.
+ */
 #define KEY_STR_LEN sizeof(struct GNUNET_CRYPTO_EddsaPublicKey)*8/5+1
 
 /**
@@ -69,11 +72,12 @@ create_keys (const char *fn, const char *prefix)
   struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
   struct GNUNET_CRYPTO_EddsaPublicKey target_pub;
   static char vanity[KEY_STR_LEN + 1];
-  int len;
-  int n;
-  int rest;
+  size_t len;
+  size_t n;
+  size_t rest;
   unsigned char mask;
   unsigned target_byte;
+  char *s;
 
   if (NULL == (f = fopen (fn, "w+")))
   {
@@ -83,11 +87,12 @@ create_keys (const char *fn, const char *prefix)
   if (NULL != prefix)
   {
     strncpy (vanity, prefix, KEY_STR_LEN);
-    len = strlen (vanity);
+    len = GNUNET_MIN (strlen (prefix), KEY_STR_LEN);
     n = len * 5 / 8;
     rest = len * 5 % 8;
 
     memset (&vanity[len], '0', KEY_STR_LEN - len);
+    vanity[KEY_STR_LEN] = '\0';
     GNUNET_assert (GNUNET_OK ==
                    GNUNET_CRYPTO_eddsa_public_key_from_string (vanity,
                                                                KEY_STR_LEN,
@@ -105,14 +110,28 @@ create_keys (const char *fn, const char *prefix)
       mask = ~ ((int)pow (2, 8 - rest) - 1);
       target_byte = ((unsigned char *) &target_pub)[n] & mask;
     }
+    else
+    {
+      /* Just so old (debian) versions of GCC calm down with the warnings. */
+      mask = target_byte = 0;
+    }
+    s = GNUNET_CRYPTO_eddsa_public_key_to_string (&target_pub);
     fprintf (stderr,
              _("Generating %u keys like %s, please wait"),
-             make_keys, GNUNET_CRYPTO_eddsa_public_key_to_string (&target_pub));
-    fprintf (stderr, "\nattempt %s [%d, %X]\n", vanity, n, mask);
+             make_keys,
+             s);
+    GNUNET_free (s);
+    fprintf (stderr,
+             "\nattempt %s [%u, %X]\n",
+             vanity,
+             (unsigned int) n,
+             mask);
   }
   else
   {
-    fprintf (stderr, _("Generating %u keys, please wait"), make_keys);
+    fprintf (stderr,
+             _("Generating %u keys, please wait"),
+             make_keys);
     /* Just so old (debian) versions of GCC calm down with the warnings. */
     n = rest = target_byte = mask = 0;
   }
@@ -165,19 +184,23 @@ create_keys (const char *fn, const char *prefix)
             _("\nFinished!\n"));
   else
     fprintf (stderr,
-            _("\nError, %u keys not generated\n"), make_keys);
+            _("\nError, %u keys not generated\n"),
+             make_keys);
   fclose (f);
 }
 
 
 static void
-print_hex (char *msg, void *buf, size_t size)
+print_hex (const char *msg,
+           const void *buf,
+           size_t size)
 {
   size_t i;
+
   printf ("%s: ", msg);
   for (i = 0; i < size; i++)
   {
-    printf ("%02hhx", ((char *)buf)[i]);
+    printf ("%02hhx", ((const char *)buf)[i]);
   }
   printf ("\n");
 }
@@ -300,7 +323,7 @@ print_key (const char *filename)
   total_hostkeys = fs / GNUNET_TESTING_HOSTKEYFILESIZE;
   for (c = 0; (c < total_hostkeys) && (c < list_keys_count); c++)
   {
-    memcpy (&private_key,
+    GNUNET_memcpy (&private_key,
             hostkeys_data + (c * GNUNET_TESTING_HOSTKEYFILESIZE),
             GNUNET_TESTING_HOSTKEYFILESIZE);
     GNUNET_CRYPTO_eddsa_key_get_public (&private_key, &public_key);