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

fix #3637

Browse Source
This commit is contained in:
Christian Grothoff 2015-03-22 16:58:15 +01:00
parent 41478aea76
commit 884fff1297
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/mint/taler-mint-httpd_refresh.c
View File

@ -84,11 +84,12 @@ handle_refresh_melt_binary (struct MHD_Connection *connection,
struct TALER_Amount melt; struct TALER_Amount melt;
struct TALER_Amount value; struct TALER_Amount value;
struct TALER_Amount fee_withdraw; struct TALER_Amount fee_withdraw;
struct TALER_Amount fee_melt;
struct TALER_Amount total_melt; struct TALER_Amount total_melt;
/* check that signature from the session public key is ok */ /* check that signature from the session public key is ok */
hash_context = GNUNET_CRYPTO_hash_context_start (); hash_context = GNUNET_CRYPTO_hash_context_start ();
/* FIXME: also hash session public key here!? */ /* FIXME: also hash session public key here!? #3708 */
for (i = 0; i < num_new_denoms; i++) for (i = 0; i < num_new_denoms; i++)
{ {
buf_size = GNUNET_CRYPTO_rsa_public_key_encode (denom_pubs[i], buf_size = GNUNET_CRYPTO_rsa_public_key_encode (denom_pubs[i],
@ -104,7 +105,7 @@ handle_refresh_melt_binary (struct MHD_Connection *connection,
sizeof (struct GNUNET_CRYPTO_EddsaPublicKey)); sizeof (struct GNUNET_CRYPTO_EddsaPublicKey));
GNUNET_CRYPTO_hash_context_finish (hash_context, GNUNET_CRYPTO_hash_context_finish (hash_context,
&melt_hash); &melt_hash);
// FIXME: what about the `commit_hash`? /* FIXME: what about the `commit_hash`? #3708 */
body.purpose.purpose = htonl (TALER_SIGNATURE_REFRESH_MELT_SESSION); body.purpose.purpose = htonl (TALER_SIGNATURE_REFRESH_MELT_SESSION);
body.purpose.size = htonl (sizeof (struct RefreshMeltSessionSignature)); body.purpose.size = htonl (sizeof (struct RefreshMeltSessionSignature));
@ -125,9 +126,9 @@ handle_refresh_melt_binary (struct MHD_Connection *connection,
"error", "error",
"invalid signature (verification)"); "invalid signature (verification)");
} }
GNUNET_assert (GNUNET_OK ==
// FIXME: badness, use proper way to set to zero... TALER_amount_get_zero (MINT_CURRENCY,
memset (&total_cost, 0, sizeof (struct TALER_Amount)); &total_cost));
key_state = TALER_MINT_key_state_acquire (); key_state = TALER_MINT_key_state_acquire ();
for (i=0;i<num_new_denoms;i++) for (i=0;i<num_new_denoms;i++)
{ {
@ -137,7 +138,6 @@ handle_refresh_melt_binary (struct MHD_Connection *connection,
&dki->value); &dki->value);
TALER_amount_ntoh (&fee_withdraw, TALER_amount_ntoh (&fee_withdraw,
&dki->fee_withdraw); &dki->fee_withdraw);
// FIXME: #3637
if ( (GNUNET_OK != if ( (GNUNET_OK !=
TALER_amount_add (&cost, TALER_amount_add (&cost,
&value, &value,
@ -147,31 +147,46 @@ handle_refresh_melt_binary (struct MHD_Connection *connection,
&cost, &cost,
&total_cost)) ) &total_cost)) )
{ {
// FIXME... TALER_MINT_key_state_release (key_state);
return TALER_MINT_reply_internal_error (connection,
"cost calculation failure");
} }
} }
// FIXME: badness, use proper way to set to zero... GNUNET_assert (GNUNET_OK ==
memset (&total_melt, 0, sizeof (struct TALER_Amount)); TALER_amount_get_zero (MINT_CURRENCY,
&total_melt));
for (i=0;i<coin_count;i++) for (i=0;i<coin_count;i++)
{ {
memset (&melt, 0, sizeof (struct TALER_Amount)); /* calculate contribution of the i-th melt by subtracting
// FIXME: reduce coin value by melting fee! the fee; add the rest to the total_melt value */
// melt = coin_values[i]; // FIXME: #3636! dki = &TALER_MINT_get_denom_key (key_state,
coin_public_infos[i].denom_pub)->issue;
// FIXME: #3637 TALER_amount_ntoh (&fee_melt,
&dki->fee_refresh);
if (GNUNET_OK !=
TALER_amount_subtract (&melt,
&coin_melt_details->melt_amount_with_fee,
&fee_melt))
{
TALER_MINT_key_state_release (key_state);
return TALER_MINT_reply_external_error (connection,
"Melt contribution below melting fee");
}
if (GNUNET_OK != if (GNUNET_OK !=
TALER_amount_add (&total_melt, TALER_amount_add (&total_melt,
&melt, &melt,
&total_melt)) &total_melt))
{ {
// FIXME ... TALER_MINT_key_state_release (key_state);
return TALER_MINT_reply_internal_error (connection,
"balance calculation failure");
} }
} }
TALER_MINT_key_state_release (key_state); TALER_MINT_key_state_release (key_state);
if (0 != if (0 !=
TALER_amount_cmp (&total_cost, TALER_amount_cmp (&total_cost,
&total_melt) ) &total_melt))
{ {
/* We require total value of coins being melted and /* We require total value of coins being melted and
total value of coins being generated to match! */ total value of coins being generated to match! */