diff options
| author | Christian Grothoff <christian@grothoff.org> | 2018-10-06 15:05:06 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2018-10-06 15:05:06 +0200 |
| commit | a56e2e34bce77d41a6d3a2cbbcb89119b98ef750 (patch) | |
| tree | f71989d1aa318d62d2e0e4acd94f6b6454329535 /src/exchange | |
| parent | 81ce7abe190751da205bced8ca340e1cdc83e4f0 (diff) | |
| download | exchange-a56e2e34bce77d41a6d3a2cbbcb89119b98ef750.tar.gz exchange-a56e2e34bce77d41a6d3a2cbbcb89119b98ef750.tar.bz2 exchange-a56e2e34bce77d41a6d3a2cbbcb89119b98ef750.zip | |
fix #5434 (no more salt in exchange wire replies)
Diffstat (limited to 'src/exchange')
| -rw-r--r-- | src/exchange/taler-exchange-aggregator.c | 4 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_deposit.c | 4 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_keystate.c | 6 | ||||
| -rw-r--r-- | src/exchange/taler-exchange-httpd_validation.c | 4 | ||||
| -rw-r--r-- | src/exchange/test_taler_exchange_aggregator.c | 4 |
5 files changed, 14 insertions, 8 deletions
diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c index 6d363692e..07b4dc474 100644 --- a/src/exchange/taler-exchange-aggregator.c +++ b/src/exchange/taler-exchange-aggregator.c @@ -705,8 +705,8 @@ deposit_cb (void *cls, GNUNET_break (0); return GNUNET_DB_STATUS_HARD_ERROR; } - TALER_JSON_wire_signature_hash (wire, - &au->h_wire); + TALER_JSON_merchant_wire_signature_hash (wire, + &au->h_wire); GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_NONCE, &au->wtid, sizeof (au->wtid)); diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c index 107456cad..52344d645 100644 --- a/src/exchange/taler-exchange-httpd_deposit.c +++ b/src/exchange/taler-exchange-httpd_deposit.c @@ -457,8 +457,8 @@ TEH_DEPOSIT_handler_deposit (struct TEH_RequestHandler *rh, "timestamp"); } if (GNUNET_OK != - TALER_JSON_wire_signature_hash (wire, - &my_h_wire)) + TALER_JSON_merchant_wire_signature_hash (wire, + &my_h_wire)) { TALER_LOG_WARNING ("Failed to parse JSON wire format specification for /deposit request\n"); GNUNET_JSON_parse_free (spec); diff --git a/src/exchange/taler-exchange-httpd_keystate.c b/src/exchange/taler-exchange-httpd_keystate.c index ce2eafa71..8fbb2f85f 100644 --- a/src/exchange/taler-exchange-httpd_keystate.c +++ b/src/exchange/taler-exchange-httpd_keystate.c @@ -1633,6 +1633,9 @@ TEH_KS_release_ (const char *location, struct TEH_KS_StateHandle *key_state) { GNUNET_assert (0 == pthread_mutex_lock (&internal_key_state_mutex)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "KS released at %s\n", + location); ks_release (key_state); GNUNET_assert (0 == pthread_mutex_unlock (&internal_key_state_mutex)); } @@ -1653,6 +1656,9 @@ TEH_KS_acquire_ (const char *location) struct TEH_KS_StateHandle *key_state; GNUNET_assert (0 == pthread_mutex_lock (&internal_key_state_mutex)); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "KS acquired at %s\n", + location); if ( (NULL != internal_key_state) && (internal_key_state->next_reload.abs_value_us <= now.abs_value_us) ) { diff --git a/src/exchange/taler-exchange-httpd_validation.c b/src/exchange/taler-exchange-httpd_validation.c index 7daa18aa7..aa97af2f2 100644 --- a/src/exchange/taler-exchange-httpd_validation.c +++ b/src/exchange/taler-exchange-httpd_validation.c @@ -158,8 +158,8 @@ load_account (void *cls, } GNUNET_free (url); if (GNUNET_OK != - TALER_JSON_wire_signature_check (wire_s, - &TEH_master_public_key)) + TALER_JSON_exchange_wire_signature_check (wire_s, + &TEH_master_public_key)) { GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Invalid signature in `%s'\n", diff --git a/src/exchange/test_taler_exchange_aggregator.c b/src/exchange/test_taler_exchange_aggregator.c index 3f813f76f..0ba8152df 100644 --- a/src/exchange/test_taler_exchange_aggregator.c +++ b/src/exchange/test_taler_exchange_aggregator.c @@ -447,8 +447,8 @@ do_deposit (struct Command *cmd) GNUNET_free (str); } GNUNET_assert (GNUNET_OK == - TALER_JSON_wire_signature_hash (deposit.receiver_wire_account, - &deposit.h_wire)); + TALER_JSON_merchant_wire_signature_hash (deposit.receiver_wire_account, + &deposit.h_wire)); deposit.timestamp = GNUNET_TIME_absolute_get (); GNUNET_TIME_round_abs (&deposit.timestamp); deposit.wire_deadline = GNUNET_TIME_relative_to_absolute (cmd->details.deposit.wire_deadline); |