aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/exchange/taler-exchange-httpd_keys.c1
-rw-r--r--src/exchangedb/plugin_exchangedb_postgres.c14
-rw-r--r--src/mhd/mhd_responses.c11
-rw-r--r--src/util/.gitignore1
-rw-r--r--src/util/Makefile.am13
-rw-r--r--src/util/crypto_helper_denom.c1
-rw-r--r--src/util/crypto_helper_esign.c1
7 files changed, 28 insertions, 14 deletions
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index 6b5bccdc6..e094f273f 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -721,7 +721,6 @@ helper_esign_cb (
{
/* should be just an update (revocation!), so update existing entry */
hsk->validity_duration = validity_duration;
- GNUNET_break (0 == start_time.abs_value_us);
return;
}
GNUNET_assert (NULL != sm_pub);
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 9bfe777f4..57c222455 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -864,16 +864,16 @@ prepare_statements (struct PostgresClosure *pg)
GNUNET_PQ_make_prepare (
"get_refresh_revealed_coins",
"SELECT "
- " freshcoin_index"
+ " rrc.freshcoin_index"
",denom.denom_pub"
- ",link_sig"
- ",coin_ev"
- ",ev_sig"
- " FROM refresh_revealed_coins"
+ ",rrc.link_sig"
+ ",rrc.coin_ev"
+ ",rrc.ev_sig"
+ " FROM refresh_commitments"
+ " JOIN refresh_revealed_coins rrc"
+ " USING (melt_serial_id)"
" JOIN denominations denom "
" USING (denominations_serial)"
- " JOIN refresh_commitments"
- " USING (melt_serial_id)"
" WHERE rc=$1"
" ORDER BY freshcoin_index ASC;",
1),
diff --git a/src/mhd/mhd_responses.c b/src/mhd/mhd_responses.c
index d93381063..5b99dd128 100644
--- a/src/mhd/mhd_responses.c
+++ b/src/mhd/mhd_responses.c
@@ -53,6 +53,11 @@ TALER_MHD_add_global_headers (struct MHD_Response *response)
MHD_add_response_header (response,
MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
"*"));
+ GNUNET_break (MHD_YES ==
+ MHD_add_response_header (response,
+ /* Not available as MHD constant yet */
+ "Access-Control-Expose-Headers",
+ "*"));
}
@@ -268,12 +273,6 @@ TALER_MHD_reply_cors_preflight (struct MHD_Connection *connection)
/* Not available as MHD constant yet */
"Access-Control-Allow-Methods",
"*"));
- GNUNET_break (MHD_YES ==
- MHD_add_response_header (response,
- /* Not available as MHD constant yet */
- "Access-Control-Expose-Headers",
- "*"));
-
{
MHD_RESULT ret;
diff --git a/src/util/.gitignore b/src/util/.gitignore
index f25567f32..946924dcc 100644
--- a/src/util/.gitignore
+++ b/src/util/.gitignore
@@ -1,5 +1,6 @@
taler-config
test_payto
+taler-crypto-worker
taler-exchange-secmod-rsa
taler-exchange-secmod-eddsa
test_helper_rsa
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 3c9a72646..53b676f85 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -21,6 +21,7 @@ EXTRA_DIST = \
test_helper_rsa.conf
bin_PROGRAMS = \
+ taler-crypto-worker \
taler-exchange-secmod-eddsa \
taler-exchange-secmod-rsa
@@ -58,6 +59,18 @@ taler_exchange_secmod_eddsa_LDADD = \
$(LIBGCRYPT_LIBS) \
$(XLIB)
+taler_crypto_worker_SOURCES = \
+ taler-crypto-worker.c
+taler_crypto_worker_LDADD = \
+ libtalerutil.la \
+ -lgnunetutil \
+ -lgnunetjson \
+ -ljansson \
+ -lpthread \
+ $(LIBGCRYPT_LIBS) \
+ $(XLIB)
+
+
lib_LTLIBRARIES = \
libtalerutil.la
diff --git a/src/util/crypto_helper_denom.c b/src/util/crypto_helper_denom.c
index 02ac2cb2d..6490184ef 100644
--- a/src/util/crypto_helper_denom.c
+++ b/src/util/crypto_helper_denom.c
@@ -86,6 +86,7 @@ do_disconnect (struct TALER_CRYPTO_DenominationHelper *dh)
"unlink",
dh->my_sa.sun_path);
dh->sock = -1;
+ dh->synced = false;
}
diff --git a/src/util/crypto_helper_esign.c b/src/util/crypto_helper_esign.c
index eb0673f28..6257a1d26 100644
--- a/src/util/crypto_helper_esign.c
+++ b/src/util/crypto_helper_esign.c
@@ -81,6 +81,7 @@ do_disconnect (struct TALER_CRYPTO_ExchangeSignHelper *esh)
"unlink",
esh->my_sa.sun_path);
esh->sock = -1;
+ esh->synced = false;
}