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

do not repeatedly append the same auditor signature

Browse Source
This commit is contained in:
Christian Grothoff 2021-04-14 17:39:13 +02:00
parent 084a5f6685
commit 453d122c30
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/lib/exchange_api_handle.c
View File

@ -803,7 +803,7 @@ decode_keys_json (const json_t *resp_obj,
json_array_foreach (denom_keys_array, index, denom_key_obj) { json_array_foreach (denom_keys_array, index, denom_key_obj) {
struct TALER_EXCHANGE_DenomPublicKey dk; struct TALER_EXCHANGE_DenomPublicKey dk;
int found = GNUNET_NO; bool found = false;
memset (&dk, memset (&dk,
0, 0,
@ -822,11 +822,11 @@ decode_keys_json (const json_t *resp_obj,
if (0 == denoms_cmp (&dk, if (0 == denoms_cmp (&dk,
&key_data->denom_keys[j])) &key_data->denom_keys[j]))
{ {
found = GNUNET_YES; found = true;
break; break;
} }
} }
if (GNUNET_YES == found) if (found)
{ {
/* 0:0:0 did not support /keys cherry picking */ /* 0:0:0 did not support /keys cherry picking */
TALER_LOG_DEBUG ("Skipping denomination key: already know it\n"); TALER_LOG_DEBUG ("Skipping denomination key: already know it\n");
@ -862,7 +862,7 @@ decode_keys_json (const json_t *resp_obj,
/* Merge with the existing auditor information we have (/keys cherry picking) */ /* Merge with the existing auditor information we have (/keys cherry picking) */
json_array_foreach (auditors_array, index, auditor_info) { json_array_foreach (auditors_array, index, auditor_info) {
struct TALER_EXCHANGE_AuditorInformation ai; struct TALER_EXCHANGE_AuditorInformation ai;
int found = GNUNET_NO; bool found = false;
memset (&ai, memset (&ai,
0, 0,
@ -879,22 +879,35 @@ decode_keys_json (const json_t *resp_obj,
if (0 == GNUNET_memcmp (&ai.auditor_pub, if (0 == GNUNET_memcmp (&ai.auditor_pub,
&aix->auditor_pub)) &aix->auditor_pub))
{ {
found = GNUNET_YES; found = true;
/* Merge denomination key signatures of downloaded /keys into existing /* Merge denomination key signatures of downloaded /keys into existing
auditor information 'aix'. */ auditor information 'aix'. */
TALER_LOG_DEBUG ( TALER_LOG_DEBUG (
"Merging %u new audited keys with %u known audited keys\n", "Merging %u new audited keys with %u known audited keys\n",
aix->num_denom_keys, aix->num_denom_keys,
ai.num_denom_keys); ai.num_denom_keys);
for (unsigned int i = 0; i<ai.num_denom_keys; i++)
{
bool kfound = false;
GNUNET_array_concatenate (aix->denom_keys, for (unsigned int k = 0; k<aix->num_denom_keys; k++)
aix->num_denom_keys, {
ai.denom_keys, if (aix->denom_keys[k].denom_key_offset ==
ai.num_denom_keys); ai.denom_keys[i].denom_key_offset)
{
kfound = true;
break; break;
} }
} }
if (GNUNET_YES == found) if (! kfound)
GNUNET_array_append (aix->denom_keys,
aix->num_denom_keys,
ai.denom_keys[i]);
}
break;
}
}
if (found)
{ {
GNUNET_array_grow (ai.denom_keys, GNUNET_array_grow (ai.denom_keys,
ai.num_denom_keys, ai.num_denom_keys,