donau

commit ea680744e11af29a9726dee54450d597e4e56169
parent fe0a69a43f5fc05404fc10f58fac4423450644a3
Author: Matyja Lukas Adam <lukas.matyja@students.bfh.ch>
Date:   Wed, 13 Mar 2024 00:00:33 +0100

Merge remote-tracking branch 'refs/remotes/origin/master'

Diffstat:
M
src/donau/donau-httpd_keys.c
 | 
25
+++++++++++++++----------

1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/src/donau/donau-httpd_keys.c b/src/donau/donau-httpd_keys.c
@@ -518,16 +518,22 @@ add_sign_key_cb (void *cls,
   //                                sk->meta.expire_sign.abs_time));
   // }
   GNUNET_assert (0 == json_array_append_new (ctx->signkeys, GNUNET_JSON_PACK (
-                                               // GNUNET_JSON_pack_timestamp ("stamp_start",
-                                               //                            sk->meta.start),
-                                               // GNUNET_JSON_pack_timestamp ("stamp_expire",
-                                               //                            sk->meta.expire_sign),
-                                               // GNUNET_JSON_pack_timestamp ("stamp_end",
-                                               //                            sk->meta.expire_legal),
-                                               // GNUNET_JSON_pack_data_auto ("master_sig",
-                                               //                            &sk->master_sig),
+                                               GNUNET_JSON_pack_timestamp (
+                                                 "stamp_start",
+                                                 sk->
+                                                 meta.valid_from),
+                                               GNUNET_JSON_pack_timestamp (
+                                                 "stamp_expire",
+                                                 sk->
+                                                 meta.expire_sign),
+                                               GNUNET_JSON_pack_timestamp (
+                                                 "stamp_end",
+                                                 sk->
+                                                 meta.expire_legal),
                                                GNUNET_JSON_pack_data_auto (
-                                                 "key", &sk->donau_pub))));
+                                                 "key",
+                                                 &sk->
+                                                 donau_pub))));
   return GNUNET_OK;
 }
 
@@ -1741,7 +1747,6 @@ donation_unit_info_cb (
  * @param cls closure with a `struct DH_KeyStateHandle *`
  * @param donau_pub the public key
  * @param meta meta data information about the denomination type (expirations)
- * @param master_sig master signature affirming the validity of this denomination
  */
 static void
 iterate_active_signing_keys_cb (