towards merging with master
This commit is contained in:
parent
7332403bf0
commit
6b8c757887
@ -721,7 +721,6 @@ helper_esign_cb (
|
|||||||
{
|
{
|
||||||
/* should be just an update (revocation!), so update existing entry */
|
/* should be just an update (revocation!), so update existing entry */
|
||||||
hsk->validity_duration = validity_duration;
|
hsk->validity_duration = validity_duration;
|
||||||
GNUNET_break (0 == start_time.abs_value_us);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
GNUNET_assert (NULL != sm_pub);
|
GNUNET_assert (NULL != sm_pub);
|
||||||
|
@ -864,16 +864,16 @@ prepare_statements (struct PostgresClosure *pg)
|
|||||||
GNUNET_PQ_make_prepare (
|
GNUNET_PQ_make_prepare (
|
||||||
"get_refresh_revealed_coins",
|
"get_refresh_revealed_coins",
|
||||||
"SELECT "
|
"SELECT "
|
||||||
" freshcoin_index"
|
" rrc.freshcoin_index"
|
||||||
",denom.denom_pub"
|
",denom.denom_pub"
|
||||||
",link_sig"
|
",rrc.link_sig"
|
||||||
",coin_ev"
|
",rrc.coin_ev"
|
||||||
",ev_sig"
|
",rrc.ev_sig"
|
||||||
" FROM refresh_revealed_coins"
|
" FROM refresh_commitments"
|
||||||
|
" JOIN refresh_revealed_coins rrc"
|
||||||
|
" USING (melt_serial_id)"
|
||||||
" JOIN denominations denom "
|
" JOIN denominations denom "
|
||||||
" USING (denominations_serial)"
|
" USING (denominations_serial)"
|
||||||
" JOIN refresh_commitments"
|
|
||||||
" USING (melt_serial_id)"
|
|
||||||
" WHERE rc=$1"
|
" WHERE rc=$1"
|
||||||
" ORDER BY freshcoin_index ASC;",
|
" ORDER BY freshcoin_index ASC;",
|
||||||
1),
|
1),
|
||||||
|
@ -53,6 +53,11 @@ TALER_MHD_add_global_headers (struct MHD_Response *response)
|
|||||||
MHD_add_response_header (response,
|
MHD_add_response_header (response,
|
||||||
MHD_HTTP_HEADER_ACCESS_CONTROL_ALLOW_ORIGIN,
|
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 */
|
/* Not available as MHD constant yet */
|
||||||
"Access-Control-Allow-Methods",
|
"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;
|
MHD_RESULT ret;
|
||||||
|
|
||||||
|
1
src/util/.gitignore
vendored
1
src/util/.gitignore
vendored
@ -1,5 +1,6 @@
|
|||||||
taler-config
|
taler-config
|
||||||
test_payto
|
test_payto
|
||||||
|
taler-crypto-worker
|
||||||
taler-exchange-secmod-rsa
|
taler-exchange-secmod-rsa
|
||||||
taler-exchange-secmod-eddsa
|
taler-exchange-secmod-eddsa
|
||||||
test_helper_rsa
|
test_helper_rsa
|
||||||
|
@ -21,6 +21,7 @@ EXTRA_DIST = \
|
|||||||
test_helper_rsa.conf
|
test_helper_rsa.conf
|
||||||
|
|
||||||
bin_PROGRAMS = \
|
bin_PROGRAMS = \
|
||||||
|
taler-crypto-worker \
|
||||||
taler-exchange-secmod-eddsa \
|
taler-exchange-secmod-eddsa \
|
||||||
taler-exchange-secmod-rsa
|
taler-exchange-secmod-rsa
|
||||||
|
|
||||||
@ -58,6 +59,18 @@ taler_exchange_secmod_eddsa_LDADD = \
|
|||||||
$(LIBGCRYPT_LIBS) \
|
$(LIBGCRYPT_LIBS) \
|
||||||
$(XLIB)
|
$(XLIB)
|
||||||
|
|
||||||
|
taler_crypto_worker_SOURCES = \
|
||||||
|
taler-crypto-worker.c
|
||||||
|
taler_crypto_worker_LDADD = \
|
||||||
|
libtalerutil.la \
|
||||||
|
-lgnunetutil \
|
||||||
|
-lgnunetjson \
|
||||||
|
-ljansson \
|
||||||
|
-lpthread \
|
||||||
|
$(LIBGCRYPT_LIBS) \
|
||||||
|
$(XLIB)
|
||||||
|
|
||||||
|
|
||||||
lib_LTLIBRARIES = \
|
lib_LTLIBRARIES = \
|
||||||
libtalerutil.la
|
libtalerutil.la
|
||||||
|
|
||||||
|
@ -86,6 +86,7 @@ do_disconnect (struct TALER_CRYPTO_DenominationHelper *dh)
|
|||||||
"unlink",
|
"unlink",
|
||||||
dh->my_sa.sun_path);
|
dh->my_sa.sun_path);
|
||||||
dh->sock = -1;
|
dh->sock = -1;
|
||||||
|
dh->synced = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -81,6 +81,7 @@ do_disconnect (struct TALER_CRYPTO_ExchangeSignHelper *esh)
|
|||||||
"unlink",
|
"unlink",
|
||||||
esh->my_sa.sun_path);
|
esh->my_sa.sun_path);
|
||||||
esh->sock = -1;
|
esh->sock = -1;
|
||||||
|
esh->synced = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user