do_shutdown (void *cls,
const struct GNUNET_SCHEDULER_TaskContext *tc)
{
+ if (NULL != el)
+ {
+ GNUNET_IDENTITY_ego_lookup_cancel (el);
+ el = NULL;
+ }
if (NULL != q)
{
GNUNET_REVOCATION_query_cancel (q);
switch (is_valid)
{
case GNUNET_YES:
- FPRINTF (stdout,
- _("Key for ego `%s' is still valid, revocation failed (!)\n"),
- test_ego);
+ if (NULL != revoke_ego)
+ FPRINTF (stdout,
+ _("Key for ego `%s' is still valid, revocation failed (!)\n"),
+ revoke_ego);
+ else
+ FPRINTF (stdout,
+ "%s",
+ _("Revocation failed (!)\n"));
break;
case GNUNET_NO:
- FPRINTF (stdout,
- _("Key for ego `%s' has been successfully revoked\n"),
- test_ego);
+ if (NULL != revoke_ego)
+ FPRINTF (stdout,
+ _("Key for ego `%s' has been successfully revoked\n"),
+ revoke_ego);
+ else
+ FPRINTF (stdout,
+ "%s",
+ _("Revocation successful.\n"));
break;
case GNUNET_SYSERR:
FPRINTF (stdout,
/**
* Public key.
*/
- struct GNUNET_CRYPTO_EccPublicSignKey key;
+ struct GNUNET_CRYPTO_EcdsaPublicKey key;
/**
* Revocation signature data.
*/
- struct GNUNET_CRYPTO_EccSignature sig;
+ struct GNUNET_CRYPTO_EcdsaSignature sig;
/**
* Proof of work (in NBO).
{
struct RevocationData *rd = cls;
+ /* store temporary results */
if ( (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason)) ||
(0 == (rd->pow % 128) ) )
{
- if (0 == (rd->pow % 128 * 1024))
- {
- if (0 == (rd->pow % (1024 * 128 * 80)))
- fprintf (stderr, "\n");
- fprintf (stderr, ".");
- }
if ( (NULL != filename) &&
(sizeof (struct RevocationData) ==
GNUNET_DISK_fn_write (filename,
"write",
filename);
}
+ /* display progress estimate */
+ if ( (0 == ((1 << matching_bits) / 100 / 50)) ||
+ (0 == (rd->pow % ((1 << matching_bits) / 100 / 50))) )
+ FPRINTF (stderr, "%s", ".");
+ if ( (0 != rd->pow) &&
+ ( (0 == ((1 << matching_bits) / 100)) ||
+ (0 == (rd->pow % ((1 << matching_bits) / 100))) ) )
+ FPRINTF (stderr, " - @ %3u%% (estimate)\n",
+ (unsigned int) (rd->pow * 100) / (1 << matching_bits));
if (0 != (GNUNET_SCHEDULER_REASON_SHUTDOWN & tc->reason))
{
GNUNET_free (rd);
return;
}
+ /* actually do POW calculation */
rd->pow++;
if (GNUNET_OK ==
GNUNET_REVOCATION_check_pow (&rd->key,
(unsigned int) matching_bits))
{
if ( (NULL != filename) &&
- (sizeof (struct RevocationData) ==
+ (sizeof (struct RevocationData) !=
GNUNET_DISK_fn_write (filename,
- &rd,
- sizeof (rd),
+ rd,
+ sizeof (struct RevocationData),
GNUNET_DISK_PERM_USER_READ |
GNUNET_DISK_PERM_USER_WRITE)) )
GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR,
perform_revocation (rd);
else
{
+ FPRINTF (stderr, "%s", "\n");
FPRINTF (stderr,
_("Revocation certificate for `%s' stored in `%s'\n"),
revoke_ego,
GNUNET_SCHEDULER_shutdown ();
}
GNUNET_free (rd);
+ return;
}
GNUNET_SCHEDULER_add_now (&calculate_pow,
rd);
const struct GNUNET_IDENTITY_Ego *ego)
{
struct RevocationData *rd;
- struct GNUNET_CRYPTO_EccPublicSignKey key;
+ struct GNUNET_CRYPTO_EcdsaPublicKey key;
el = NULL;
if (NULL == ego)
{
FPRINTF (stdout,
_("Ego `%s' not found.\n"),
- test_ego);
+ revoke_ego);
GNUNET_SCHEDULER_shutdown ();
return;
}
GNUNET_DISK_file_test (filename)) &&
(sizeof (struct RevocationData) ==
GNUNET_DISK_fn_read (filename,
- &rd,
- sizeof (rd))) )
+ rd,
+ sizeof (struct RevocationData))) )
{
if (0 != memcmp (&rd->key,
&key,
- sizeof (struct GNUNET_CRYPTO_EccPublicSignKey)))
+ sizeof (struct GNUNET_CRYPTO_EcdsaPublicKey)))
{
fprintf (stderr,
_("Error: revocation certificate in `%s' is not for `%s'\n"),
{
FPRINTF (stderr,
"%s",
- _("Revocation certificate ready, initiating revocation\n"));
- perform_revocation (rd);
+ _("Revocation certificate ready\n"));
+ if (perform)
+ perform_revocation (rd);
+ else
+ GNUNET_SCHEDULER_shutdown ();
GNUNET_free (rd);
return;
}
const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *c)
{
- struct GNUNET_CRYPTO_EccPublicSignKey pk;
+ struct GNUNET_CRYPTO_EcdsaPublicKey pk;
struct RevocationData rd;
cfg = c;
if (NULL != test_ego)
{
if (GNUNET_OK !=
- GNUNET_CRYPTO_ecc_public_sign_key_from_string (test_ego,
+ GNUNET_CRYPTO_ecdsa_public_key_from_string (test_ego,
strlen (test_ego),
&pk))
{
}
if (NULL != revoke_ego)
{
+ if ( !perform && (NULL == filename) )
+ {
+ FPRINTF (stderr,
+ "%s",
+ _("No filename to store revocation certificate given.\n"));
+ return;
+ }
/* main code here */
el = GNUNET_IDENTITY_ego_lookup (cfg,
revoke_ego,
filename);
return;
}
- perform_revocation (&rd);
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL,
&do_shutdown,
NULL);
+ if (GNUNET_YES !=
+ GNUNET_REVOCATION_check_pow (&rd.key,
+ rd.pow,
+ (unsigned int) matching_bits))
+ {
+ struct RevocationData *cp = GNUNET_new (struct RevocationData);
+
+ *cp = rd;
+ GNUNET_SCHEDULER_add_now (&calculate_pow,
+ cp);
+ return;
+
+ }
+ perform_revocation (&rd);
return;
}
FPRINTF (stderr,
gettext_noop ("use NAME for the name of the revocation file"),
1, &GNUNET_GETOPT_set_string, &filename},
{'R', "revoke", "NAME",
- gettext_noop ("revoke the private key associated with the ego NAME "),
+ gettext_noop ("revoke the private key associated for the the private key associated with the ego NAME "),
1, &GNUNET_GETOPT_set_string, &revoke_ego},
{'p', "perform", NULL,
- gettext_noop ("actually perform the revocation revocation file, otherwise we just do the precomputation"),
+ gettext_noop ("actually perform revocation, otherwise we just do the precomputation"),
0, &GNUNET_GETOPT_set_one, &perform},
{'t', "test", "KEY",
gettext_noop ("test if the public key KEY has been revoked"),