/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ (C) 2012, 2013 Christian Grothoff (and other contributing authors)
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
/**
* @file util/gnunet-ecc.c
- * @brief tool to manipulate ECC key files
+ * @brief tool to manipulate EDDSA key files
* @author Christian Grothoff
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gcrypt.h>
/**
- * Flag for printing public key.
+ * Flag for listing public key.
*/
-static int print_public_key;
+static int list_keys;
/**
- * Flag for printing hash of public key.
+ * Flag for listing public key.
*/
-static int print_peer_identity;
+static int list_keys_count;
/**
- * Flag for printing short hash of public key.
+ * Flag for printing public key.
*/
-static int print_short_identity;
+static int print_public_key;
/**
- * Use weak random number generator for key generation.
+ * Flag for printing hash of public key.
*/
-static int weak_random;
+static int print_peer_identity;
/**
* Option set to create a bunch of keys at once.
*/
static unsigned int make_keys;
-/**
- * The private information of an ECC key pair.
- * NOTE: this must match the definition in crypto_ksk.c and crypto_ecc.c!
- */
-struct GNUNET_CRYPTO_EccPrivateKey
-{
- gcry_sexp_t sexp;
-};
-
-
-/**
- * Create a new private key. Caller must free return value.
- *
- * @return fresh private key
- */
-static struct GNUNET_CRYPTO_EccPrivateKey *
-ecc_key_create ()
-{
- struct GNUNET_CRYPTO_EccPrivateKey *ret;
- gcry_sexp_t s_key;
- gcry_sexp_t s_keyparam;
-
- GNUNET_assert (0 ==
- gcry_sexp_build (&s_keyparam, NULL,
- "(genkey(ecc(nbits %d)(ecc-use-e 3:257)))",
- 2048));
- GNUNET_assert (0 == gcry_pk_genkey (&s_key, s_keyparam));
- gcry_sexp_release (s_keyparam);
-#if EXTRA_CHECKS
- GNUNET_assert (0 == gcry_pk_testkey (s_key));
-#endif
- ret = GNUNET_malloc (sizeof (struct GNUNET_CRYPTO_EccPrivateKey));
- ret->sexp = s_key;
- return ret;
-}
-
/**
* Create a flat file with a large number of key pairs for testing.
create_keys (const char *fn)
{
FILE *f;
- struct GNUNET_CRYPTO_EccPrivateKey *pk;
- struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded *enc;
+ struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
if (NULL == (f = fopen (fn, "w+")))
{
_("Generating %u keys, please wait"),
make_keys);
while (0 < make_keys--)
- {
+ {
fprintf (stderr,
".");
- if (NULL == (pk = ecc_key_create ()))
+ if (NULL == (pk = GNUNET_CRYPTO_eddsa_key_create ()))
{
GNUNET_break (0);
break;
}
- enc = GNUNET_CRYPTO_ecc_encode_key (pk);
- if (htons (enc->size) != fwrite (enc, 1, htons (enc->size), f))
- {
- fprintf (stderr,
- _("\nFailed to write to `%s': %s\n"),
- fn,
- STRERROR (errno));
- GNUNET_CRYPTO_ecc_key_free (pk);
- GNUNET_free (enc);
- break;
- }
- GNUNET_CRYPTO_ecc_key_free (pk);
- GNUNET_free (enc);
+ if (GNUNET_TESTING_HOSTKEYFILESIZE !=
+ fwrite (pk, 1,
+ GNUNET_TESTING_HOSTKEYFILESIZE, f))
+ {
+ fprintf (stderr,
+ _("\nFailed to write to `%s': %s\n"),
+ fn,
+ STRERROR (errno));
+ GNUNET_free (pk);
+ break;
+ }
+ GNUNET_free (pk);
}
- if (0 == make_keys)
+ if (UINT_MAX == make_keys)
fprintf (stderr,
- _("Finished!\n"));
+ _("\nFinished!\n"));
+ else
+ fprintf (stderr,
+ _("\nError, %u keys not generated\n"), make_keys);
fclose (f);
}
+static void
+print_key (const char *filename)
+{
+ struct GNUNET_DISK_FileHandle *fd;
+ struct GNUNET_CRYPTO_EddsaPrivateKey private_key;
+ struct GNUNET_CRYPTO_EddsaPublicKey public_key;
+ char *hostkeys_data;
+ char *hostkey_str;
+ uint64_t fs;
+ unsigned int total_hostkeys;
+ unsigned int c;
+
+ if (GNUNET_YES != GNUNET_DISK_file_test (filename))
+ {
+ fprintf (stderr, _("Hostkeys file not found: %s\n"), filename);
+ return;
+ }
+
+ /* Check hostkey file size, read entire thing into memory */
+ if (GNUNET_OK != GNUNET_DISK_file_size (filename, &fs, GNUNET_YES, GNUNET_YES))
+ fs = 0;
+ if (0 == fs)
+ {
+ fprintf (stderr, _("Hostkeys file is empty: %s\n"), filename);
+ return; /* File is empty */
+ }
+ if (0 != (fs % GNUNET_TESTING_HOSTKEYFILESIZE))
+ {
+ fprintf (stderr,
+ _("Incorrect hostkey file format: %s\n"), filename);
+ return;
+ }
+ fd = GNUNET_DISK_file_open (filename, GNUNET_DISK_OPEN_READ,
+ GNUNET_DISK_PERM_NONE);
+ if (NULL == fd)
+ {
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "open", filename);
+ return;
+ }
+ hostkeys_data = GNUNET_malloc (fs);
+ if (fs != GNUNET_DISK_file_read(fd, hostkeys_data, fs))
+ {
+ fprintf (stderr,
+ _("Could not readk hostkey file: %s\n"), filename);
+ GNUNET_free (hostkeys_data);
+ return;
+ }
+ GNUNET_DISK_file_close (fd);
+
+ if (NULL == hostkeys_data)
+ return;
+ total_hostkeys = fs / GNUNET_TESTING_HOSTKEYFILESIZE;
+ for (c = 0; (c < total_hostkeys) && (c < list_keys_count); c++)
+ {
+ memcpy (&private_key,
+ hostkeys_data + (c * GNUNET_TESTING_HOSTKEYFILESIZE),
+ GNUNET_TESTING_HOSTKEYFILESIZE);
+ GNUNET_CRYPTO_eddsa_key_get_public (&private_key, &public_key);
+ hostkey_str = GNUNET_CRYPTO_eddsa_public_key_to_string (&public_key);
+ if (NULL != hostkey_str)
+ {
+ fprintf (stderr, "%4u: %s\n", c, hostkey_str);
+ GNUNET_free (hostkey_str);
+ }
+ else
+ fprintf (stderr, "%4u: %s\n", c, "invalid");
+ }
+ GNUNET_free (hostkeys_data);
+}
+
+
/**
* Main function that will be run by the scheduler.
*
run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
- struct GNUNET_CRYPTO_EccPrivateKey *pk;
- struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pub;
- struct GNUNET_PeerIdentity pid;
+ struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
+ struct GNUNET_CRYPTO_EddsaPublicKey pub;
if (NULL == args[0])
{
- fprintf (stderr, _("No hostkey file specified on command line\n"));
+ FPRINTF (stderr,
+ "%s",
+ _("No hostkey file specified on command line\n"));
+ return;
+ }
+ if (list_keys)
+ {
+ print_key(args[0]);
return;
}
- if (0 != weak_random)
- GNUNET_CRYPTO_random_disable_entropy_gathering ();
if (make_keys > 0)
{
create_keys (args[0]);
return;
}
- pk = GNUNET_CRYPTO_ecc_key_create_from_file (args[0]);
+ pk = GNUNET_CRYPTO_eddsa_key_create_from_file (args[0]);
if (NULL == pk)
return;
if (print_public_key)
{
char *s;
- GNUNET_CRYPTO_ecc_key_get_public (pk, &pub);
- s = GNUNET_CRYPTO_ecc_public_key_to_string (&pub);
- fprintf (stdout, "%s\n", s);
+ 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);
}
if (print_peer_identity)
{
- struct GNUNET_CRYPTO_HashAsciiEncoded enc;
+ char *str;
- GNUNET_CRYPTO_ecc_key_get_public (pk, &pub);
- GNUNET_CRYPTO_hash (&pub, sizeof (pub), &pid.hashPubKey);
- GNUNET_CRYPTO_hash_to_enc (&pid.hashPubKey, &enc);
- fprintf (stdout, "%s\n", enc.encoding);
+ GNUNET_CRYPTO_eddsa_key_get_public (pk, &pub);
+ str = GNUNET_CRYPTO_eddsa_public_key_to_string (&pub);
+ FPRINTF (stdout,
+ "%s\n",
+ str);
+ GNUNET_free (str);
}
- if (print_short_identity)
- {
- struct GNUNET_CRYPTO_ShortHashAsciiEncoded enc;
- struct GNUNET_CRYPTO_ShortHashCode sh;
-
- GNUNET_CRYPTO_ecc_key_get_public (pk, &pub);
- GNUNET_CRYPTO_short_hash (&pub, sizeof (pub), &sh);
- GNUNET_CRYPTO_short_hash_to_enc (&sh, &enc);
- fprintf (stdout, "%s\n", enc.short_encoding);
- }
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
}
int
main (int argc, char *const *argv)
{
+ list_keys_count = UINT32_MAX;
static const struct GNUNET_GETOPT_CommandLineOption options[] = {
+ { 'i', "iterate", "FILE",
+ gettext_noop ("list keys included in a file (for testing)"),
+ 0, &GNUNET_GETOPT_set_one, &list_keys },
+ { 'e', "end=", "COUNT",
+ gettext_noop ("number of keys to list included in a file (for testing)"),
+ 1, &GNUNET_GETOPT_set_uint, &list_keys_count },
{ 'g', "generate-keys", "COUNT",
gettext_noop ("create COUNT public-private key pairs (for testing)"),
1, &GNUNET_GETOPT_set_uint, &make_keys },
{ '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 },
- { 's', "print-short-identity", NULL,
- gettext_noop ("print the short hash of the public key in ASCII format"),
- 0, &GNUNET_GETOPT_set_one, &print_short_identity },
- { 'w', "weak-random", NULL,
- gettext_noop ("use insecure, weak random number generator for key generation (for testing only)"),
- 0, &GNUNET_GETOPT_set_one, &weak_random },
GNUNET_GETOPT_OPTION_END
};
+ int ret;
if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv))
return 2;
- return (GNUNET_OK ==
- GNUNET_PROGRAM_run (argc, argv, "gnunet-ecc [OPTIONS] keyfile",
- gettext_noop ("Manipulate GNUnet private ECC key files"),
- options, &run, NULL)) ? 0 : 1;
+ ret = (GNUNET_OK ==
+ GNUNET_PROGRAM_run (argc, argv, "gnunet-ecc [OPTIONS] keyfile",
+ gettext_noop ("Manipulate GNUnet private ECC key files"),
+ options, &run, NULL)) ? 0 : 1;
+ GNUNET_free ((void*) argv);
+ return ret;
}
/* end of gnunet-ecc.c */
projects / oweals / gnunet.git / blobdiff