diff options
| author | Christian Grothoff <christian@grothoff.org> | 2021-10-25 10:40:32 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2021-10-27 09:23:12 +0200 |
| commit | 3af7bc0a292715766c3b0196d31a3eea8dc6ca4b (patch) | |
| tree | 0f6dd8188635dc12948afd9ea1be4a12cccc84f4 /src/json | |
| parent | ec3d5a7655d63c0d5675c095e3ebbb3cdc72a087 (diff) | |
-more FTBFS fixes
Diffstat (limited to 'src/json')
| -rw-r--r-- | src/json/json_pack.c | 8 | ||||
| -rw-r--r-- | src/json/json_wire.c | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/src/json/json_pack.c b/src/json/json_pack.c index 910fc6396..8e7d13eb9 100644 --- a/src/json/json_pack.c +++ b/src/json/json_pack.c @@ -101,16 +101,15 @@ TALER_JSON_pack_denomination_public_key ( case TALER_DENOMINATION_RSA: ps.object = GNUNET_JSON_PACK ( - GNUNET_JSON_pack_uint32 ("cipher", + GNUNET_JSON_pack_uint64 ("cipher", TALER_DENOMINATION_RSA), - GNUNET_JSON_pack_uint32 ("age_mask", + GNUNET_JSON_pack_uint64 ("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; } @@ -130,14 +129,13 @@ TALER_JSON_pack_denomination_signature ( case TALER_DENOMINATION_RSA: ps.object = GNUNET_JSON_PACK ( - GNUNET_JSON_pack_uint32 ("cipher", + GNUNET_JSON_pack_uint64 ("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; } diff --git a/src/json/json_wire.c b/src/json/json_wire.c index f88daefcb..8f7fd6bb6 100644 --- a/src/json/json_wire.c +++ b/src/json/json_wire.c @@ -26,7 +26,7 @@ enum GNUNET_GenericReturnValue TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s, - struct GNUNET_HashCode *hc) + struct TALER_MerchantWireHash *hc) { const char *payto_uri; struct TALER_WireSalt salt; |