[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-exchange] branch master updated (0f214150 -> 8715e2b2)
|
From: |
gnunet |
|
Subject: |
[taler-exchange] branch master updated (0f214150 -> 8715e2b2) |
|
Date: |
Sat, 18 Jan 2020 18:05:01 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a change to branch master
in repository exchange.
from 0f214150 make parameter const
new c5c04cb5 fix -Wextra warnings
new 8715e2b2 fix leaks
The 2 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-dbinit.c | 3 +++
src/auditor/taler-auditor-httpd.c | 8 +++++--
.../taler-auditor-httpd_deposit-confirmation.c | 4 ++++
src/auditor/taler-auditor-httpd_mhd.c | 3 +++
src/auditor/taler-wire-auditor.c | 17 ++++++++++++-
src/auditordb/plugin_auditordb_postgres.c | 1 +
src/include/taler_exchange_service.h | 6 +----
src/lib/auditor_api_handle.c | 3 ---
src/lib/exchange_api_handle.c | 1 +
src/lib/exchange_api_refresh.c | 6 +----
src/lib/testing_api_cmd_refresh.c | 27 ++++++++++++---------
src/lib/testing_api_helpers_bank.c | 28 +++++++++++-----------
12 files changed, 66 insertions(+), 41 deletions(-)
diff --git a/src/auditor/taler-auditor-dbinit.c
b/src/auditor/taler-auditor-dbinit.c
index 2664e091..291220be 100644
--- a/src/auditor/taler-auditor-dbinit.c
+++ b/src/auditor/taler-auditor-dbinit.c
@@ -55,6 +55,9 @@ run (void *cls,
{
struct TALER_AUDITORDB_Plugin *plugin;
+ (void) cls;
+ (void) args;
+ (void) cfgfile;
if (NULL ==
(plugin = TALER_AUDITORDB_plugin_load (cfg)))
{
diff --git a/src/auditor/taler-auditor-httpd.c
b/src/auditor/taler-auditor-httpd.c
index 0acd8d8b..2b09a333 100644
--- a/src/auditor/taler-auditor-httpd.c
+++ b/src/auditor/taler-auditor-httpd.c
@@ -288,6 +288,9 @@ handle_mhd_completion_callback (void *cls,
void **con_cls,
enum MHD_RequestTerminationCode toe)
{
+ (void) cls;
+ (void) connection;
+ (void) toe;
if (NULL == *con_cls)
return;
TALER_MHD_parse_post_cleanup_callback (*con_cls);
@@ -388,11 +391,12 @@ handle_mhd_request (void *cls,
{ "/agpl", MHD_HTTP_METHOD_GET, "text/plain",
NULL, 0,
&TAH_MHD_handler_agpl_redirect, MHD_HTTP_FOUND },
-
- { NULL, NULL, NULL, NULL, 0, 0 }
+ { NULL, NULL, NULL, NULL, 0, NULL, 0 }
};
struct TAH_RequestHandler *rh;
+ (void) cls;
+ (void) version;
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Handling request for URL '%s'\n",
url);
diff --git a/src/auditor/taler-auditor-httpd_deposit-confirmation.c
b/src/auditor/taler-auditor-httpd_deposit-confirmation.c
index 656b4fb7..7759b553 100644
--- a/src/auditor/taler-auditor-httpd_deposit-confirmation.c
+++ b/src/auditor/taler-auditor-httpd_deposit-confirmation.c
@@ -203,6 +203,10 @@ TAH_DEPOSIT_CONFIRMATION_handler (struct
TAH_RequestHandler *rh,
GNUNET_JSON_spec_end ()
};
+ (void) rh;
+ (void) connection_cls;
+ (void) upload_data;
+ (void) upload_data_size;
res = TALER_MHD_parse_post_json (connection,
connection_cls,
upload_data,
diff --git a/src/auditor/taler-auditor-httpd_mhd.c
b/src/auditor/taler-auditor-httpd_mhd.c
index 01927469..8d049664 100644
--- a/src/auditor/taler-auditor-httpd_mhd.c
+++ b/src/auditor/taler-auditor-httpd_mhd.c
@@ -124,6 +124,9 @@ TAH_MHD_handler_send_json_pack_error (struct
TAH_RequestHandler *rh,
const char *upload_data,
size_t *upload_data_size)
{
+ (void) connection_cls;
+ (void) upload_data;
+ (void) upload_data_size;
return TALER_MHD_reply_json_pack (connection,
rh->response_code,
"{s:s}",
diff --git a/src/auditor/taler-wire-auditor.c b/src/auditor/taler-wire-auditor.c
index 5cf4a5c3..9801a95d 100644
--- a/src/auditor/taler-wire-auditor.c
+++ b/src/auditor/taler-wire-auditor.c
@@ -431,6 +431,7 @@ free_rii (void *cls,
{
struct ReserveInInfo *rii = value;
+ (void) cls;
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (in_map,
key,
@@ -455,6 +456,7 @@ free_roi (void *cls,
{
struct ReserveOutInfo *roi = value;
+ (void) cls;
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (out_map,
key,
@@ -479,6 +481,7 @@ free_rc (void *cls,
{
struct ReserveClosure *rc = value;
+ (void) cls;
GNUNET_assert (GNUNET_YES ==
GNUNET_CONTAINER_multihashmap_remove (reserve_closures,
key,
@@ -499,6 +502,7 @@ do_shutdown (void *cls)
{
struct WireAccount *wa;
+ (void) cls;
if (NULL != ctx)
{
GNUNET_CURL_fini (ctx);
@@ -699,6 +703,8 @@ check_pending_rc (void *cls,
{
struct ReserveClosure *rc = value;
+ (void) cls;
+ (void) key;
GNUNET_break (GNUNET_OK ==
TALER_amount_add (&total_closure_amount_lag,
&total_closure_amount_lag,
@@ -905,6 +911,7 @@ wire_missing_cb (void *cls,
/* bool? */ int tiny,
/* bool? */ int done)
{
+ (void) cls;
GNUNET_break (GNUNET_OK ==
TALER_amount_add (&total_amount_lag,
&total_amount_lag,
@@ -1251,6 +1258,7 @@ complain_out_not_found (void *cls,
.found = GNUNET_NO
};
+ (void) key;
hash_rc (roi->details.credit_account_url,
&roi->details.wtid,
&rkey);
@@ -1355,6 +1363,7 @@ history_debit_cb (void *cls,
struct WireAccount *wa = cls;
struct ReserveOutInfo *roi;
+ (void) json;
if (NULL == details)
{
wa->dhh = NULL;
@@ -1481,7 +1490,7 @@ begin_debit_audit ()
* processing debits.
*/
static void
-conclude_credit_history ()
+conclude_credit_history (void)
{
GNUNET_CONTAINER_multihashmap_destroy (in_map);
in_map = NULL;
@@ -1575,6 +1584,7 @@ complain_in_not_found (void *cls,
struct WireAccount *wa = cls;
struct ReserveInInfo *rii = value;
+ (void) key;
report (report_reserve_in_inconsistencies,
json_pack ("{s:I, s:o, s:o, s:o, s:o, s:s, s:s}",
"row", (json_int_t) rii->rowid,
@@ -1631,6 +1641,7 @@ history_credit_cb (void *cls,
struct ReserveInInfo *rii;
struct GNUNET_HashCode key;
+ (void) json;
if (NULL == details)
{
wa->chh = NULL;
@@ -2044,6 +2055,7 @@ process_account_cb (void *cls,
{
struct WireAccount *wa;
+ (void) cls;
if ( (GNUNET_NO == ai->debit_enabled) &&
(GNUNET_NO == ai->credit_enabled) )
return; /* not an active exchange account */
@@ -2092,6 +2104,9 @@ run (void *cls,
static const struct TALER_MasterPublicKeyP zeromp;
char *tinys;
+ (void) cls;
+ (void) args;
+ (void) cfgfile;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Launching auditor\n");
start_time = GNUNET_TIME_absolute_get ();
diff --git a/src/auditordb/plugin_auditordb_postgres.c
b/src/auditordb/plugin_auditordb_postgres.c
index 4ca2b6b3..21263d14 100644
--- a/src/auditordb/plugin_auditordb_postgres.c
+++ b/src/auditordb/plugin_auditordb_postgres.c
@@ -123,6 +123,7 @@ postgres_drop_tables (void *cls,
exec_dir,
NULL,
NULL);
+ GNUNET_free (exec_dir);
if (NULL == conn)
return GNUNET_SYSERR;
GNUNET_PQ_disconnect (conn);
diff --git a/src/include/taler_exchange_service.h
b/src/include/taler_exchange_service.h
index 25364742..5834d2a6 100644
--- a/src/include/taler_exchange_service.h
+++ b/src/include/taler_exchange_service.h
@@ -1289,9 +1289,7 @@ TALER_EXCHANGE_reserve_withdraw_cancel (struct
* to #TALER_EXCHANGE_refresh_melt() that will generate the request.
*
* This function does verify that the given request data is internally
- * consistent. However, the @a melts_sig is only verified if @a
- * check_sig is set to #GNUNET_YES, as this may be relatively
- * expensive and should be redundant.
+ * consistent. However, the @a melts_sigs are NOT verified.
*
* Aside from some non-trivial cryptographic operations that might
* take a bit of CPU time to complete, this function returns
@@ -1307,7 +1305,6 @@ TALER_EXCHANGE_reserve_withdraw_cancel (struct
* @param melt_pk denomination key information
* record corresponding to the @a melt_sig
* validity of the keys
- * @param check_sig verify the validity of the signatures of @a melt_sig
* @param fresh_pks_len length of the @a pks array
* @param fresh_pks array of @a pks_len denominations of fresh coins to create
* @param[out] res_size set to the size of the return value, or 0 on error
@@ -1325,7 +1322,6 @@ TALER_EXCHANGE_refresh_prepare (const struct
TALER_DenominationSignature *melt_sig,
const struct
TALER_EXCHANGE_DenomPublicKey *melt_pk,
- int check_sig,
unsigned int fresh_pks_len,
const struct
TALER_EXCHANGE_DenomPublicKey *fresh_pks,
diff --git a/src/lib/auditor_api_handle.c b/src/lib/auditor_api_handle.c
index d38de34f..e1e1cd4f 100644
--- a/src/lib/auditor_api_handle.c
+++ b/src/lib/auditor_api_handle.c
@@ -195,14 +195,12 @@ free_version_info (struct
TALER_AUDITOR_VersionInformation *vi)
* in the @a key_data.
*
* @param[in] resp_obj JSON object to parse
- * @param check_sig #GNUNET_YES if we should check the signature
* @param[out] vi where to store the results we decoded
* @param[out] vc where to store version compatibility data
* @return #GNUNET_OK on success, #GNUNET_SYSERR on error (malformed JSON)
*/
static int
decode_version_json (const json_t *resp_obj,
- int check_sig,
struct TALER_AUDITOR_VersionInformation *vi,
enum TALER_AUDITOR_VersionCompatibility *vc)
{
@@ -313,7 +311,6 @@ version_completed_cb (void *cls,
}
if (GNUNET_OK !=
decode_version_json (resp_obj,
- GNUNET_YES,
&auditor->vi,
&vc))
{
diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index 9ee64c4c..ed05558f 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -278,6 +278,7 @@ TEAH_acc_confirmation_cb (void *cls,
struct TEAH_AuditorInteractionEntry *aie = cls;
struct TEAH_AuditorListEntry *ale = aie->ale;
+ (void) json;
if (MHD_HTTP_OK != http_status)
{
GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
diff --git a/src/lib/exchange_api_refresh.c b/src/lib/exchange_api_refresh.c
index adcc65e1..e097ee3f 100644
--- a/src/lib/exchange_api_refresh.c
+++ b/src/lib/exchange_api_refresh.c
@@ -657,9 +657,7 @@ deserialize_melt_data (const char *buf,
* to #TALER_EXCHANGE_refresh_melt() that will generate the request.
*
* This function does verify that the given request data is internally
- * consistent. However, the @a melts_sigs are only verified if
- * @a check_sigs is set to #GNUNET_YES, as this may be relatively
- * expensive and should be redundant.
+ * consistent. However, the @a melts_sigs are NOT verified.
*
* Aside from some non-trivial cryptographic operations that might
* take a bit of CPU time to complete, this function returns
@@ -675,7 +673,6 @@ deserialize_melt_data (const char *buf,
* @param melt_pk denomination key information
* record corresponding to the @a melt_sig
* validity of the keys
- * @param check_sig verify the validity of the @a melt_sig signature
* @param fresh_pks_len length of the @a pks array
* @param fresh_pks array of @a pks_len denominations of fresh coins to create
* @param[out] res_size set to the size of the return value, or 0 on error
@@ -693,7 +690,6 @@ TALER_EXCHANGE_refresh_prepare (const struct
TALER_DenominationSignature *melt_sig,
const struct
TALER_EXCHANGE_DenomPublicKey *melt_pk,
- int check_sig,
unsigned int fresh_pks_len,
const struct
TALER_EXCHANGE_DenomPublicKey *fresh_pks,
diff --git a/src/lib/testing_api_cmd_refresh.c
b/src/lib/testing_api_cmd_refresh.c
index c4dcc3c6..019c000f 100644
--- a/src/lib/testing_api_cmd_refresh.c
+++ b/src/lib/testing_api_cmd_refresh.c
@@ -686,8 +686,8 @@ refresh_link_run (void *cls,
const struct TALER_TESTING_Command *reveal_cmd;
const struct TALER_TESTING_Command *melt_cmd;
const struct TALER_TESTING_Command *coin_cmd;
- rls->is = is;
+ rls->is = is;
reveal_cmd = TALER_TESTING_interpreter_lookup_command
(rls->is, rls->reveal_reference);
@@ -989,14 +989,17 @@ refresh_melt_run (void *cls,
&fresh_pk->fee_withdraw));
rms->fresh_pks[i] = *fresh_pk;
/* Make a deep copy of the RSA key */
- rms->fresh_pks[i].key.rsa_public_key = GNUNET_CRYPTO_rsa_public_key_dup (
- fresh_pk->key.rsa_public_key);
+ rms->fresh_pks[i].key.rsa_public_key
+ = GNUNET_CRYPTO_rsa_public_key_dup (fresh_pk->key.rsa_public_key);
}
- rms->refresh_data = TALER_EXCHANGE_refresh_prepare
- (rms->melt_priv, &melt_amount, melt_sig,
- melt_denom_pub,
- GNUNET_YES, num_fresh_coins, rms->fresh_pks,
- &rms->refresh_data_length);
+ rms->refresh_data
+ = TALER_EXCHANGE_refresh_prepare (rms->melt_priv,
+ &melt_amount,
+ melt_sig,
+ melt_denom_pub,
+ num_fresh_coins,
+ rms->fresh_pks,
+ &rms->refresh_data_length);
if (NULL == rms->refresh_data)
{
@@ -1004,9 +1007,11 @@ refresh_melt_run (void *cls,
TALER_TESTING_interpreter_fail (rms->is);
return;
}
- rms->rmh = TALER_EXCHANGE_refresh_melt
- (is->exchange, rms->refresh_data_length,
- rms->refresh_data, &melt_cb, rms);
+ rms->rmh = TALER_EXCHANGE_refresh_melt (is->exchange,
+ rms->refresh_data_length,
+ rms->refresh_data,
+ &melt_cb,
+ rms);
if (NULL == rms->rmh)
{
diff --git a/src/lib/testing_api_helpers_bank.c
b/src/lib/testing_api_helpers_bank.c
index 0e4510ec..de498927 100644
--- a/src/lib/testing_api_helpers_bank.c
+++ b/src/lib/testing_api_helpers_bank.c
@@ -396,7 +396,6 @@ TALER_TESTING_prepare_fakebank (const char *config_filename,
struct GNUNET_CONFIGURATION_Handle *cfg;
unsigned long long fakebank_port;
char *exchange_payto_uri;
- char *exchange_xtalerbank_account;
cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_OK != GNUNET_CONFIGURATION_load (cfg,
@@ -428,21 +427,22 @@ TALER_TESTING_prepare_fakebank (const char
*config_filename,
return GNUNET_SYSERR;
}
bc->exchange_auth.method = TALER_BANK_AUTH_NONE;
-
- exchange_xtalerbank_account = TALER_xtalerbank_account_from_payto (
- exchange_payto_uri);
-
- if (NULL == exchange_xtalerbank_account)
{
- GNUNET_break (0);
- return GNUNET_SYSERR;
- }
-
- GNUNET_asprintf (&bc->exchange_auth.wire_gateway_url,
- "http://localhost:%u/%s/";,
- (unsigned int) fakebank_port,
- exchange_xtalerbank_account);
+ char *exchange_xtalerbank_account;
+ exchange_xtalerbank_account
+ = TALER_xtalerbank_account_from_payto (exchange_payto_uri);
+ if (NULL == exchange_xtalerbank_account)
+ {
+ GNUNET_break (0);
+ return GNUNET_SYSERR;
+ }
+ GNUNET_asprintf (&bc->exchange_auth.wire_gateway_url,
+ "http://localhost:%u/%s/";,
+ (unsigned int) fakebank_port,
+ exchange_xtalerbank_account);
+ GNUNET_free (exchange_xtalerbank_account);
+ }
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Using fakebank %s on port %u\n",
bc->exchange_auth.wire_gateway_url,
--
To stop receiving notification emails like this one, please contact
address@hidden.
- [taler-exchange] branch master updated (0f214150 -> 8715e2b2),
gnunet <=