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

-fix more FTBFS issues

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

24
src/exchange-tools/taler-exchange-offline.c
View File

@ -852,7 +852,7 @@ upload_denom_revocation (const char *exchange_url,
const json_t *value) const json_t *value)
{ {
struct TALER_MasterSignatureP master_sig; struct TALER_MasterSignatureP master_sig;
struct GNUNET_HashCode h_denom_pub; struct TALER_DenominationHash h_denom_pub;
struct DenomRevocationRequest *drr; struct DenomRevocationRequest *drr;
const char *err_name; const char *err_name;
unsigned int err_line; unsigned int err_line;
@ -1824,7 +1824,7 @@ do_upload (char *const *args)
static void static void
do_revoke_denomination_key (char *const *args) do_revoke_denomination_key (char *const *args)
{ {
struct GNUNET_HashCode h_denom_pub; struct TALER_DenominationHash h_denom_pub;
struct TALER_MasterSignatureP master_sig; struct TALER_MasterSignatureP master_sig;
if (NULL != in) if (NULL != in)
@ -2604,8 +2604,8 @@ show_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("section_name", GNUNET_JSON_spec_string ("section_name",
&section_name), &section_name),
GNUNET_JSON_spec_rsa_public_key ("denom_pub", TALER_JSON_spec_denomination_public_key ("denom_pub",
&denom_pub.rsa_public_key), &denom_pub),
TALER_JSON_spec_amount ("value", TALER_JSON_spec_amount ("value",
currency, currency,
&coin_value), &coin_value),
@ -2634,7 +2634,7 @@ show_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
GNUNET_JSON_spec_end () GNUNET_JSON_spec_end ()
}; };
struct GNUNET_TIME_Relative duration; struct GNUNET_TIME_Relative duration;
struct GNUNET_HashCode h_denom_pub; struct TALER_DenominationHash h_denom_pub;
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_JSON_parse (value, GNUNET_JSON_parse (value,
@ -2657,8 +2657,8 @@ show_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
} }
duration = GNUNET_TIME_absolute_get_difference (stamp_start, duration = GNUNET_TIME_absolute_get_difference (stamp_start,
stamp_expire_withdraw); stamp_expire_withdraw);
GNUNET_CRYPTO_rsa_public_key_hash (denom_pub.rsa_public_key, TALER_denom_pub_hash (&denom_pub,
&h_denom_pub); &h_denom_pub);
if (GNUNET_OK != if (GNUNET_OK !=
TALER_exchange_secmod_denom_verify (&h_denom_pub, TALER_exchange_secmod_denom_verify (&h_denom_pub,
section_name, section_name,
@ -3023,8 +3023,8 @@ sign_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
GNUNET_JSON_spec_string ("section_name", GNUNET_JSON_spec_string ("section_name",
&section_name), &section_name),
GNUNET_JSON_spec_rsa_public_key ("denom_pub", TALER_JSON_spec_denomination_public_key ("denom_pub",
&denom_pub.rsa_public_key), &denom_pub),
TALER_JSON_spec_amount ("value", TALER_JSON_spec_amount ("value",
currency, currency,
&coin_value), &coin_value),
@ -3053,7 +3053,7 @@ sign_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
GNUNET_JSON_spec_end () GNUNET_JSON_spec_end ()
}; };
struct GNUNET_TIME_Relative duration; struct GNUNET_TIME_Relative duration;
struct GNUNET_HashCode h_denom_pub; struct TALER_DenominationHash h_denom_pub;
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_JSON_parse (value, GNUNET_JSON_parse (value,
@ -3076,8 +3076,8 @@ sign_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
} }
duration = GNUNET_TIME_absolute_get_difference (stamp_start, duration = GNUNET_TIME_absolute_get_difference (stamp_start,
stamp_expire_withdraw); stamp_expire_withdraw);
GNUNET_CRYPTO_rsa_public_key_hash (denom_pub.rsa_public_key, TALER_denom_pub_hash (&denom_pub,
&h_denom_pub); &h_denom_pub);
if (GNUNET_OK != if (GNUNET_OK !=
TALER_exchange_secmod_denom_verify (&h_denom_pub, TALER_exchange_secmod_denom_verify (&h_denom_pub,
section_name, section_name,