[taler-exchange] branch master updated: -actually fix compatibility break from Oec

[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 d382adb2 -actually fix compatibility break from Oec
d382adb2 is described below

commit d382adb2e36b16681052c7891a379f2995d3e520
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Jun 29 11:24:14 2022 +0200

    -actually fix compatibility break from Oec
---
 src/exchange/taler-exchange-httpd_keys.c |  2 --
 src/json/json_pack.c                     | 16 ++++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/exchange/taler-exchange-httpd_keys.c 
b/src/exchange/taler-exchange-httpd_keys.c
index 9de102c7..08c83dda 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -2155,8 +2155,6 @@ finish_keys_response (struct TEH_KeyStateHandle *ksh)
                                         dk->meta.expire_deposit),
             GNUNET_JSON_pack_timestamp ("stamp_expire_legal",
                                         dk->meta.expire_legal),
-            GNUNET_JSON_pack_uint64 ("age_mask",
-                                     dk->meta.age_mask.bits),
             TALER_JSON_pack_denom_pub ("denom_pub",
                                        &dk->denom_pub),
             TALER_JSON_pack_amount ("value",
diff --git a/src/json/json_pack.c b/src/json/json_pack.c
index ec036f69..834e8104 100644
--- a/src/json/json_pack.c
+++ b/src/json/json_pack.c
@@ -113,33 +113,29 @@ TALER_JSON_pack_denom_pub (
   struct GNUNET_JSON_PackSpec ps = {
     .field_name = name,
   };
-  struct GNUNET_JSON_PackSpec mask_or_end;
 
   if (NULL == pk)
     return ps;
-
-  mask_or_end = (0 != pk->age_mask.bits) ?
-                GNUNET_JSON_pack_uint64 ("age_mask", pk->age_mask.bits) :
-                GNUNET_JSON_pack_end_ ();
-
   switch (pk->cipher)
   {
   case TALER_DENOMINATION_RSA:
     ps.object
       = GNUNET_JSON_PACK (
           GNUNET_JSON_pack_string ("cipher", "RSA"),
+          GNUNET_JSON_pack_uint64 ("age_mask",
+                                   pk->age_mask.bits),
           GNUNET_JSON_pack_rsa_public_key ("rsa_public_key",
-                                           pk->details.rsa_public_key),
-          mask_or_end);
+                                           pk->details.rsa_public_key));
     break;
   case TALER_DENOMINATION_CS:
     ps.object
       = GNUNET_JSON_PACK (
           GNUNET_JSON_pack_string ("cipher", "CS"),
+          GNUNET_JSON_pack_uint64 ("age_mask",
+                                   pk->age_mask.bits),
           GNUNET_JSON_pack_data_varsize ("cs_public_key",
                                          &pk->details.cs_public_key,
-                                         sizeof (pk->details.cs_public_key)),
-          mask_or_end);
+                                         sizeof (pk->details.cs_public_key)));
     break;
   default:
     GNUNET_assert (0);

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