taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-actually fix compatibility break from Oec

Browse Source
This commit is contained in:
Christian Grothoff 2022-06-29 11:24:14 +02:00
parent 70d9d0b94e
commit d382adb2e3
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/exchange/taler-exchange-httpd_keys.c
View File

@ -2155,8 +2155,6 @@ finish_keys_response (struct TEH_KeyStateHandle *ksh)
dk->meta.expire_deposit), dk->meta.expire_deposit),
GNUNET_JSON_pack_timestamp ("stamp_expire_legal", GNUNET_JSON_pack_timestamp ("stamp_expire_legal",
dk->meta.expire_legal), dk->meta.expire_legal),
GNUNET_JSON_pack_uint64 ("age_mask",
dk->meta.age_mask.bits),
TALER_JSON_pack_denom_pub ("denom_pub", TALER_JSON_pack_denom_pub ("denom_pub",
&dk->denom_pub), &dk->denom_pub),
TALER_JSON_pack_amount ("value", TALER_JSON_pack_amount ("value",

16
src/json/json_pack.c
View File

@ -113,33 +113,29 @@ TALER_JSON_pack_denom_pub (
struct GNUNET_JSON_PackSpec ps = { struct GNUNET_JSON_PackSpec ps = {
.field_name = name, .field_name = name,
}; };
struct GNUNET_JSON_PackSpec mask_or_end;
if (NULL == pk) if (NULL == pk)
return ps; 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) switch (pk->cipher)
{ {
case TALER_DENOMINATION_RSA: case TALER_DENOMINATION_RSA:
ps.object ps.object
= GNUNET_JSON_PACK ( = GNUNET_JSON_PACK (
GNUNET_JSON_pack_string ("cipher", "RSA"), 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", GNUNET_JSON_pack_rsa_public_key ("rsa_public_key",
pk->details.rsa_public_key), pk->details.rsa_public_key));
mask_or_end);
break; break;
case TALER_DENOMINATION_CS: case TALER_DENOMINATION_CS:
ps.object ps.object
= GNUNET_JSON_PACK ( = GNUNET_JSON_PACK (
GNUNET_JSON_pack_string ("cipher", "CS"), GNUNET_JSON_pack_string ("cipher", "CS"),
GNUNET_JSON_pack_uint64 ("age_mask",
pk->age_mask.bits),
GNUNET_JSON_pack_data_varsize ("cs_public_key", GNUNET_JSON_pack_data_varsize ("cs_public_key",
&pk->details.cs_public_key, &pk->details.cs_public_key,
sizeof (pk->details.cs_public_key)), sizeof (pk->details.cs_public_key)));
mask_or_end);
break; break;
default: default:
GNUNET_assert (0); GNUNET_assert (0);