[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 83/130: add extension hashing
From: |
gnunet |
Subject: |
[taler-exchange] 83/130: add extension hashing |
Date: |
Wed, 17 Nov 2021 12:25:31 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit 0b370a68148507016c6e707b01918350887887f7
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sat Nov 6 17:26:11 2021 +0100
add extension hashing
---
src/include/taler_signatures.h | 7 -------
src/util/wallet_signatures.c | 10 +++++-----
2 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h
index eeceaf3d..5eef0db6 100644
--- a/src/include/taler_signatures.h
+++ b/src/include/taler_signatures.h
@@ -530,13 +530,6 @@ struct TALER_DepositRequestPS
*/
struct TALER_MerchantPublicKeyP merchant;
- /**
- * The coin's public key. This is the value that must have been
- * signed (blindly) by the Exchange. The deposit request is to be
- * signed by the corresponding private key (using EdDSA).
- */
- struct TALER_CoinSpendPublicKeyP coin_pub;
-
};
diff --git a/src/util/wallet_signatures.c b/src/util/wallet_signatures.c
index f6aa144d..3f9e297f 100644
--- a/src/util/wallet_signatures.c
+++ b/src/util/wallet_signatures.c
@@ -48,13 +48,12 @@ TALER_wallet_deposit_sign (
.merchant = *merchant_pub
};
- // FIXME: sign also over h_extensions!
+ if (NULL != h_extensions)
+ dr.h_extensions = *h_extensions;
GNUNET_assert (GNUNET_OK ==
GNUNET_TIME_round_abs (&wallet_timestamp));
GNUNET_assert (GNUNET_OK ==
GNUNET_TIME_round_abs (&refund_deadline));
- GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv->eddsa_priv,
- &dr.coin_pub.eddsa_pub);
TALER_amount_hton (&dr.amount_with_fee,
amount);
TALER_amount_hton (&dr.deposit_fee,
@@ -87,10 +86,11 @@ TALER_wallet_deposit_verify (
.h_denom_pub = *h_denom_pub,
.wallet_timestamp = GNUNET_TIME_absolute_hton (wallet_timestamp),
.refund_deadline = GNUNET_TIME_absolute_hton (refund_deadline),
- .merchant = *merchant_pub,
- .coin_pub = *coin_pub
+ .merchant = *merchant_pub
};
+ if (NULL != h_extensions)
+ dr.h_extensions = *h_extensions;
TALER_amount_hton (&dr.amount_with_fee,
amount);
TALER_amount_hton (&dr.deposit_fee,
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-exchange] 89/130: -misc fixes, (continued)
- [taler-exchange] 89/130: -misc fixes, gnunet, 2021/11/17
- [taler-exchange] 66/130: -bugfix, gnunet, 2021/11/17
- [taler-exchange] 50/130: -more dB work, gnunet, 2021/11/17
- [taler-exchange] 64/130: fix bug, gnunet, 2021/11/17
- [taler-exchange] 128/130: towards merging with master, gnunet, 2021/11/17
- [taler-exchange] 92/130: add missing file, gnunet, 2021/11/17
- [taler-exchange] 112/130: age restriction progress 2/n, gnunet, 2021/11/17
- [taler-exchange] 70/130: introduce invalid key type, gnunet, 2021/11/17
- [taler-exchange] 41/130: -fixes, gnunet, 2021/11/17
- [taler-exchange] 91/130: -fix wire_deadline SQL, gnunet, 2021/11/17
- [taler-exchange] 83/130: add extension hashing,
gnunet <=
- [taler-exchange] 71/130: implement missing SQL statement, gnunet, 2021/11/17
- [taler-exchange] 119/130: add CLIENT_DIR to make test_crypto pass, gnunet, 2021/11/17
- [taler-exchange] 94/130: implement /kyc-proof client API, gnunet, 2021/11/17
- [taler-exchange] 108/130: sleep to get tests to pass, gnunet, 2021/11/17
- [taler-exchange] 90/130: sql fix, gnunet, 2021/11/17
- [taler-exchange] 74/130: fix typo, gnunet, 2021/11/17
- [taler-exchange] 127/130: towards merging with master, gnunet, 2021/11/17
- [taler-exchange] 80/130: RSA-despecialization, gnunet, 2021/11/17
- [taler-exchange] 96/130: add kyc-wallet test command, gnunet, 2021/11/17
- [taler-exchange] 117/130: complete oauth logic (in theory), gnunet, 2021/11/17