-even better

This commit is contained in:
Christian Grothoff 2021-08-07 16:33:33 +02:00
parent 3cdf7dfaaa
commit 7d809d1f4c
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 2 additions and 5 deletions

View File

@ -227,8 +227,7 @@ verify_signatures (const struct GNUNET_HashCode *h_wire,
TALER_LOG_WARNING ("Invalid signature on exchange signing key!\n"); TALER_LOG_WARNING ("Invalid signature on exchange signing key!\n");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_TIME_relative_is_zero ( if (GNUNET_TIME_absolute_is_past (ep_end))
GNUNET_TIME_absolute_get_remaining (ep_end)))
{ {
GNUNET_break (0); GNUNET_break (0);
TALER_LOG_WARNING ("Exchange signing key is no longer valid!\n"); TALER_LOG_WARNING ("Exchange signing key is no longer valid!\n");

View File

@ -1079,9 +1079,7 @@ TALER_EXCHANGE_check_keys_current (struct TALER_EXCHANGE_Handle *exchange,
exchange->state = MHS_INIT; exchange->state = MHS_INIT;
} }
if ( (! force_download) && if ( (! force_download) &&
(! GNUNET_TIME_relative_is_zero ( (GNUNET_TIME_absolute_is_future (exchange->key_data_expiration)) )
GNUNET_TIME_absolute_get_remaining (
exchange->key_data_expiration)) ) )
return exchange->key_data_expiration; return exchange->key_data_expiration;
if (NULL == exchange->retry_task) if (NULL == exchange->retry_task)
exchange->retry_task = GNUNET_SCHEDULER_add_now (&request_keys, exchange->retry_task = GNUNET_SCHEDULER_add_now (&request_keys,