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

-more FTBFS fixes

Browse Source
This commit is contained in:
Christian Grothoff 2021-10-25 10:40:32 +02:00
parent ec3d5a7655
commit 3af7bc0a29
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/gana

@ -1 +1 @@
Subproject commit 0272caa8ff8ee7553d035d29fb19d01866df43e4 Subproject commit 8c7d9be40ba627348da3e01b91b4f1d3cc78631f

2
src/include/taler_json_lib.h
View File

@ -505,7 +505,7 @@ TALER_JSON_get_error_code2 (const void *data,
*/ */
enum GNUNET_GenericReturnValue enum GNUNET_GenericReturnValue
TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s, TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
struct GNUNET_HashCode *hc); struct TALER_MerchantWireHash *hc);
/** /**

8
src/json/json_pack.c
View File

@ -101,16 +101,15 @@ TALER_JSON_pack_denomination_public_key (
case TALER_DENOMINATION_RSA: case TALER_DENOMINATION_RSA:
ps.object ps.object
= GNUNET_JSON_PACK ( = GNUNET_JSON_PACK (
GNUNET_JSON_pack_uint32 ("cipher", GNUNET_JSON_pack_uint64 ("cipher",
TALER_DENOMINATION_RSA), TALER_DENOMINATION_RSA),
GNUNET_JSON_pack_uint32 ("age_mask", GNUNET_JSON_pack_uint64 ("age_mask",
pk->age_mask), pk->age_mask),
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));
break; break;
default: default:
GNUNET_assert (0); GNUNET_assert (0);
return GNUNET_SYSERR;
} }
return ps; return ps;
} }
@ -130,14 +129,13 @@ TALER_JSON_pack_denomination_signature (
case TALER_DENOMINATION_RSA: case TALER_DENOMINATION_RSA:
ps.object ps.object
= GNUNET_JSON_PACK ( = GNUNET_JSON_PACK (
GNUNET_JSON_pack_uint32 ("cipher", GNUNET_JSON_pack_uint64 ("cipher",
TALER_DENOMINATION_RSA), TALER_DENOMINATION_RSA),
GNUNET_JSON_pack_rsa_signature ("rsa_signature", GNUNET_JSON_pack_rsa_signature ("rsa_signature",
sig->details.rsa_signature)); sig->details.rsa_signature));
break; break;
default: default:
GNUNET_assert (0); GNUNET_assert (0);
return GNUNET_SYSERR;
} }
return ps; return ps;
} }

2
src/json/json_wire.c
View File

@ -26,7 +26,7 @@
enum GNUNET_GenericReturnValue enum GNUNET_GenericReturnValue
TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s, TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
struct GNUNET_HashCode *hc) struct TALER_MerchantWireHash *hc)
{ {
const char *payto_uri; const char *payto_uri;
struct TALER_WireSalt salt; struct TALER_WireSalt salt;