summaryrefslogtreecommitdiff
path: root/src/json/json_pack.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2022-06-29 11:24:14 +0200
committerChristian Grothoff <christian@grothoff.org>2022-06-29 11:24:14 +0200
commitd382adb2e36b16681052c7891a379f2995d3e520 (patch)
treec6471af8311616d6c6dfd8d326a370b3e3b11e24 /src/json/json_pack.c
parent70d9d0b94e7afd6336e51418103728652918cfaf (diff)
downloadexchange-d382adb2e36b16681052c7891a379f2995d3e520.tar.gz
exchange-d382adb2e36b16681052c7891a379f2995d3e520.tar.bz2
exchange-d382adb2e36b16681052c7891a379f2995d3e520.zip
-actually fix compatibility break from Oec
Diffstat (limited to 'src/json/json_pack.c')
-rw-r--r--src/json/json_pack.c16
1 files changed, 6 insertions, 10 deletions
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);