[taler-exchange] branch master updated: skip keys in future keys if they already expired

[gnunet]

This is an automated email from the git hooks/post-receive script.

grothoff pushed a commit to branch master
in repository exchange.

The following commit(s) were added to refs/heads/master by this push:
     new 74ea2da2 skip keys in future keys if they already expired
74ea2da2 is described below

commit 74ea2da2b0aa978b09ee44c3e377f730a73c667f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Apr 16 14:17:33 2021 +0200

    skip keys in future keys if they already expired
---
 src/exchange/taler-exchange-httpd_keys.c | 4 ++++
 src/util/secmod_signatures.c             | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/exchange/taler-exchange-httpd_keys.c 
b/src/exchange/taler-exchange-httpd_keys.c
index 50d700a8..579cb6b3 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -2312,6 +2312,8 @@ add_future_denomkey_cb (void *cls,
                                           h_denom_pub);
   if (NULL != dk)
     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.expire_withdraw = GNUNET_TIME_absolute_add (meta.start,
                                                    hd->validity_duration);
@@ -2386,6 +2388,8 @@ add_future_signkey_cb (void *cls,
                                           pid);
   if (NULL != sk)
     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,
                                            hsk->validity_duration);
   legal_end = GNUNET_TIME_absolute_add (stamp_expire,
diff --git a/src/util/secmod_signatures.c b/src/util/secmod_signatures.c
index 3df68861..31670dfd 100644
--- a/src/util/secmod_signatures.c
+++ b/src/util/secmod_signatures.c
@@ -61,6 +61,11 @@ TALER_exchange_secmod_eddsa_verify (
     .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
     GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_SM_SIGNING_KEY,
                                 &ska,

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.