aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-01-02 12:08:42 +0100
committerChristian Grothoff <christian@grothoff.org>2019-01-02 12:08:42 +0100
commit5c71c3e70e4ff608889b41cd1379e298766c9d31 (patch)
treea5ac5e2ffd0a11e0277bb6094171837a1e82d3ac /src
parenta6331c8eac163f4e64b109edace549639084b958 (diff)
likely fix fo #5136/c13438
Diffstat (limited to 'src')
-rw-r--r--src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.feebin600 -> 600 bytes
-rw-r--r--src/exchange-lib/exchange_api_handle.c4
2 files changed, 3 insertions, 1 deletions
diff --git a/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee b/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
index e1941f300..68f27cad4 100644
--- a/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
+++ b/src/auditor-lib/test_exchange_api_home/.local/share/taler/exchange/wirefees/x-taler-bank.fee
Binary files differ
diff --git a/src/exchange-lib/exchange_api_handle.c b/src/exchange-lib/exchange_api_handle.c
index f88d889dd..47b984386 100644
--- a/src/exchange-lib/exchange_api_handle.c
+++ b/src/exchange-lib/exchange_api_handle.c
@@ -456,7 +456,7 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor,
}
if (NULL == dk)
{
- GNUNET_break_op (0); /* FAILS: #5136 */
+ GNUNET_break_op (0);
continue;
}
if (check_sigs)
@@ -1303,6 +1303,8 @@ TALER_EXCHANGE_serialize_data (struct TALER_EXCHANGE_Handle *exchange)
const struct TALER_EXCHANGE_DenomPublicKey *dk = &kd->denom_keys[adi->denom_key_offset];
json_t *k;
+ if (now.abs_value_us > dk->expire_deposit.abs_value_us)
+ continue; /* skip auditor signatures for denomination keys that have expired */
GNUNET_assert (adi->denom_key_offset < kd->num_denom_keys);
k = json_pack ("{s:o, s:o}",
"denom_pub_h",