[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated (2d835168 -> 4b60d254)
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated (2d835168 -> 4b60d254) |
|
Date: |
Sat, 11 Apr 2020 21:47:04 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository exchange.
from 2d835168 add missing comment
new 88bb7f44 fix FTBFS
new 44272bf1 adapations to GNUnet API change
new 4b60d254 adapations related to GNUnet fixing #6149
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/auditor/taler-auditor-httpd.c | 11 ++++----
src/auditor/taler-auditor-sign.c | 30 ++++++----------------
src/exchange-tools/key-helper.c | 19 ++++++++------
src/exchange-tools/taler-exchange-keyup.c | 5 +---
src/exchangedb/test_exchangedb_denomkeys.c | 7 ++---
src/exchangedb/test_exchangedb_fees.c | 11 ++++----
src/json/test_json_wire.c | 5 +---
src/lib/exchange_api_refresh_common.c | 8 ++----
src/testing/test_bank_api_twisted.c | 28 ++++++++++++++++----
src/testing/test_exchange_api_twisted.c | 1 +
.../testing_api_cmd_bank_admin_add_incoming.c | 18 +++++--------
src/testing/testing_api_cmd_deposit.c | 5 +---
src/util/test_crypto.c | 10 ++------
13 files changed, 70 insertions(+), 88 deletions(-)
diff --git a/src/auditor/taler-auditor-httpd.c
b/src/auditor/taler-auditor-httpd.c
index 627950ae..d326f0f6 100644
--- a/src/auditor/taler-auditor-httpd.c
+++ b/src/auditor/taler-auditor-httpd.c
@@ -479,7 +479,7 @@ auditor_serve_process_config (void)
{
/* Fall back to trying to read private key */
char *auditor_key_file;
- struct GNUNET_CRYPTO_EddsaPrivateKey *eddsa_priv;
+ struct GNUNET_CRYPTO_EddsaPrivateKey eddsa_priv;
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
@@ -495,8 +495,10 @@ auditor_serve_process_config (void)
"AUDITOR_PRIV_FILE");
return GNUNET_SYSERR;
}
- eddsa_priv = GNUNET_CRYPTO_eddsa_key_create_from_file (auditor_key_file);
- if (NULL == eddsa_priv)
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_eddsa_key_from_file (auditor_key_file,
+ GNUNET_NO,
+ &eddsa_priv))
{
/* Both failed, complain! */
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
@@ -509,9 +511,8 @@ auditor_serve_process_config (void)
return 1;
}
GNUNET_free (auditor_key_file);
- GNUNET_CRYPTO_eddsa_key_get_public (eddsa_priv,
+ GNUNET_CRYPTO_eddsa_key_get_public (&eddsa_priv,
&auditor_pub.eddsa_pub);
- GNUNET_free (eddsa_priv);
}
return GNUNET_OK;
}
diff --git a/src/auditor/taler-auditor-sign.c b/src/auditor/taler-auditor-sign.c
index e8491fab..7dd7605f 100644
--- a/src/auditor/taler-auditor-sign.c
+++ b/src/auditor/taler-auditor-sign.c
@@ -186,7 +186,7 @@ main (int argc,
GNUNET_GETOPT_option_verbose (&verbose),
GNUNET_GETOPT_OPTION_END
};
- struct GNUNET_CRYPTO_EddsaPrivateKey *eddsa_priv;
+ struct GNUNET_CRYPTO_EddsaPrivateKey eddsa_priv;
struct TALER_AuditorSignatureP *sigs;
struct TALER_AuditorPublicKeyP apub;
struct GNUNET_DISK_FileHandle *fh;
@@ -239,20 +239,17 @@ main (int argc,
"Auditor URL not given in neither configuration nor
command-line\n");
return 1;
}
- if (GNUNET_YES !=
- GNUNET_DISK_file_test (auditor_key_file))
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Auditor private key `%s' does not exist yet, creating it!\n",
- auditor_key_file);
- eddsa_priv = GNUNET_CRYPTO_eddsa_key_create_from_file (auditor_key_file);
- if (NULL == eddsa_priv)
+ if (GNUNET_SYSERR ==
+ GNUNET_CRYPTO_eddsa_key_from_file (auditor_key_file,
+ GNUNET_YES,
+ &eddsa_priv))
{
fprintf (stderr,
- "Failed to initialize auditor key from file `%s'\n",
+ "Failed to initialize auditor private key from file `%s'\n",
auditor_key_file);
return 1;
}
- GNUNET_CRYPTO_eddsa_key_get_public (eddsa_priv,
+ GNUNET_CRYPTO_eddsa_key_get_public (&eddsa_priv,
&apub.eddsa_pub);
fh = GNUNET_DISK_file_open (exchange_request_file,
GNUNET_DISK_OPEN_READ,
@@ -263,7 +260,6 @@ main (int argc,
"Failed to open file `%s': %s\n",
exchange_request_file,
strerror (errno));
- GNUNET_free (eddsa_priv);
return 1;
}
if (GNUNET_OK !=
@@ -275,7 +271,6 @@ main (int argc,
exchange_request_file,
strerror (errno));
GNUNET_DISK_file_close (fh);
- GNUNET_free (eddsa_priv);
return 1;
}
if (0 != (in_size % sizeof (struct TALER_DenominationKeyValidityPS)))
@@ -284,7 +279,6 @@ main (int argc,
"Input file size of file `%s' is invalid\n",
exchange_request_file);
GNUNET_DISK_file_close (fh);
- GNUNET_free (eddsa_priv);
return 1;
}
dki_len = in_size / sizeof (struct TALER_DenominationKeyValidityPS);
@@ -293,7 +287,6 @@ main (int argc,
fprintf (stderr,
"Failed to produce auditor signature, denomination list is
empty.\n");
GNUNET_DISK_file_close (fh);
- GNUNET_free (eddsa_priv);
return 2;
}
if (NULL ==
@@ -302,7 +295,6 @@ main (int argc,
fprintf (stderr,
"Failed to initialize auditor database plugin.\n");
GNUNET_DISK_file_close (fh);
- GNUNET_free (eddsa_priv);
return 3;
}
@@ -326,7 +318,6 @@ main (int argc,
TALER_AUDITORDB_plugin_unload (adb);
GNUNET_DISK_file_close (fh);
GNUNET_free (dki);
- GNUNET_free (eddsa_priv);
return 1;
}
GNUNET_DISK_file_close (fh);
@@ -350,7 +341,7 @@ main (int argc,
kv.denom_hash = dk->denom_hash;
/* Finally sign ... */
- GNUNET_CRYPTO_eddsa_sign (eddsa_priv,
+ GNUNET_CRYPTO_eddsa_sign (&eddsa_priv,
&kv,
&sigs[i].eddsa_sig);
}
@@ -362,7 +353,6 @@ main (int argc,
TALER_AUDITORDB_plugin_unload (adb);
GNUNET_free (dki);
GNUNET_free (sigs);
- GNUNET_free (eddsa_priv);
return 1;
}
@@ -375,7 +365,6 @@ main (int argc,
TALER_AUDITORDB_plugin_unload (adb);
GNUNET_free (dki);
GNUNET_free (sigs);
- GNUNET_free (eddsa_priv);
return 3;
}
@@ -396,7 +385,6 @@ main (int argc,
TALER_AUDITORDB_plugin_unload (adb);
GNUNET_free (dki);
GNUNET_free (sigs);
- GNUNET_free (eddsa_priv);
return 3;
}
for (unsigned int i = 0; i<dki_len; i++)
@@ -416,7 +404,6 @@ main (int argc,
TALER_AUDITORDB_plugin_unload (adb);
GNUNET_free (dki);
GNUNET_free (sigs);
- GNUNET_free (eddsa_priv);
return 3;
}
}
@@ -443,7 +430,6 @@ main (int argc,
}
GNUNET_free (sigs);
GNUNET_free (dki);
- GNUNET_free (eddsa_priv);
return 0;
}
diff --git a/src/exchange-tools/key-helper.c b/src/exchange-tools/key-helper.c
index 281202bd..0e3c0a2b 100644
--- a/src/exchange-tools/key-helper.c
+++ b/src/exchange-tools/key-helper.c
@@ -60,21 +60,24 @@ get_and_check_master_key (const struct
GNUNET_CONFIGURATION_Handle *cfg,
"Exchange master private key `%s' does not exist yet, creating
it!\n",
fn);
{
- struct GNUNET_CRYPTO_EddsaPrivateKey *eddsa_priv;
+ int ret;
- eddsa_priv = GNUNET_CRYPTO_eddsa_key_create_from_file (fn);
- if (NULL == eddsa_priv)
+ ret = GNUNET_CRYPTO_eddsa_key_from_file (fn,
+ GNUNET_YES,
+ &master_priv->eddsa_priv);
+ if (GNUNET_OK != ret)
{
fprintf (stderr,
- "Failed to initialize master key from file `%s'\n",
- fn);
+ "Failed to initialize master key from file `%s': %s\n",
+ fn,
+ (GNUNET_NO == ret)
+ ? "file exists"
+ : "could not create file");
GNUNET_free (fn);
return GNUNET_SYSERR;
}
- master_priv->eddsa_priv = *eddsa_priv;
- GNUNET_CRYPTO_eddsa_key_get_public (eddsa_priv,
+ GNUNET_CRYPTO_eddsa_key_get_public (&master_priv->eddsa_priv,
&mpub);
- GNUNET_free (eddsa_priv);
}
/* Check our key matches that in the configuration */
diff --git a/src/exchange-tools/taler-exchange-keyup.c
b/src/exchange-tools/taler-exchange-keyup.c
index 5472f5e0..0f5f66a8 100644
--- a/src/exchange-tools/taler-exchange-keyup.c
+++ b/src/exchange-tools/taler-exchange-keyup.c
@@ -481,12 +481,9 @@ create_signkey_issue_priv (
struct GNUNET_TIME_Absolute end,
struct TALER_EXCHANGEDB_PrivateSigningKeyInformationP *pi)
{
- struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
struct TALER_ExchangeSigningKeyValidityPS *issue = &pi->issue;
- priv = GNUNET_CRYPTO_eddsa_key_create ();
- pi->signkey_priv.eddsa_priv = *priv;
- GNUNET_free (priv);
+ GNUNET_CRYPTO_eddsa_key_create (&pi->signkey_priv.eddsa_priv);
issue->master_public_key = master_public_key;
issue->start = GNUNET_TIME_absolute_hton (start);
issue->expire = GNUNET_TIME_absolute_hton (GNUNET_TIME_absolute_add (start,
diff --git a/src/exchangedb/test_exchangedb_denomkeys.c
b/src/exchangedb/test_exchangedb_denomkeys.c
index 12add14d..1acb61dd 100644
--- a/src/exchangedb/test_exchangedb_denomkeys.c
+++ b/src/exchangedb/test_exchangedb_denomkeys.c
@@ -114,7 +114,6 @@ main (int argc,
void *enc;
size_t enc_size;
struct TALER_EXCHANGEDB_DenominationKey dki_read;
- struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
struct TALER_MasterPrivateKeyP master_priv;
struct TALER_MasterPublicKeyP master_pub;
void *enc_read;
@@ -136,11 +135,9 @@ main (int argc,
tmpfile = NULL;
dki.denom_priv.rsa_private_key = NULL;
dki_read.denom_priv.rsa_private_key = NULL;
- pk = GNUNET_CRYPTO_eddsa_key_create ();
- master_priv.eddsa_priv = *pk;
- GNUNET_CRYPTO_eddsa_key_get_public (pk,
+ GNUNET_CRYPTO_eddsa_key_create (&master_priv.eddsa_priv);
+ GNUNET_CRYPTO_eddsa_key_get_public (&master_priv.eddsa_priv,
&master_pub.eddsa_pub);
- GNUNET_free (pk);
GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_WEAK,
&dki.issue,
sizeof (struct
diff --git a/src/exchangedb/test_exchangedb_fees.c
b/src/exchangedb/test_exchangedb_fees.c
index 55f34bd6..f86dfe5c 100644
--- a/src/exchangedb/test_exchangedb_fees.c
+++ b/src/exchangedb/test_exchangedb_fees.c
@@ -53,7 +53,7 @@ main (int argc,
struct TALER_EXCHANGEDB_AggregateFees *af;
struct TALER_EXCHANGEDB_AggregateFees *n;
struct TALER_MasterPublicKeyP master_pub;
- struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
+ struct GNUNET_CRYPTO_EddsaPrivateKey priv;
char *tmpdir;
char *tmpfile = NULL;
int ret;
@@ -67,8 +67,8 @@ main (int argc,
tmpdir = GNUNET_DISK_mkdtemp ("test_exchangedb_fees");
if (NULL == tmpdir)
return 77; /* skip test */
- priv = GNUNET_CRYPTO_eddsa_key_create ();
- GNUNET_CRYPTO_eddsa_key_get_public (priv,
+ GNUNET_CRYPTO_eddsa_key_create (&priv);
+ GNUNET_CRYPTO_eddsa_key_get_public (&priv,
&master_pub.eddsa_pub);
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_CONFIGURATION_set_value_string (cfg,
@@ -91,7 +91,7 @@ main (int argc,
TALER_string_to_amount ("EUR:1.0",
&af->closing_fee));
sign_af (af,
- priv);
+ &priv);
n = GNUNET_new (struct TALER_EXCHANGEDB_AggregateFees);
n->start_date = GNUNET_TIME_year_to_time (year + 1);
n->end_date = GNUNET_TIME_year_to_time (year + 2);
@@ -102,7 +102,7 @@ main (int argc,
TALER_string_to_amount ("EUR:0.1",
&n->closing_fee));
sign_af (n,
- priv);
+ &priv);
af->next = n;
if (GNUNET_OK !=
@@ -148,7 +148,6 @@ main (int argc,
(void) GNUNET_DISK_directory_remove (tmpdir);
GNUNET_free (tmpdir);
- GNUNET_free (priv);
GNUNET_CONFIGURATION_destroy (cfg);
return ret;
}
diff --git a/src/json/test_json_wire.c b/src/json/test_json_wire.c
index 3b2123e2..2725173b 100644
--- a/src/json/test_json_wire.c
+++ b/src/json/test_json_wire.c
@@ -29,7 +29,6 @@ main (int argc,
const char *const argv[])
{
struct TALER_MasterPublicKeyP master_pub;
- struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
struct TALER_MasterPrivateKeyP master_priv;
json_t *wire;
const char *payto = "payto://x-taler-bank/42";
@@ -40,9 +39,7 @@ main (int argc,
GNUNET_log_setup ("test-json-wire",
"WARNING",
NULL);
- priv = GNUNET_CRYPTO_eddsa_key_create ();
- master_priv.eddsa_priv = *priv;
- GNUNET_free (priv);
+ GNUNET_CRYPTO_eddsa_key_create (&master_priv.eddsa_priv);
GNUNET_CRYPTO_eddsa_key_get_public (&master_priv.eddsa_priv,
&master_pub.eddsa_pub);
wire = TALER_JSON_exchange_wire_signature_make (payto,
diff --git a/src/lib/exchange_api_refresh_common.c
b/src/lib/exchange_api_refresh_common.c
index 92217c5e..3aa72e54 100644
--- a/src/lib/exchange_api_refresh_common.c
+++ b/src/lib/exchange_api_refresh_common.c
@@ -565,12 +565,8 @@ TALER_EXCHANGE_refresh_prepare (
/* build up coins */
for (unsigned int i = 0; i<TALER_CNC_KAPPA; i++)
{
- struct GNUNET_CRYPTO_EcdhePrivateKey *tpk;
-
- tpk = GNUNET_CRYPTO_ecdhe_key_create ();
- md.melted_coin.transfer_priv[i].ecdhe_priv = *tpk;
- GNUNET_free (tpk);
-
+ GNUNET_CRYPTO_ecdhe_key_create (
+ &md.melted_coin.transfer_priv[i].ecdhe_priv);
GNUNET_CRYPTO_ecdhe_key_get_public (
&md.melted_coin.transfer_priv[i].ecdhe_priv,
&rce[i].transfer_pub.ecdhe_pub);
diff --git a/src/testing/test_bank_api_twisted.c
b/src/testing/test_bank_api_twisted.c
index c2382db9..d8687e97 100644
--- a/src/testing/test_bank_api_twisted.c
+++ b/src/testing/test_bank_api_twisted.c
@@ -121,6 +121,26 @@ purge_process (struct GNUNET_OS_Process *process)
}
+/**
+ * Runs #TALER_TESTING_setup() using the configuration.
+ *
+ * @param cls unused
+ * @param cfg configuration to use
+ * @return status code
+ */
+static int
+setup_with_cfg (void *cls,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
+{
+ (void) cls;
+ return TALER_TESTING_setup (&run,
+ NULL,
+ cfg,
+ NULL,
+ GNUNET_NO);
+}
+
+
int
main (int argc,
char *const *argv)
@@ -196,11 +216,9 @@ main (int argc,
}
}
- ret = TALER_TESTING_setup (&run,
- NULL,
- cfgfilename,
- NULL,
- GNUNET_NO);
+ ret = GNUNET_CONFIGURATION_parse_and_run (cfgfilename,
+ &setup_with_cfg,
+ NULL);
purge_process (twisterd);
if (GNUNET_NO == with_fakebank)
diff --git a/src/testing/test_exchange_api_twisted.c
b/src/testing/test_exchange_api_twisted.c
index 146e28de..31b8ada7 100644
--- a/src/testing/test_exchange_api_twisted.c
+++ b/src/testing/test_exchange_api_twisted.c
@@ -299,6 +299,7 @@ main (int argc,
TALER_TESTING_cleanup_files (CONFIG_FILE);
switch (TALER_TESTING_prepare_exchange (CONFIG_FILE,
+ GNUNET_YES,
&ec))
{
case GNUNET_SYSERR:
diff --git a/src/testing/testing_api_cmd_bank_admin_add_incoming.c
b/src/testing/testing_api_cmd_bank_admin_add_incoming.c
index 04e6839d..2399825d 100644
--- a/src/testing/testing_api_cmd_bank_admin_add_incoming.c
+++ b/src/testing/testing_api_cmd_bank_admin_add_incoming.c
@@ -304,7 +304,6 @@ admin_add_incoming_run (void *cls,
{
char *section;
char *keys;
- struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
struct GNUNET_CONFIGURATION_Handle *cfg;
GNUNET_assert (NULL != fts->config_filename);
@@ -336,32 +335,29 @@ admin_add_incoming_run (void *cls,
TALER_TESTING_interpreter_fail (is);
return;
}
- priv = GNUNET_CRYPTO_eddsa_key_create_from_file (keys);
- GNUNET_free (keys);
- if (NULL == priv)
+ if (GNUNET_OK !=
+ GNUNET_CRYPTO_eddsa_key_from_file (keys,
+ GNUNET_NO,
+ &fts->reserve_priv.eddsa_priv))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
section,
"TIP_RESERVE_PRIV_FILENAME",
"Failed to read private key");
GNUNET_free (section);
+ GNUNET_free (keys);
TALER_TESTING_interpreter_fail (is);
return;
}
- fts->reserve_priv.eddsa_priv = *priv;
+ GNUNET_free (keys);
GNUNET_free (section);
- GNUNET_free (priv);
GNUNET_CONFIGURATION_destroy (cfg);
}
else
{
/* No referenced reserve, no instance to take priv
* from, no explicit subject given: create new key! */
- struct GNUNET_CRYPTO_EddsaPrivateKey *priv;
-
- priv = GNUNET_CRYPTO_eddsa_key_create ();
- fts->reserve_priv.eddsa_priv = *priv;
- GNUNET_free (priv);
+ GNUNET_CRYPTO_eddsa_key_create (&fts->reserve_priv.eddsa_priv);
}
}
GNUNET_CRYPTO_eddsa_key_get_public (&fts->reserve_priv.eddsa_priv,
diff --git a/src/testing/testing_api_cmd_deposit.c
b/src/testing/testing_api_cmd_deposit.c
index c251aada..9468e7ac 100644
--- a/src/testing/testing_api_cmd_deposit.c
+++ b/src/testing/testing_api_cmd_deposit.c
@@ -581,7 +581,6 @@ TALER_TESTING_cmd_deposit (const char *label,
{
struct DepositState *ds;
json_t *wire_details;
- struct GNUNET_CRYPTO_EddsaPrivateKey *merchant_priv;
wire_details = TALER_TESTING_make_wire_details (target_account_payto);
ds = GNUNET_new (struct DepositState);
@@ -591,9 +590,7 @@ TALER_TESTING_cmd_deposit (const char *label,
ds->contract_terms = json_loads (contract_terms,
JSON_REJECT_DUPLICATES,
NULL);
- merchant_priv = GNUNET_CRYPTO_eddsa_key_create ();
- ds->merchant_priv.eddsa_priv = *merchant_priv;
- GNUNET_free (merchant_priv);
+ GNUNET_CRYPTO_eddsa_key_create (&ds->merchant_priv.eddsa_priv);
if (NULL == ds->contract_terms)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
diff --git a/src/util/test_crypto.c b/src/util/test_crypto.c
index de10e567..8135dfe3 100644
--- a/src/util/test_crypto.c
+++ b/src/util/test_crypto.c
@@ -32,10 +32,8 @@
static int
test_high_level (void)
{
- struct GNUNET_CRYPTO_EddsaPrivateKey *pk;
struct TALER_CoinSpendPrivateKeyP coin_priv;
struct TALER_CoinSpendPublicKeyP coin_pub;
- struct GNUNET_CRYPTO_EcdhePrivateKey *pk2;
struct TALER_TransferPrivateKeyP trans_priv;
struct TALER_TransferPublicKeyP trans_pub;
struct TALER_TransferSecretP secret;
@@ -43,14 +41,10 @@ test_high_level (void)
struct TALER_PlanchetSecretsP fc1;
struct TALER_PlanchetSecretsP fc2;
- pk = GNUNET_CRYPTO_eddsa_key_create ();
- coin_priv.eddsa_priv = *pk;
- GNUNET_free (pk);
+ GNUNET_CRYPTO_eddsa_key_create (&coin_priv.eddsa_priv);
GNUNET_CRYPTO_eddsa_key_get_public (&coin_priv.eddsa_priv,
&coin_pub.eddsa_pub);
- pk2 = GNUNET_CRYPTO_ecdhe_key_create ();
- trans_priv.ecdhe_priv = *pk2;
- GNUNET_free (pk2);
+ GNUNET_CRYPTO_ecdhe_key_create (&trans_priv.ecdhe_priv);
GNUNET_CRYPTO_ecdhe_key_get_public (&trans_priv.ecdhe_priv,
&trans_pub.ecdhe_pub);
TALER_link_derive_transfer_secret (&coin_priv,
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-exchange] branch master updated (2d835168 -> 4b60d254),
gnunet <=