From a16c7ae39fd592edff7d65cd3e434cb269f9cb5d Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sun, 15 Mar 2015 17:08:12 +0100
Subject: [PATCH] cleaner /keys set filtering logic

---
 src/mint/taler-mint-httpd_keystate.c | 55 +++++++++++++++-------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/mint/taler-mint-httpd_keystate.c b/src/mint/taler-mint-httpd_keystate.c
index 159db9bed..b39ef3f8d 100644
--- a/src/mint/taler-mint-httpd_keystate.c
+++ b/src/mint/taler-mint-httpd_keystate.c
@@ -181,28 +181,30 @@ reload_keys_denom_iter (void *cls,
                         const struct TALER_MINT_DenomKeyIssuePriv *dki)
 {
   struct MintKeyState *ctx = cls;
-  struct GNUNET_TIME_Absolute stamp_provide;
+  struct GNUNET_TIME_Absolute now;
+  struct GNUNET_TIME_Absolute horizon;
   struct GNUNET_HashCode denom_key_hash;
   struct TALER_MINT_DenomKeyIssuePriv *d2;
   int res;
 
-  stamp_provide = GNUNET_TIME_absolute_add (ctx->reload_time,
-                                            TALER_MINT_conf_duration_provide ());
-
-  if (GNUNET_TIME_absolute_ntoh (dki->issue.expire_spend).abs_value_us < ctx->reload_time.abs_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Skipping expired denomination key `%s'\n",
-                alias);
-    return GNUNET_OK;
-  }
-  if (GNUNET_TIME_absolute_ntoh (dki->issue.start).abs_value_us > stamp_provide.abs_value_us)
+  horizon = GNUNET_TIME_relative_to_absolute (TALER_MINT_conf_duration_provide ());
+  if (GNUNET_TIME_absolute_ntoh (dki->issue.expire_spend).abs_value_us >
+      horizon.abs_value_us)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Skipping future denomination key `%s'\n",
                 alias);
     return GNUNET_OK;
   }
+  now = GNUNET_TIME_absolute_get ();
+  if (GNUNET_TIME_absolute_ntoh (dki->issue.expire_spend).abs_value_us <
+      now.abs_value_us)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Skipping expired denomination key `%s'\n",
+                alias);
+    return GNUNET_OK;
+  }
 
   GNUNET_CRYPTO_hash (&dki->issue.denom_pub,
                       sizeof (struct GNUNET_CRYPTO_EddsaPublicKey),
@@ -267,12 +269,21 @@ reload_keys_sign_iter (void *cls,
                        const struct TALER_MINT_SignKeyIssuePriv *ski)
 {
   struct MintKeyState *ctx = cls;
-  struct GNUNET_TIME_Absolute stamp_provide;
+  struct GNUNET_TIME_Absolute now;
+  struct GNUNET_TIME_Absolute horizon;
 
-  stamp_provide = GNUNET_TIME_absolute_add (ctx->reload_time,
-                                            TALER_MINT_conf_duration_provide (cfg));
-
-  if (GNUNET_TIME_absolute_ntoh (ski->issue.expire).abs_value_us < ctx->reload_time.abs_value_us)
+  horizon = GNUNET_TIME_relative_to_absolute (TALER_MINT_conf_duration_provide ());
+  if (GNUNET_TIME_absolute_ntoh (ski->issue.start).abs_value_us >
+      horizon.abs_value_us)
+  {
+    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+                "Skipping future signing key `%s'\n",
+                filename);
+    return GNUNET_OK;
+  }
+  now = GNUNET_TIME_absolute_get ();
+  if (GNUNET_TIME_absolute_ntoh (ski->issue.expire).abs_value_us <
+      now.abs_value_us)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_INFO,
                 "Skipping expired signing key `%s'\n",
@@ -280,17 +291,9 @@ reload_keys_sign_iter (void *cls,
     return GNUNET_OK;
   }
 
-  if (GNUNET_TIME_absolute_ntoh (ski->issue.start).abs_value_us > stamp_provide.abs_value_us)
-  {
-    GNUNET_log (GNUNET_ERROR_TYPE_INFO,
-                "Skipping future signing key `%s'\n",
-                filename);
-    return GNUNET_OK;
-  }
-
   /* The signkey is valid at this time, check if it's more recent than
      what we have so far! */
-  if (GNUNET_TIME_absolute_ntoh (ctx->current_sign_key_issue.issue.start).abs_value_us >
+  if (GNUNET_TIME_absolute_ntoh (ctx->current_sign_key_issue.issue.start).abs_value_us <
       GNUNET_TIME_absolute_ntoh (ski->issue.start).abs_value_us)
   {
     /* We keep the most recent one around */