[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] 36/130: fix rest of FTBFS issues in exchange
From: |
gnunet |
Subject: |
[taler-exchange] 36/130: fix rest of FTBFS issues in exchange |
Date: |
Wed, 17 Nov 2021 12:24:44 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
commit fbb58ad8790d514ff9cb53e3a10aa49ad2fa31dc
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Oct 27 22:34:07 2021 +0200
fix rest of FTBFS issues in exchange
---
src/benchmark/taler-aggregator-benchmark.c | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/src/benchmark/taler-aggregator-benchmark.c
b/src/benchmark/taler-aggregator-benchmark.c
index e432d8f5..348d153c 100644
--- a/src/benchmark/taler-aggregator-benchmark.c
+++ b/src/benchmark/taler-aggregator-benchmark.c
@@ -81,7 +81,7 @@ static struct GNUNET_SCHEDULER_Task *task;
/**
* Hash of the denomination.
*/
-static struct GNUNET_HashCode h_denom_pub;
+static struct TALER_DenominationHash h_denom_pub;
/**
* "signature" to use for the coin(s).
@@ -212,11 +212,7 @@ do_shutdown (void *cls)
GNUNET_SCHEDULER_cancel (task);
task = NULL;
}
- if (NULL !=denom_sig.rsa_signature)
- {
- GNUNET_CRYPTO_rsa_signature_free (denom_sig.rsa_signature);
- denom_sig.rsa_signature = NULL;
- }
+ TALER_denom_sig_free (&denom_sig);
if (NULL != json_wire)
{
json_decref (json_wire);
@@ -240,7 +236,7 @@ struct Merchant
* the exchange from the detailed wire data provided by the
* merchant.
*/
- struct GNUNET_HashCode h_wire;
+ struct TALER_MerchantWireHash h_wire;
};
@@ -256,7 +252,7 @@ struct Deposit
* Hash over the proposal data between merchant and customer
* (remains unknown to the Exchange).
*/
- struct GNUNET_HashCode h_contract_terms;
+ struct TALER_PrivateContractHash h_contract_terms;
};
@@ -498,14 +494,16 @@ run (void *cls,
struct GNUNET_CRYPTO_RsaPrivateKey *pk;
struct GNUNET_CRYPTO_RsaPublicKey *pub;
struct GNUNET_HashCode hc;
- struct TALER_DenominationPublicKey denom_pub;
+ struct TALER_DenominationPublicKey denom_pub = {
+ .cipher = TALER_DENOMINATION_RSA
+ };
RANDOMIZE (&hc);
pk = GNUNET_CRYPTO_rsa_private_key_create (1024);
pub = GNUNET_CRYPTO_rsa_private_key_get_public (pk);
- denom_pub.rsa_public_key = pub;
- GNUNET_CRYPTO_rsa_public_key_hash (pub,
- &h_denom_pub);
+ denom_pub.details.rsa_public_key = pub;
+ TALER_denom_pub_hash (&denom_pub,
+ &h_denom_pub);
make_amountN (2, 0, &issue.properties.value);
make_amountN (0, 5, &issue.properties.fee_withdraw);
make_amountN (0, 5, &issue.properties.fee_deposit);
@@ -522,8 +520,8 @@ run (void *cls,
global_ret = EXIT_FAILURE;
return;
}
-
- denom_sig.rsa_signature
+ denom_sig.cipher = TALER_DENOMINATION_RSA;
+ denom_sig.details.rsa_signature
= GNUNET_CRYPTO_rsa_sign_fdh (pk,
&hc);
GNUNET_CRYPTO_rsa_public_key_free (pub);
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-exchange] 62/130: -disable tests, (continued)
- [taler-exchange] 62/130: -disable tests, gnunet, 2021/11/17
- [taler-exchange] 59/130: -fix tests, gnunet, 2021/11/17
- [taler-exchange] 14/130: -fixing FTBFS, gnunet, 2021/11/17
- [taler-exchange] 57/130: DB test passes again, gnunet, 2021/11/17
- [taler-exchange] 22/130: -work on FTBFS, gnunet, 2021/11/17
- [taler-exchange] 34/130: libtalertesting compiles, gnunet, 2021/11/17
- [taler-exchange] 19/130: -work on FTBFS;, gnunet, 2021/11/17
- [taler-exchange] 47/130: SQL fixes, gnunet, 2021/11/17
- [taler-exchange] 30/130: -fix warning, gnunet, 2021/11/17
- [taler-exchange] 54/130: misc fixes, gnunet, 2021/11/17
- [taler-exchange] 36/130: fix rest of FTBFS issues in exchange,
gnunet <=
- [taler-exchange] 125/130: fix DB query and error handling, gnunet, 2021/11/17
- [taler-exchange] 107/130: skip, gnunet, 2021/11/17
- [taler-exchange] 49/130: -more work on FTBFS issues, gnunet, 2021/11/17
- [taler-exchange] 86/130: sql fix, gnunet, 2021/11/17
- [taler-exchange] 69/130: bugfix!, gnunet, 2021/11/17
- [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