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

-more changes towards fixing FTBFS

Browse Source
This commit is contained in:
Christian Grothoff 2021-10-24 12:33:25 +02:00 committed by Christian Grothoff
parent 464c1f806c
commit ec3d5a7655
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
1 changed files with 50 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/json/json_pack.c
View File

@ -88,22 +88,58 @@ TALER_JSON_pack_time_rel_nbo (const char *name,
struct GNUNET_JSON_PackSpec struct GNUNET_JSON_PackSpec
TALER_JSON_pack_denomination_public_key (const char *name, TALER_JSON_pack_denomination_public_key (
const struct const char *name,
TALER_DenominationPublicKey *pk) const struct TALER_DenominationPublicKey *pk)
{ {
return GNUNET_JSON_pack_rsa_public_key (name, struct GNUNET_JSON_PackSpec ps = {
pk->rsa_public_key); .field_name = name,
};
switch (pk->cipher)
{
case TALER_DENOMINATION_RSA:
ps.object
= GNUNET_JSON_PACK (
GNUNET_JSON_pack_uint32 ("cipher",
TALER_DENOMINATION_RSA),
GNUNET_JSON_pack_uint32 ("age_mask",
pk->age_mask),
GNUNET_JSON_pack_rsa_public_key ("rsa_public_key",
pk->details.rsa_public_key));
break;
default:
GNUNET_assert (0);
return GNUNET_SYSERR;
}
return ps;
} }
struct GNUNET_JSON_PackSpec struct GNUNET_JSON_PackSpec
TALER_JSON_pack_denomination_signature (const char *name, TALER_JSON_pack_denomination_signature (
const struct const char *name,
TALER_DenominationSignature *sig) const struct TALER_DenominationSignature *sig)
{ {
return GNUNET_JSON_pack_rsa_signature (name, struct GNUNET_JSON_PackSpec ps = {
sig->rsa_signature); .field_name = name,
};
switch (sig->cipher)
{
case TALER_DENOMINATION_RSA:
ps.object
= GNUNET_JSON_PACK (
GNUNET_JSON_pack_uint32 ("cipher",
TALER_DENOMINATION_RSA),
GNUNET_JSON_pack_rsa_signature ("rsa_signature",
sig->details.rsa_signature));
break;
default:
GNUNET_assert (0);
return GNUNET_SYSERR;
}
return ps;
} }
@ -114,8 +150,8 @@ TALER_JSON_pack_amount (const char *name,
struct GNUNET_JSON_PackSpec ps = { struct GNUNET_JSON_PackSpec ps = {
.field_name = name, .field_name = name,
.object = (NULL != amount) .object = (NULL != amount)
? TALER_JSON_from_amount (amount) ? TALER_JSON_from_amount (amount)
: NULL : NULL
}; };
return ps; return ps;
@ -129,8 +165,8 @@ TALER_JSON_pack_amount_nbo (const char *name,
struct GNUNET_JSON_PackSpec ps = { struct GNUNET_JSON_PackSpec ps = {
.field_name = name, .field_name = name,
.object = (NULL != amount) .object = (NULL != amount)
? TALER_JSON_from_amount_nbo (amount) ? TALER_JSON_from_amount_nbo (amount)
: NULL : NULL
}; };
return ps; return ps;