taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

handle double-revoke gracefully

Browse Source
This commit is contained in:
Christian Grothoff 2021-11-25 09:54:23 +01:00
parent bab213e794
commit 414237c335
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/util/taler-exchange-secmod-eddsa.c
View File

@ -454,7 +454,14 @@ handle_revoke_request (struct TES_Client *client,
"Revocation request ignored, key unknown\n"); "Revocation request ignored, key unknown\n");
return GNUNET_OK; return GNUNET_OK;
} }
if (key->purge)
{
GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Revocation request ignored, key %s already revoked\n",
TALER_B2S (&key->exchange_pub));
return GNUNET_OK;
}
key_gen++; key_gen++;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Revoking key %s, bumping generation to %llu\n", "Revoking key %s, bumping generation to %llu\n",

12
src/util/taler-exchange-secmod-rsa.c
View File

@ -573,11 +573,19 @@ handle_revoke_request (struct TES_Client *client,
GNUNET_h2s (&rr->h_rsa.hash)); GNUNET_h2s (&rr->h_rsa.hash));
return GNUNET_OK; return GNUNET_OK;
} }
if (dk->purge)
{
GNUNET_assert (0 == pthread_mutex_unlock (&keys_lock));
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
"Revocation request ignored, denomination key %s already revoked\n",
GNUNET_h2s (&rr->h_rsa.hash));
return GNUNET_OK;
}
key_gen++; key_gen++;
GNUNET_log (GNUNET_ERROR_TYPE_INFO, GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Revoking key %p, bumping generation to %llu\n", "Revoking key %s, bumping generation to %llu\n",
dk, GNUNET_h2s (&rr->h_rsa.hash),
(unsigned long long) key_gen); (unsigned long long) key_gen);
purge_key (dk); purge_key (dk);

5
src/util/test_helper_eddsa.c
View File

@ -197,8 +197,9 @@ test_revocation (struct TALER_CRYPTO_ExchangeSignHelper *esh)
} }
keys[j].revoked = true; keys[j].revoked = true;
fprintf (stderr, fprintf (stderr,
"Revoking key %s ...", "Revoking key %s (%u) ...",
TALER_B2S (&keys[j].exchange_pub)); TALER_B2S (&keys[j].exchange_pub),
j);
TALER_CRYPTO_helper_esign_revoke (esh, TALER_CRYPTO_helper_esign_revoke (esh,
&keys[j].exchange_pub); &keys[j].exchange_pub);
for (unsigned int k = 0; k<1000; k++) for (unsigned int k = 0; k<1000; k++)