aboutsummaryrefslogtreecommitdiff
path: root/src/exchange
diff options
context:
space:
mode:
Diffstat (limited to 'src/exchange')
-rw-r--r--src/exchange/taler-exchange-httpd_keys.c36
-rw-r--r--src/exchange/taler-exchange-wirewatch.c18
2 files changed, 33 insertions, 21 deletions
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index 0fde1d67..a8ca76da 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -2575,12 +2575,18 @@ TEH_keys_denomination_sign_withdraw (
{
case TALER_DENOMINATION_RSA:
TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_RSA]++;
- return TALER_CRYPTO_helper_rsa_sign (
- ksh->helpers->rsadh,
- &hd->h_details.h_rsa,
- bp->details.rsa_blinded_planchet.blinded_msg,
- bp->details.rsa_blinded_planchet.blinded_msg_size,
- bs);
+ {
+ struct TALER_CRYPTO_RsaSignRequest rsr = {
+ .h_rsa = &hd->h_details.h_rsa,
+ .msg = bp->details.rsa_blinded_planchet.blinded_msg,
+ .msg_size = bp->details.rsa_blinded_planchet.blinded_msg_size
+ };
+
+ return TALER_CRYPTO_helper_rsa_sign (
+ ksh->helpers->rsadh,
+ &rsr,
+ bs);
+ }
case TALER_DENOMINATION_CS:
TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_CS]++;
return TALER_CRYPTO_helper_cs_sign_withdraw (
@@ -2616,12 +2622,18 @@ TEH_keys_denomination_sign_melt (
{
case TALER_DENOMINATION_RSA:
TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_RSA]++;
- return TALER_CRYPTO_helper_rsa_sign (
- ksh->helpers->rsadh,
- &hd->h_details.h_rsa,
- bp->details.rsa_blinded_planchet.blinded_msg,
- bp->details.rsa_blinded_planchet.blinded_msg_size,
- bs);
+ {
+ struct TALER_CRYPTO_RsaSignRequest rsr = {
+ .h_rsa = &hd->h_details.h_rsa,
+ .msg = bp->details.rsa_blinded_planchet.blinded_msg,
+ .msg_size = bp->details.rsa_blinded_planchet.blinded_msg_size
+ };
+
+ return TALER_CRYPTO_helper_rsa_sign (
+ ksh->helpers->rsadh,
+ &rsr,
+ bs);
+ }
case TALER_DENOMINATION_CS:
TEH_METRICS_num_signatures[TEH_MT_SIGNATURE_CS]++;
return TALER_CRYPTO_helper_cs_sign_melt (
diff --git a/src/exchange/taler-exchange-wirewatch.c b/src/exchange/taler-exchange-wirewatch.c
index 7a17239d..342068ca 100644
--- a/src/exchange/taler-exchange-wirewatch.c
+++ b/src/exchange/taler-exchange-wirewatch.c
@@ -623,17 +623,15 @@ history_cb (void *cls,
if (NULL == details)
{
wa->hh = NULL;
- if (TALER_EC_NONE != ec)
+ if ( (TALER_EC_NONE != ec) ||
+ (MHD_HTTP_OK != http_status) )
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- "Error fetching history: ec=%u, http_status=%u\n",
- (unsigned int) ec,
+ "Error fetching history: %s (%u)\n",
+ TALER_ErrorCode_get_hint (ec),
http_status);
- }
- else
- {
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "History response complete\n");
+ GNUNET_SCHEDULER_shutdown ();
+ return GNUNET_OK;
}
if (wa->started_transaction)
{
@@ -656,6 +654,8 @@ history_cb (void *cls,
GNUNET_SCHEDULER_shutdown ();
return GNUNET_OK;
}
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "No transactions in history response, moving on.\n");
account_completed (wa);
return GNUNET_OK; /* will be ignored anyway */
}
@@ -831,7 +831,7 @@ lock_shard (void *cls)
return;
}
if (wa->shard_open)
- GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Shard not completed in time, will try to re-acquire\n");
/* How long we lock a shard depends on the number of
workers expected, and how long we usually took to