From d382adb2e36b16681052c7891a379f2995d3e520 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Wed, 29 Jun 2022 11:24:14 +0200 Subject: -actually fix compatibility break from Oec --- src/json/json_pack.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/json/json_pack.c') diff --git a/src/json/json_pack.c b/src/json/json_pack.c index ec036f691..834e8104b 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); -- cgit v1.2.3