[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated: -fix init of nonces in reveal re
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated: -fix init of nonces in reveal request |
|
Date: |
Wed, 09 Feb 2022 18:42:18 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 4ee82c1e -fix init of nonces in reveal request
4ee82c1e is described below
commit 4ee82c1ed3e946c9e438fed678382f24bef2a856
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Feb 9 18:42:16 2022 +0100
-fix init of nonces in reveal request
---
.../taler-exchange-httpd_refreshes_reveal.c | 88 ++++++++++++++++++++--
src/lib/exchange_api_refreshes_reveal.c | 15 ++--
2 files changed, 91 insertions(+), 12 deletions(-)
diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c
b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
index f9330ebe..1e09d2f2 100644
--- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c
+++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
@@ -102,6 +102,11 @@ struct RevealContext
*/
const struct TEH_DenominationKey **dks;
+ /**
+ * Array of information about fresh coins being revealed.
+ */
+ const struct TALER_EXCHANGEDB_RefreshRevealedCoin *rrcs;
+
/**
* Envelopes to be signed.
*/
@@ -136,6 +141,78 @@ check_commitment (struct RevealContext *rctx,
struct MHD_Connection *connection,
MHD_RESULT *mhd_ret)
{
+ struct TALER_ExchangeWithdrawValues alg_values[rctx->num_fresh_coins];
+ struct TALER_CsNonce nonces[rctx->num_fresh_coins];
+ unsigned int aoff = 0;
+
+ for (unsigned int j = 0; j<rctx->num_fresh_coins; j++)
+ {
+ const struct TALER_DenominationPublicKey *dk = &rctx->dks[j]->denom_pub;
+
+ if (dk->cipher != rctx->rcds[j].blinded_planchet.cipher)
+ {
+ GNUNET_break (0);
+ *mhd_ret = TALER_MHD_reply_with_error (
+ connection,
+ MHD_HTTP_BAD_REQUEST,
+ TALER_EC_EXCHANGE_GENERIC_CIPHER_MISMATCH,
+ NULL);
+ return GNUNET_SYSERR;
+ }
+ switch (dk->cipher)
+ {
+ case TALER_DENOMINATION_INVALID:
+ GNUNET_break (0);
+ *mhd_ret = TALER_MHD_reply_with_error (
+ connection,
+ MHD_HTTP_INTERNAL_SERVER_ERROR,
+ TALER_EC_GENERIC_INTERNAL_INVARIANT_FAILURE,
+ NULL);
+ return GNUNET_SYSERR;
+ case TALER_DENOMINATION_RSA:
+ continue;
+ case TALER_DENOMINATION_CS:
+ nonces[aoff]
+ = rctx->rcds[j].blinded_planchet.details.cs_blinded_planchet.nonce;
+ aoff++;
+ break;
+ }
+ }
+
+ // OPTIMIZE: do this in batch later!
+ aoff = 0;
+ for (unsigned int j = 0; j<rctx->num_fresh_coins; j++)
+ {
+ const struct TALER_DenominationPublicKey *dk = &rctx->dks[j]->denom_pub;
+
+ alg_values[j].cipher = dk->cipher;
+ switch (dk->cipher)
+ {
+ case TALER_DENOMINATION_INVALID:
+ GNUNET_assert (0);
+ return GNUNET_SYSERR;
+ case TALER_DENOMINATION_RSA:
+ continue;
+ case TALER_DENOMINATION_CS:
+ {
+ enum TALER_ErrorCode ec;
+
+ ec = TEH_keys_denomination_cs_r_pub (
+ &rctx->rrcs[j].h_denom_pub,
+ &nonces[aoff],
+ &alg_values[j].details.cs_values.r_pub_pair);
+ if (TALER_EC_NONE != ec)
+ {
+ *mhd_ret = TALER_MHD_reply_with_error (connection,
+
MHD_HTTP_INTERNAL_SERVER_ERROR,
+ ec,
+ NULL);
+ return GNUNET_SYSERR;
+ }
+ aoff++;
+ }
+ }
+ }
/* Verify commitment */
{
/* Note that the contents of rcs[melt.session.noreveal_index]
@@ -176,7 +253,7 @@ check_commitment (struct RevealContext *rctx,
struct TALER_RefreshCoinData *rcd = &rce->new_coins[j];
struct TALER_CoinSpendPrivateKeyP coin_priv;
union TALER_DenominationBlindingKeyP bks;
- struct TALER_ExchangeWithdrawValues alg_values;
+ const struct TALER_ExchangeWithdrawValues *alg_value =
&alg_values[j];
struct TALER_PlanchetDetail pd;
struct TALER_CoinPubHash c_hash;
struct TALER_PlanchetSecretsP ps;
@@ -185,17 +262,15 @@ check_commitment (struct RevealContext *rctx,
TALER_transfer_secret_to_planchet_secret (&ts,
j,
&ps);
- // TODO: implement cipher handling
- alg_values.cipher = TALER_DENOMINATION_RSA;
TALER_planchet_setup_coin_priv (&ps,
- &alg_values,
+ alg_value,
&coin_priv);
TALER_planchet_blinding_secret_create (&ps,
- &alg_values,
+ alg_value,
&bks);
GNUNET_assert (GNUNET_OK ==
TALER_planchet_prepare (rcd->dk,
- &alg_values,
+ alg_value,
&bks,
&coin_priv,
&c_hash,
@@ -505,6 +580,7 @@ resolve_refreshes_reveal_denominations (struct
MHD_Connection *connection,
}
rctx->dks = dks;
rctx->rcds = rcds;
+ rctx->rrcs = rrcs;
if (GNUNET_OK !=
check_commitment (rctx,
connection,
diff --git a/src/lib/exchange_api_refreshes_reveal.c
b/src/lib/exchange_api_refreshes_reveal.c
index 1d748e29..d6e29103 100644
--- a/src/lib/exchange_api_refreshes_reveal.c
+++ b/src/lib/exchange_api_refreshes_reveal.c
@@ -377,7 +377,7 @@ TALER_EXCHANGE_refreshes_reveal (
struct TALER_DenominationHash denom_hash;
struct TALER_PlanchetDetail pd;
struct TALER_CoinPubHash c_hash;
- struct TALER_PlanchetSecretsP ps;
+ struct TALER_PlanchetSecretsP coin_ps;
union TALER_DenominationBlindingKeyP bks;
struct TALER_CoinSpendPrivateKeyP coin_priv;
@@ -389,13 +389,17 @@ TALER_EXCHANGE_refreshes_reveal (
&denom_hash)));
TALER_transfer_secret_to_planchet_secret (&ts,
i,
- &ps);
- TALER_planchet_setup_coin_priv (&ps,
+ &coin_ps);
+ TALER_planchet_setup_coin_priv (&coin_ps,
&alg_values[i],
&coin_priv);
- TALER_planchet_blinding_secret_create (&ps,
+ TALER_planchet_blinding_secret_create (&coin_ps,
&alg_values[i],
&bks);
+ TALER_cs_refresh_nonce_derive (
+ ps,
+ i,
+ &pd.blinded_planchet.details.cs_blinded_planchet.nonce);
if (GNUNET_OK !=
TALER_planchet_prepare (&md.fresh_pks[i],
&alg_values[i],
@@ -446,8 +450,7 @@ TALER_EXCHANGE_refreshes_reveal (
{
if (j == noreveal_index)
{
- /* This is crucial: exclude the transfer key for the
- noreval index! */
+ /* This is crucial: exclude the transfer key for the noreval index! */
continue;
}
GNUNET_assert (0 ==
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-exchange] branch master updated: -fix init of nonces in reveal request,
gnunet <=