skip keys in future keys if they already expired

This commit is contained in:
Christian Grothoff 2021-04-16 14:17:33 +02:00
parent 453d122c30
commit 74ea2da2b0
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 9 additions and 0 deletions

View File

@ -2312,6 +2312,8 @@ add_future_denomkey_cb (void *cls,
h_denom_pub); h_denom_pub);
if (NULL != dk) if (NULL != dk)
return GNUNET_OK; /* skip: this key is already active! */ return GNUNET_OK; /* skip: this key is already active! */
if (0 == hd->validity_duration.rel_value_us)
return GNUNET_OK; /* this key already expired! */
meta.start = hd->start_time; meta.start = hd->start_time;
meta.expire_withdraw = GNUNET_TIME_absolute_add (meta.start, meta.expire_withdraw = GNUNET_TIME_absolute_add (meta.start,
hd->validity_duration); hd->validity_duration);
@ -2386,6 +2388,8 @@ add_future_signkey_cb (void *cls,
pid); pid);
if (NULL != sk) if (NULL != sk)
return GNUNET_OK; /* skip: this key is already active */ return GNUNET_OK; /* skip: this key is already active */
if (0 == hsk->validity_duration.rel_value_us)
return GNUNET_OK; /* this key already expired! */
stamp_expire = GNUNET_TIME_absolute_add (hsk->start_time, stamp_expire = GNUNET_TIME_absolute_add (hsk->start_time,
hsk->validity_duration); hsk->validity_duration);
legal_end = GNUNET_TIME_absolute_add (stamp_expire, legal_end = GNUNET_TIME_absolute_add (stamp_expire,

View File

@ -61,6 +61,11 @@ TALER_exchange_secmod_eddsa_verify (
.duration = GNUNET_TIME_relative_hton (duration) .duration = GNUNET_TIME_relative_hton (duration)
}; };
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Verifying key `%s' with duration %s\n",
TALER_B2S (exchange_pub),
GNUNET_STRINGS_relative_time_to_string (duration,
GNUNET_NO));
return return
GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_SM_SIGNING_KEY, GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_SM_SIGNING_KEY,
&ska, &ska,