/*
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
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.
*/
/**
#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
/**
*/
static int print_examples_flag;
-/**
- * Flag for printing hash of public key.
- */
-static int print_peer_identity;
-
/**
* Option set to create a bunch of keys at once.
*/
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+")))
{
- fprintf (stderr,
- _("Failed to open `%s': %s\n"),
- fn,
- STRERROR (errno));
+ fprintf (stderr, _("Failed to open `%s': %s\n"), fn, STRERROR (errno));
return;
}
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,
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;
}
while (0 < make_keys--)
_("\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");
}
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);
return;
}
if (print_public_key)
- {
- struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
- struct GNUNET_CRYPTO_EddsaPublicKey pub;
- char *s;
-
- pk = GNUNET_CRYPTO_eddsa_key_create_from_file (args[0]);
- if (NULL == pk)
- return;
- GNUNET_CRYPTO_eddsa_key_get_public (pk, &pub);
- s = GNUNET_CRYPTO_eddsa_public_key_to_string (&pub);
- FPRINTF (stdout,
- "%s\n",
- s);
- GNUNET_free (s);
- GNUNET_free (pk);
- }
- if (print_peer_identity)
{
char *str;
struct GNUNET_DISK_FileHandle *keyfile;
{ 'p', "print-public-key", NULL,
gettext_noop ("print the public key in ASCII format"),
0, &GNUNET_GETOPT_set_one, &print_public_key },
- { 'P', "print-peer-identity", NULL,
- gettext_noop ("print the hash of the public key in ASCII format"),
- 0, &GNUNET_GETOPT_set_one, &print_peer_identity },
{ 'E', "examples", NULL,
gettext_noop ("print examples of ECC operations (used for compatibility testing)"),
0, &GNUNET_GETOPT_set_one, &print_examples_flag },