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

-fix refresh FTBFS

Browse Source
This commit is contained in:
Christian Grothoff 2022-02-06 18:39:28 +01:00
parent 57bbdb0997
commit f173296c3c
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
3 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/include/taler_crypto_lib.h
View File

@ -1491,11 +1491,10 @@ TALER_planchet_setup_random (
* @param bks blinding secrets * @param bks blinding secrets
*/ */
void void
TALER_planchet_blinding_secret_create (const struct TALER_PlanchetSecretsP *ps, TALER_planchet_blinding_secret_create (
const struct TALER_PlanchetSecretsP *ps,
const struct const struct TALER_ExchangeWithdrawValues *alg_values,
TALER_ExchangeWithdrawValues *alg_values, union TALER_DenominationBlindingKeyP *bks);
union TALER_DenominationBlindingKeyP *bks);
/** /**

17
src/lib/exchange_api_recoup.c
View File

@ -297,16 +297,25 @@ TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange,
json_t *recoup_obj; json_t *recoup_obj;
CURL *eh; CURL *eh;
char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32]; char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32];
struct TALER_CoinSpendPrivateKeyP coin_priv;
union TALER_DenominationBlindingKeyP bks;
GNUNET_assert (GNUNET_YES == GNUNET_assert (GNUNET_YES ==
TEAH_handle_is_ready (exchange)); TEAH_handle_is_ready (exchange));
GNUNET_CRYPTO_eddsa_key_get_public (&ps->coin_priv.eddsa_priv,
TALER_planchet_setup_coin_priv (ps,
exchange_vals,
&coin_priv);
TALER_planchet_blinding_secret_create (ps,
exchange_vals,
&bks);
GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv.eddsa_priv,
&coin_pub.eddsa_pub); &coin_pub.eddsa_pub);
TALER_denom_pub_hash (&pk->key, TALER_denom_pub_hash (&pk->key,
&h_denom_pub); &h_denom_pub);
TALER_wallet_recoup_sign (&h_denom_pub, TALER_wallet_recoup_sign (&h_denom_pub,
&ps->blinding_key, &bks,
&ps->coin_priv, &coin_priv,
&coin_sig); &coin_sig);
recoup_obj = GNUNET_JSON_PACK ( recoup_obj = GNUNET_JSON_PACK (
GNUNET_JSON_pack_data_auto ("denom_pub_hash", GNUNET_JSON_pack_data_auto ("denom_pub_hash",
@ -316,7 +325,7 @@ TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange,
GNUNET_JSON_pack_data_auto ("coin_sig", GNUNET_JSON_pack_data_auto ("coin_sig",
&coin_sig), &coin_sig),
GNUNET_JSON_pack_data_auto ("coin_blind_key_secret", GNUNET_JSON_pack_data_auto ("coin_blind_key_secret",
&ps->blinding_key)); &bks));
{ {
char pub_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2]; char pub_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2];

1
src/lib/exchange_api_recoup_refresh.c
View File

@ -286,6 +286,7 @@ TALER_EXCHANGE_recoup_refresh (
struct TALER_EXCHANGE_Handle *exchange, struct TALER_EXCHANGE_Handle *exchange,
const struct TALER_EXCHANGE_DenomPublicKey *pk, const struct TALER_EXCHANGE_DenomPublicKey *pk,
const struct TALER_DenominationSignature *denom_sig, const struct TALER_DenominationSignature *denom_sig,
const struct TALER_ExchangeWithdrawValues *exchange_vals,
const struct TALER_PlanchetSecretsP *ps, const struct TALER_PlanchetSecretsP *ps,
TALER_EXCHANGE_RecoupRefreshResultCallback recoup_cb, TALER_EXCHANGE_RecoupRefreshResultCallback recoup_cb,
void *recoup_cb_cls) void *recoup_cb_cls)