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:57:11 +02:00
parent ab0b74f81c
commit 4b508a67c6
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/exchange-tools/taler-auditor-offline.c
View File

@ -430,7 +430,7 @@ upload_denomination_add (const char *exchange_url,
const json_t *value) const json_t *value)
{ {
struct TALER_AuditorSignatureP auditor_sig; struct TALER_AuditorSignatureP auditor_sig;
struct GNUNET_HashCode h_denom_pub; struct TALER_DenominationHash h_denom_pub;
struct DenominationAddRequest *dar; struct DenominationAddRequest *dar;
const char *err_name; const char *err_name;
unsigned int err_line; unsigned int err_line;
@ -760,8 +760,8 @@ show_denomkeys (const json_t *denomkeys)
struct TALER_Amount fee_refund; struct TALER_Amount fee_refund;
struct TALER_MasterSignatureP master_sig; struct TALER_MasterSignatureP master_sig;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
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),
@ -790,7 +790,7 @@ show_denomkeys (const json_t *denomkeys)
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,
@ -810,8 +810,8 @@ show_denomkeys (const json_t *denomkeys)
} }
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_offline_denom_validity_verify ( TALER_exchange_offline_denom_validity_verify (
&h_denom_pub, &h_denom_pub,
@ -1060,8 +1060,8 @@ sign_denomkeys (const json_t *denomkeys)
struct TALER_Amount fee_refund; struct TALER_Amount fee_refund;
struct TALER_MasterSignatureP master_sig; struct TALER_MasterSignatureP master_sig;
struct GNUNET_JSON_Specification spec[] = { struct GNUNET_JSON_Specification spec[] = {
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),
@ -1089,7 +1089,7 @@ sign_denomkeys (const json_t *denomkeys)
&master_sig), &master_sig),
GNUNET_JSON_spec_end () GNUNET_JSON_spec_end ()
}; };
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,
@ -1107,8 +1107,8 @@ sign_denomkeys (const json_t *denomkeys)
test_shutdown (); test_shutdown ();
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
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_offline_denom_validity_verify ( TALER_exchange_offline_denom_validity_verify (
&h_denom_pub, &h_denom_pub,

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

@ -2660,12 +2660,12 @@ show_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
GNUNET_CRYPTO_rsa_public_key_hash (denom_pub.rsa_public_key, GNUNET_CRYPTO_rsa_public_key_hash (denom_pub.rsa_public_key,
&h_denom_pub); &h_denom_pub);
if (GNUNET_OK != if (GNUNET_OK !=
TALER_exchange_secmod_rsa_verify (&h_denom_pub, TALER_exchange_secmod_denom_verify (&h_denom_pub,
section_name, section_name,
stamp_start, stamp_start,
duration, duration,
secm_pub, secm_pub,
&secm_sig)) &secm_sig))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Invalid security module signature for denomination key %s (aborting)\n", "Invalid security module signature for denomination key %s (aborting)\n",
@ -3079,12 +3079,12 @@ sign_denomkeys (const struct TALER_SecurityModulePublicKeyP *secm_pub,
GNUNET_CRYPTO_rsa_public_key_hash (denom_pub.rsa_public_key, GNUNET_CRYPTO_rsa_public_key_hash (denom_pub.rsa_public_key,
&h_denom_pub); &h_denom_pub);
if (GNUNET_OK != if (GNUNET_OK !=
TALER_exchange_secmod_rsa_verify (&h_denom_pub, TALER_exchange_secmod_denom_verify (&h_denom_pub,
section_name, section_name,
stamp_start, stamp_start,
duration, duration,
secm_pub, secm_pub,
&secm_sig)) &secm_sig))
{ {
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Invalid security module signature for denomination key %s (aborting)\n", "Invalid security module signature for denomination key %s (aborting)\n",