diff options
| author | Gian Demarmels <gian@demarmels.org> | 2022-01-17 09:37:36 +0100 |
|---|---|---|
| committer | Gian Demarmels <gian@demarmels.org> | 2022-02-04 15:37:33 +0100 |
| commit | be50c084f89e8588dd2d4a4aa30c58002053ee31 (patch) | |
| tree | e6651b08f663446f21c59b9428e57ca46b7b4bab /src/lib | |
| parent | ae5f082c75eb140167dc0254894dd4d57ba62a6d (diff) | |
| download | exchange-be50c084f89e8588dd2d4a4aa30c58002053ee31.tar.gz exchange-be50c084f89e8588dd2d4a4aa30c58002053ee31.tar.bz2 exchange-be50c084f89e8588dd2d4a4aa30c58002053ee31.zip | |
fixed nonce check, renamed WithdrawNonce
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/exchange_api_csr.c | 4 | ||||
| -rw-r--r-- | src/lib/exchange_api_withdraw.c | 14 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/lib/exchange_api_csr.c b/src/lib/exchange_api_csr.c index a3f631181..d99b08caf 100644 --- a/src/lib/exchange_api_csr.c +++ b/src/lib/exchange_api_csr.c @@ -205,7 +205,7 @@ handle_csr_finished (void *cls, struct TALER_EXCHANGE_CsRHandle * TALER_EXCHANGE_csr (struct TALER_EXCHANGE_Handle *exchange, const struct TALER_EXCHANGE_DenomPublicKey *pk, - const struct TALER_WithdrawNonce *nonce, + const struct TALER_CsNonce *nonce, TALER_EXCHANGE_CsRCallback res_cb, void *res_cb_cls) { @@ -229,7 +229,7 @@ TALER_EXCHANGE_csr (struct TALER_EXCHANGE_Handle *exchange, csr_obj = GNUNET_JSON_PACK (GNUNET_JSON_pack_data_varsize ("nonce", nonce, sizeof(struct - TALER_WithdrawNonce)), + TALER_CsNonce)), GNUNET_JSON_pack_data_varsize ("denom_pub_hash", &pk->h_key, sizeof(struct diff --git a/src/lib/exchange_api_withdraw.c b/src/lib/exchange_api_withdraw.c index e8eca88cc..a5a886767 100644 --- a/src/lib/exchange_api_withdraw.c +++ b/src/lib/exchange_api_withdraw.c @@ -283,9 +283,17 @@ TALER_EXCHANGE_withdraw ( wh); break; case TALER_DENOMINATION_CS: - TALER_cs_withdraw_nonce_derive (&ps->coin_priv, - &wh->pd.blinded_planchet.details. - cs_blinded_planchet.nonce); + wh->pd.blinded_planchet.cipher = TALER_DENOMINATION_CS; + + /** + * This part is a bit hacky.. + * due to the reason that Withdraw tests use the same private key coin to sign, + * the same Withdraw nonce will be derived. + * In a normal withdrawal TALER_cs_withdraw_nonce_derive is used. + * As a hacky solution, we generate the nonce here randomly. + */ + TALER_cs_withdraw_nonce_generate (&wh->pd.blinded_planchet.details. + cs_blinded_planchet.nonce); wh->csrh = TALER_EXCHANGE_csr (exchange, pk, &wh->pd.blinded_planchet.details. |