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

Need to check for revoked keys as well before adding from DB.

Browse Source 
Fixes ~13838.
This commit is contained in:
Christian Grothoff 2019-02-17 14:40:21 +01:00
parent 9fb889404a
commit 62e8c18390
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/exchange/taler-exchange-httpd_keystate.c
View File

@ -1457,6 +1457,10 @@ reload_public_denoms_cb (void *cls,
GNUNET_CONTAINER_multihashmap_get (rfc->key_state->denomkey_map, GNUNET_CONTAINER_multihashmap_get (rfc->key_state->denomkey_map,
&issue->properties.denom_hash)) &issue->properties.denom_hash))
return; /* exists / known */ return; /* exists / known */
if (NULL !=
GNUNET_CONTAINER_multihashmap_get (rfc->key_state->revoked_map,
&issue->properties.denom_hash))
return; /* exists / known */
/* zero-out, just for future-proofing */ /* zero-out, just for future-proofing */
memset (&dki, memset (&dki,
0, 0,
@ -1548,13 +1552,10 @@ make_fresh_key_state ()
/* Once we no longer get expired DKIs from /* Once we no longer get expired DKIs from
TALER_EXCHANGEDB_denomination_keys_iterate(), TALER_EXCHANGEDB_denomination_keys_iterate(),
we must fetch the information from the database! */ we must fetch the information from the database! */
if (0 /* #5536 */)
{
qs = TEH_plugin->iterate_denomination_info (TEH_plugin->cls, qs = TEH_plugin->iterate_denomination_info (TEH_plugin->cls,
&reload_public_denoms_cb, &reload_public_denoms_cb,
&rfc); &rfc);
GNUNET_break (0 <= qs); /* warn, but continue, fingers crossed */ GNUNET_break (0 <= qs); /* warn, but continue, fingers crossed */
}
/* Initialize `current_sign_key_issue` and `rfc.sign_keys_array` */ /* Initialize `current_sign_key_issue` and `rfc.sign_keys_array` */
TALER_EXCHANGEDB_signing_keys_iterate (TEH_exchange_directory, TALER_EXCHANGEDB_signing_keys_iterate (TEH_exchange_directory,
&reload_keys_sign_iter, &reload_keys_sign_iter,

1
src/exchangedb/exchangedb_denomkeys.c
View File

@ -268,6 +268,7 @@ denomkeys_iterate_keydir_iter (void *cls,
struct TALER_MasterDenominationKeyRevocation rm; struct TALER_MasterDenominationKeyRevocation rm;
const struct TALER_MasterSignatureP *revoked; const struct TALER_MasterSignatureP *revoked;
/* FIXME: #5536: should move .rev files into DB! */
if ( (strlen(filename) > strlen (".rev")) && if ( (strlen(filename) > strlen (".rev")) &&
(0 == strcmp (&filename[strlen(filename) - strlen (".rev")], (0 == strcmp (&filename[strlen(filename) - strlen (".rev")],
".rev")) ) ".rev")) )