/*
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
*/
#include "platform.h"
#include "gnunet_util_lib.h"
-#include "gnunet_testing_lib-new.h"
+#include "gnunet_testing_lib.h"
#include <gcrypt.h>
*/
static int print_peer_identity;
-/**
- * Flag for printing short hash of public key.
- */
-static int print_short_identity;
-
-/**
- * Use weak random number generator for key generation.
- */
-static int weak_random;
-
/**
* 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.
{
FILE *f;
struct GNUNET_CRYPTO_EccPrivateKey *pk;
- struct GNUNET_CRYPTO_EccPrivateKeyBinaryEncoded *enc;
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_ecc_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);
}
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_CRYPTO_EccPrivateKey *pk;
- struct GNUNET_CRYPTO_EccPublicKeyBinaryEncoded pub;
- struct GNUNET_PeerIdentity pid;
+ struct GNUNET_CRYPTO_EccPublicSignKey pub;
if (NULL == args[0])
{
fprintf (stderr, _("No hostkey file specified on command line\n"));
return;
}
- if (0 != weak_random)
- GNUNET_CRYPTO_random_disable_entropy_gathering ();
if (make_keys > 0)
{
create_keys (args[0]);
{
char *s;
- GNUNET_CRYPTO_ecc_key_get_public (pk, &pub);
- s = GNUNET_CRYPTO_ecc_public_key_to_string (&pub);
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (pk, &pub);
+ s = GNUNET_CRYPTO_ecc_public_sign_key_to_string (&pub);
fprintf (stdout, "%s\n", s);
GNUNET_free (s);
}
if (print_peer_identity)
{
- struct GNUNET_CRYPTO_HashAsciiEncoded enc;
-
- 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);
- }
- 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);
+ char *str;
+
+ GNUNET_CRYPTO_ecc_key_get_public_for_signature (pk, &pub);
+ str = GNUNET_CRYPTO_ecc_public_sign_key_to_string (&pub);
+ fprintf (stdout,
+ "%s\n",
+ str);
+ GNUNET_free (str);
}
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
}
{ '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 */