*/
static int print_peer_identity;
-/**
- * Flag for printing short hash of public key.
- */
-static int print_short_identity;
-
/**
* Option set to create a bunch of keys at once.
*/
_("Generating %u keys, please wait"),
make_keys);
while (0 < make_keys--)
- {
+ {
fprintf (stderr,
".");
if (NULL == (pk = GNUNET_CRYPTO_ecc_key_create ()))
GNUNET_break (0);
break;
}
- if (GNUNET_TESTING_HOSTKEYFILESIZE !=
+ if (GNUNET_TESTING_HOSTKEYFILESIZE !=
fwrite (pk, 1,
GNUNET_TESTING_HOSTKEYFILESIZE, f))
{
_("\nFailed to write to `%s': %s\n"),
fn,
STRERROR (errno));
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
break;
}
- GNUNET_CRYPTO_ecc_key_free (pk);
+ GNUNET_free (pk);
}
if (UINT_MAX == make_keys)
fprintf (stderr,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
struct GNUNET_CRYPTO_EccPrivateKey *pk;
- struct GNUNET_CRYPTO_EccPublicKey pub;
- struct GNUNET_PeerIdentity pid;
+ struct GNUNET_CRYPTO_EccPublicSignKey pub;
if (NULL == 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 },
GNUNET_GETOPT_OPTION_END
};
int ret;