diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-06-25 20:38:31 +0200 |
|---|---|---|
| committer | Özgür Kesim <oec-taler@kesim.org> | 2022-06-26 17:08:17 +0200 |
| commit | fd9fc9f0cd6b9e789e1e21875b66770dfdce2cd0 (patch) | |
| tree | 3483593cd346fa108988d2c161ac542667753168 /src/util | |
| parent | 646c410ace1e877d42527b4a84ba7ba5a201246c (diff) | |
| download | exchange-fd9fc9f0cd6b9e789e1e21875b66770dfdce2cd0.tar.gz exchange-fd9fc9f0cd6b9e789e1e21875b66770dfdce2cd0.tar.bz2 exchange-fd9fc9f0cd6b9e789e1e21875b66770dfdce2cd0.zip | |
-fix misc doxygen warnings, code clean up
Diffstat (limited to 'src/util')
| -rw-r--r-- | src/util/merchant_signatures.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/util/merchant_signatures.c b/src/util/merchant_signatures.c index 112f92253..36f96499c 100644 --- a/src/util/merchant_signatures.c +++ b/src/util/merchant_signatures.c @@ -47,12 +47,6 @@ struct TALER_DepositTrackPS struct TALER_MerchantWireHashP h_wire GNUNET_PACKED; /** - * The Merchant's public key. The deposit inquiry request is to be - * signed by the corresponding private key (using EdDSA). - */ - struct TALER_MerchantPublicKeyP merchant; - - /** * The coin's public key. This is the value that must have been * signed (blindly) by the Exchange. */ @@ -68,7 +62,6 @@ TALER_merchant_deposit_sign ( const struct TALER_PrivateContractHashP *h_contract_terms, const struct TALER_MerchantWireHashP *h_wire, const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_MerchantPublicKeyP *merchant_pub, const struct TALER_MerchantPrivateKeyP *merchant_priv, struct TALER_MerchantSignatureP *merchant_sig) { @@ -77,9 +70,9 @@ TALER_merchant_deposit_sign ( .purpose.size = htonl (sizeof (dtp)), .h_contract_terms = *h_contract_terms, .h_wire = *h_wire, - .merchant = *merchant_pub, .coin_pub = *coin_pub }; + GNUNET_CRYPTO_eddsa_sign (&merchant_priv->eddsa_priv, &dtp, &merchant_sig->eddsa_sig); @@ -97,7 +90,6 @@ TALER_merchant_deposit_verify ( struct TALER_DepositTrackPS tps = { .purpose.size = htonl (sizeof (tps)), .purpose.purpose = htonl (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION), - .merchant = *merchant, .coin_pub = *coin_pub, .h_contract_terms = *h_contract_terms, .h_wire = *h_wire @@ -107,7 +99,7 @@ TALER_merchant_deposit_verify ( GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION, &tps, &merchant_sig->eddsa_sig, - &tps.merchant.eddsa_pub); + &merchant->eddsa_pub); } |