taler/exchange
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename taler-helper-crypto-* to taler-exchange-secmod-*

Browse Source
This commit is contained in:
Florian Dold 2021-01-17 20:07:55 +01:00
parent ed9c37ef4f
commit b23f9b78a4
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
25 changed files with 99 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/taler-exchange.postinst vendored
View File

@ -128,7 +128,7 @@ EnvironmentFile=/etc/default/taler-exchange
User=${_RSECUSERNAME} User=${_RSECUSERNAME}
Type=simple Type=simple
Restart=on-failure Restart=on-failure
ExecStart=/usr/bin/taler-helper-crypto-rsa -c /etc/taler-exchange.conf ExecStart=/usr/bin/taler-exchange-secmod-rsa -c /etc/taler-exchange.conf
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target
@ -142,7 +142,7 @@ EnvironmentFile=/etc/default/taler-exchange
User=${_ESECUSERNAME} User=${_ESECUSERNAME}
Type=simple Type=simple
Restart=on-failure Restart=on-failure
ExecStart=/usr/bin/taler-helper-crypto-eddsa -c /etc/taler-exchange.conf ExecStart=/usr/bin/taler-exchange-secmod-eddsa -c /etc/taler-exchange.conf
EOF EOF
cat > "/etc/systemd/system/taler-exchange-wirewatch.service" <<EOF cat > "/etc/systemd/system/taler-exchange-wirewatch.service" <<EOF
[Unit] [Unit]

4
src/auditor/generate-auditor-basedb.sh
View File

@ -118,8 +118,8 @@ taler-bank-manage-testing $CONF postgres:///$TARGET_DB serve &> taler-bank.log &
TFN=`which taler-exchange-httpd` TFN=`which taler-exchange-httpd`
TBINPFX=`dirname $TFN` TBINPFX=`dirname $TFN`
TLIBEXEC=${TBINPFX}/../lib/taler/libexec/ TLIBEXEC=${TBINPFX}/../lib/taler/libexec/
taler-helper-crypto-eddsa -c $CONF 2> taler-helper-crypto-eddsa.log & taler-exchange-secmod-eddsa -c $CONF 2> taler-exchange-secmod-eddsa.log &
taler-helper-crypto-rsa -c $CONF 2> taler-helper-crypto-rsa.log & taler-exchange-secmod-rsa -c $CONF 2> taler-exchange-secmod-rsa.log &
taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log & taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log & taler-merchant-httpd -c $CONF -L INFO 2> taler-merchant-httpd.log &
taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log & taler-exchange-wirewatch -c $CONF 2> taler-exchange-wirewatch.log &

8
src/auditor/generate-revoke-basedb.sh
View File

@ -106,9 +106,9 @@ taler-bank-manage-testing $CONF postgres:///$TARGET_DB serve &> revocation-bank.
TFN=`which taler-exchange-httpd` TFN=`which taler-exchange-httpd`
TBINPFX=`dirname $TFN` TBINPFX=`dirname $TFN`
TLIBEXEC=${TBINPFX}/../lib/taler/libexec/ TLIBEXEC=${TBINPFX}/../lib/taler/libexec/
taler-helper-crypto-eddsa -c $CONF 2> taler-helper-crypto-eddsa.log & taler-exchange-secmod-eddsa -c $CONF 2> taler-exchange-secmod-eddsa.log &
SIGNKEY_HELPER_PID=$! SIGNKEY_HELPER_PID=$!
taler-helper-crypto-rsa -c $CONF 2> taler-helper-crypto-rsa.log & taler-exchange-secmod-rsa -c $CONF 2> taler-exchange-secmod-rsa.log &
DENOM_HELPER_PID=$! DENOM_HELPER_PID=$!
taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log & taler-exchange-httpd -c $CONF 2> taler-exchange-httpd.log &
EXCHANGE_PID=$! EXCHANGE_PID=$!
@ -280,9 +280,9 @@ echo "Launching exchange 1 week in the future"
kill -TERM $EXCHANGE_PID kill -TERM $EXCHANGE_PID
kill -TERM $DENOM_HELPER_PID kill -TERM $DENOM_HELPER_PID
kill -TERM $SIGNKEY_HELPER_PID kill -TERM $SIGNKEY_HELPER_PID
taler-helper-crypto-eddsa $TIMETRAVEL -c $CONF 2> taler-helper-crypto-eddsa.log & taler-exchange-secmod-eddsa $TIMETRAVEL -c $CONF 2> taler-exchange-secmod-eddsa.log &
SIGNKEY_HELPER_PID=$! SIGNKEY_HELPER_PID=$!
taler-helper-crypto-rsa $TIMETRAVEL -c $CONF 2> taler-helper-crypto-rsa.log & taler-exchange-secmod-rsa $TIMETRAVEL -c $CONF 2> taler-exchange-secmod-rsa.log &
DENOM_HELPER_PID=$! DENOM_HELPER_PID=$!
taler-exchange-httpd $TIMETRAVEL -c $CONF 2> taler-exchange-httpd.log & taler-exchange-httpd $TIMETRAVEL -c $CONF 2> taler-exchange-httpd.log &
export EXCHANGE_PID=$! export EXCHANGE_PID=$!

12
src/testing/.gitignore vendored
View File

@ -11,15 +11,15 @@ test_exchange_management_api
test_exchange_api_home/.local/share/taler/crypto-eddsa/ test_exchange_api_home/.local/share/taler/crypto-eddsa/
test_exchange_api_home/.local/share/taler/crypto-rsa/ test_exchange_api_home/.local/share/taler/crypto-rsa/
test_exchange_api_home/.local/share/taler/exchange/offline-keys/secm_tofus.priv test_exchange_api_home/.local/share/taler/exchange/offline-keys/secm_tofus.priv
test_exchange_api_home/.local/share/taler/taler-helper-crypto-eddsa/ test_exchange_api_home/.local/share/taler/taler-exchange-secmod-eddsa/
test_exchange_api_home/.local/share/taler/taler-helper-crypto-rsa/ test_exchange_api_home/.local/share/taler/taler-exchange-secmod-rsa/
test_exchange_api_keys_cherry_picking_home/.local/share/taler/crypto-eddsa/ test_exchange_api_keys_cherry_picking_home/.local/share/taler/crypto-eddsa/
test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/secm_tofus.priv test_exchange_api_keys_cherry_picking_home/.local/share/taler/exchange/offline-keys/secm_tofus.priv
test_exchange_api_keys_cherry_picking_home/.local/share/taler/taler-helper-crypto-eddsa/ test_exchange_api_keys_cherry_picking_home/.local/share/taler/taler-exchange-secmod-eddsa/
test_exchange_api_keys_cherry_picking_home/.local/share/taler/taler-helper-crypto-rsa/ test_exchange_api_keys_cherry_picking_home/.local/share/taler/taler-exchange-secmod-rsa/
test_taler_exchange_httpd_home/.local/share/taler/crypto-eddsa/ test_taler_exchange_httpd_home/.local/share/taler/crypto-eddsa/
test_taler_exchange_httpd_home/.local/share/taler/crypto-rsa/ test_taler_exchange_httpd_home/.local/share/taler/crypto-rsa/
test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/secm_tofus.priv test_taler_exchange_httpd_home/.local/share/taler/exchange/offline-keys/secm_tofus.priv
test_taler_exchange_httpd_home/.local/share/taler/taler-helper-crypto-eddsa/ test_taler_exchange_httpd_home/.local/share/taler/taler-exchange-secmod-eddsa/
test_taler_exchange_httpd_home/.local/share/taler/taler-helper-crypto-rsa/ test_taler_exchange_httpd_home/.local/share/taler/taler-exchange-secmod-rsa/
test_exchange_api_keys_cherry_picking_home/.local/share/taler/crypto-rsa/ test_exchange_api_keys_cherry_picking_home/.local/share/taler/crypto-rsa/

4
src/testing/test-taler-exchange-aggregator-postgres.conf
View File

@ -2,11 +2,11 @@
# Persistent data storage for the testcase # Persistent data storage for the testcase
TALER_TEST_HOME = test_taler_exchange_httpd_home/ TALER_TEST_HOME = test_taler_exchange_httpd_home/
[taler-helper-crypto-rsa] [taler-exchange-secmod-rsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
[taler-helper-crypto-eddsa] [taler-exchange-secmod-eddsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
# Reduce from 12 weeks to ensure we have multiple # Reduce from 12 weeks to ensure we have multiple

4
src/testing/test-taler-exchange-wirewatch-postgres.conf
View File

@ -2,11 +2,11 @@
# Persistent data storage for the testcase # Persistent data storage for the testcase
TALER_TEST_HOME = test_taler_exchange_httpd_home/ TALER_TEST_HOME = test_taler_exchange_httpd_home/
[taler-helper-crypto-rsa] [taler-exchange-secmod-rsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
[taler-helper-crypto-eddsa] [taler-exchange-secmod-eddsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
# Reduce from 12 weeks to ensure we have multiple # Reduce from 12 weeks to ensure we have multiple

4
src/testing/test_auditor_api.conf
View File

@ -5,11 +5,11 @@
# Persistent data storage for the testcase # Persistent data storage for the testcase
TALER_TEST_HOME = test_exchange_api_home/ TALER_TEST_HOME = test_exchange_api_home/
[taler-helper-crypto-rsa] [taler-exchange-secmod-rsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
[taler-helper-crypto-eddsa] [taler-exchange-secmod-eddsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
# Reduce from 12 weeks to ensure we have multiple # Reduce from 12 weeks to ensure we have multiple

4
src/testing/test_exchange_api.conf
View File

@ -5,11 +5,11 @@
# Persistent data storage for the testcase # Persistent data storage for the testcase
TALER_TEST_HOME = test_exchange_api_home/ TALER_TEST_HOME = test_exchange_api_home/
[taler-helper-crypto-rsa] [taler-exchange-secmod-rsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
[taler-helper-crypto-eddsa] [taler-exchange-secmod-eddsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
# Reduce from 12 weeks to ensure we have multiple # Reduce from 12 weeks to ensure we have multiple

8
src/testing/test_exchange_api_keys_cherry_picking.conf
View File

@ -17,11 +17,11 @@ TALER_CACHE_HOME = $TALER_HOME/.cache/taler/
# Currency supported by the exchange (can only be one) # Currency supported by the exchange (can only be one)
CURRENCY = EUR CURRENCY = EUR
[taler-helper-crypto-rsa] [taler-exchange-secmod-rsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
[taler-helper-crypto-eddsa] [taler-exchange-secmod-eddsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
# Reduce from 12 weeks to ensure we have multiple # Reduce from 12 weeks to ensure we have multiple
@ -72,11 +72,11 @@ ENABLE_CREDIT = YES
[bank] [bank]
HTTP_PORT=8082 HTTP_PORT=8082
[taler-helper-crypto-rsa] [taler-exchange-secmod-rsa]
OVERLAP_DURATION = 1 s OVERLAP_DURATION = 1 s
LOOKAHEAD_SIGN = 20 s LOOKAHEAD_SIGN = 20 s
[taler-helper-crypto-eddsa] [taler-exchange-secmod-eddsa]
OVERLAP_DURATION = 1 s OVERLAP_DURATION = 1 s
DURATION = 30 s DURATION = 30 s
LOOKAHEAD_SIGN = 20 s LOOKAHEAD_SIGN = 20 s

4
src/testing/test_exchange_api_twisted.conf
View File

@ -3,11 +3,11 @@
# Persistent data storage for the testcase # Persistent data storage for the testcase
TALER_TEST_HOME = test_exchange_api_home/ TALER_TEST_HOME = test_exchange_api_home/
[taler-helper-crypto-rsa] [taler-exchange-secmod-rsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
[taler-helper-crypto-eddsa] [taler-exchange-secmod-eddsa]
# Reduce from 1 year to speed up test # Reduce from 1 year to speed up test
LOOKAHEAD_SIGN = 24 days LOOKAHEAD_SIGN = 24 days
# Reduce from 12 weeks to ensure we have multiple # Reduce from 12 weeks to ensure we have multiple

8
src/testing/testing_api_helpers_exchange.c
View File

@ -599,11 +599,11 @@ start_helpers (const char *config_filename,
GNUNET_asprintf (&fn, GNUNET_asprintf (&fn,
"%s/%s", "%s/%s",
dir, dir,
"taler-helper-crypto-eddsa"); "taler-exchange-secmod-eddsa");
helpers[0] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, helpers[0] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL, NULL, NULL, NULL,
fn, fn,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"-c", config_filename, "-c", config_filename,
"-L", "INFO", "-L", "INFO",
NULL); NULL);
@ -615,11 +615,11 @@ start_helpers (const char *config_filename,
GNUNET_asprintf (&fn, GNUNET_asprintf (&fn,
"%s/%s", "%s/%s",
dir, dir,
"taler-helper-crypto-rsa"); "taler-exchange-secmod-rsa");
helpers[1] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL, helpers[1] = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL, NULL, NULL, NULL,
fn, fn,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"-c", config_filename, "-c", config_filename,
"-L", "INFO", "-L", "INFO",
NULL); NULL);

4
src/util/.gitignore vendored
View File

@ -1,7 +1,7 @@
taler-config taler-config
test_payto test_payto
taler-helper-crypto-rsa taler-exchange-secmod-rsa
taler-helper-crypto-eddsa taler-exchange-secmod-eddsa
test_helper_rsa test_helper_rsa
test_helper_eddsa test_helper_eddsa
test_helper_eddsa_home/ test_helper_eddsa_home/

20
src/util/Makefile.am
View File

@ -11,8 +11,8 @@ pkgcfgdir = $(prefix)/share/taler/config.d/
pkgcfg_DATA = \ pkgcfg_DATA = \
paths.conf \ paths.conf \
taler-helper-crypto-eddsa.conf \ taler-exchange-secmod-eddsa.conf \
taler-helper-crypto-rsa.conf taler-exchange-secmod-rsa.conf
EXTRA_DIST = \ EXTRA_DIST = \
$(pkgcfg_DATA) \ $(pkgcfg_DATA) \
@ -21,8 +21,8 @@ EXTRA_DIST = \
test_helper_rsa.conf test_helper_rsa.conf
bin_PROGRAMS = \ bin_PROGRAMS = \
taler-helper-crypto-eddsa \ taler-exchange-secmod-eddsa \
taler-helper-crypto-rsa taler-exchange-secmod-rsa
bin_SCRIPTS = \ bin_SCRIPTS = \
taler-config taler-config
@ -38,18 +38,18 @@ taler-config: taler-config.in
CLEANFILES = \ CLEANFILES = \
taler-config taler-config
taler_helper_crypto_rsa_SOURCES = \ taler_exchange_secmod_rsa_SOURCES = \
taler-helper-crypto-rsa.c taler-helper-crypto-rsa.h taler-exchange-secmod-rsa.c taler-exchange-secmod-rsa.h
taler_helper_crypto_rsa_LDADD = \ taler_exchange_secmod_rsa_LDADD = \
libtalerutil.la \ libtalerutil.la \
-lgnunetutil \ -lgnunetutil \
-lpthread \ -lpthread \
$(LIBGCRYPT_LIBS) \ $(LIBGCRYPT_LIBS) \
$(XLIB) $(XLIB)
taler_helper_crypto_eddsa_SOURCES = \ taler_exchange_secmod_eddsa_SOURCES = \
taler-helper-crypto-eddsa.c taler-helper-crypto-eddsa.h taler-exchange-secmod-eddsa.c taler-exchange-secmod-eddsa.h
taler_helper_crypto_eddsa_LDADD = \ taler_exchange_secmod_eddsa_LDADD = \
libtalerutil.la \ libtalerutil.la \
-lgnunetutil \ -lgnunetutil \
-lpthread \ -lpthread \

8
src/util/crypto_helper_denom.c
View File

@ -21,7 +21,7 @@
#include "platform.h" #include "platform.h"
#include "taler_util.h" #include "taler_util.h"
#include "taler_signatures.h" #include "taler_signatures.h"
#include "taler-helper-crypto-rsa.h" #include "taler-exchange-secmod-rsa.h"
#include <poll.h> #include <poll.h>
@ -193,12 +193,12 @@ TALER_CRYPTO_helper_denom_connect (
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg, GNUNET_CONFIGURATION_get_value_filename (cfg,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"UNIXPATH", "UNIXPATH",
&unixpath)) &unixpath))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"UNIXPATH"); "UNIXPATH");
return NULL; return NULL;
} }
@ -207,7 +207,7 @@ TALER_CRYPTO_helper_denom_connect (
if (strlen (unixpath) >= sizeof (dh->sa.sun_path)) if (strlen (unixpath) >= sizeof (dh->sa.sun_path))
{ {
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"UNIXPATH", "UNIXPATH",
"path too long"); "path too long");
GNUNET_free (unixpath); GNUNET_free (unixpath);

8
src/util/crypto_helper_esign.c
View File

@ -21,7 +21,7 @@
#include "platform.h" #include "platform.h"
#include "taler_util.h" #include "taler_util.h"
#include "taler_signatures.h" #include "taler_signatures.h"
#include "taler-helper-crypto-eddsa.h" #include "taler-exchange-secmod-eddsa.h"
#include <poll.h> #include <poll.h>
@ -194,12 +194,12 @@ TALER_CRYPTO_helper_esign_connect (
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg, GNUNET_CONFIGURATION_get_value_filename (cfg,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"UNIXPATH", "UNIXPATH",
&unixpath)) &unixpath))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"UNIXPATH"); "UNIXPATH");
return NULL; return NULL;
} }
@ -208,7 +208,7 @@ TALER_CRYPTO_helper_esign_connect (
if (strlen (unixpath) >= sizeof (esh->sa.sun_path)) if (strlen (unixpath) >= sizeof (esh->sa.sun_path))
{ {
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"UNIXPATH", "UNIXPATH",
"path too long"); "path too long");
GNUNET_free (unixpath); GNUNET_free (unixpath);

32
src/util/taler-helper-crypto-eddsa.c → src/util/taler-exchange-secmod-eddsa.c
View File

@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/ */
/** /**
* @file util/taler-helper-crypto-eddsa.c * @file util/taler-exchange-secmod-eddsa.c
* @brief Standalone process to perform private key EDDSA operations * @brief Standalone process to perform private key EDDSA operations
* @author Christian Grothoff * @author Christian Grothoff
* *
@ -34,7 +34,7 @@
*/ */
#include "platform.h" #include "platform.h"
#include "taler_util.h" #include "taler_util.h"
#include "taler-helper-crypto-eddsa.h" #include "taler-exchange-secmod-eddsa.h"
#include <gcrypt.h> #include <gcrypt.h>
#include <pthread.h> #include <pthread.h>
#include <sys/eventfd.h> #include <sys/eventfd.h>
@ -1335,23 +1335,23 @@ load_durations (void)
{ {
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg, GNUNET_CONFIGURATION_get_value_time (kcfg,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"OVERLAP_DURATION", "OVERLAP_DURATION",
&overlap_duration)) &overlap_duration))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"OVERLAP_DURATION"); "OVERLAP_DURATION");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg, GNUNET_CONFIGURATION_get_value_time (kcfg,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"DURATION", "DURATION",
&duration)) &duration))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"DURATION"); "DURATION");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
@ -1359,12 +1359,12 @@ load_durations (void)
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg, GNUNET_CONFIGURATION_get_value_time (kcfg,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"LOOKAHEAD_SIGN", "LOOKAHEAD_SIGN",
&lookahead_sign)) &lookahead_sign))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"LOOKAHEAD_SIGN"); "LOOKAHEAD_SIGN");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
@ -1462,12 +1462,12 @@ run (void *cls,
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg, GNUNET_CONFIGURATION_get_value_filename (kcfg,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"SM_PRIV_KEY", "SM_PRIV_KEY",
&pfn)) &pfn))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"SM_PRIV_KEY"); "SM_PRIV_KEY");
global_ret = 1; global_ret = 1;
return; return;
@ -1478,7 +1478,7 @@ run (void *cls,
&smpriv.eddsa_priv)) &smpriv.eddsa_priv))
{ {
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"SM_PRIV_KEY", "SM_PRIV_KEY",
"Could not use file to persist private key"); "Could not use file to persist private key");
GNUNET_free (pfn); GNUNET_free (pfn);
@ -1498,12 +1498,12 @@ run (void *cls,
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg, GNUNET_CONFIGURATION_get_value_filename (kcfg,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"KEY_DIR", "KEY_DIR",
&keydir)) &keydir))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"KEY_DIR"); "KEY_DIR");
global_ret = 1; global_ret = 1;
return; return;
@ -1528,12 +1528,12 @@ run (void *cls,
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg, GNUNET_CONFIGURATION_get_value_filename (kcfg,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"UNIXPATH", "UNIXPATH",
&unixpath)) &unixpath))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"UNIXPATH"); "UNIXPATH");
global_ret = 3; global_ret = 3;
return; return;
@ -1665,7 +1665,7 @@ main (int argc,
GNUNET_OS_init (TALER_project_data_default ()); GNUNET_OS_init (TALER_project_data_default ());
now = now_tmp = GNUNET_TIME_absolute_get (); now = now_tmp = GNUNET_TIME_absolute_get ();
ret = GNUNET_PROGRAM_run (argc, argv, ret = GNUNET_PROGRAM_run (argc, argv,
"taler-helper-crypto-eddsa", "taler-exchange-secmod-eddsa",
"Handle private EDDSA key operations for a Taler exchange", "Handle private EDDSA key operations for a Taler exchange",
options, options,
&run, &run,

6
src/util/taler-helper-crypto-eddsa.conf → src/util/taler-exchange-secmod-eddsa.conf
View File

@ -1,4 +1,4 @@
[taler-helper-crypto-eddsa] [taler-exchange-secmod-eddsa]
# How long should generated coins overlap in their validity # How long should generated coins overlap in their validity
# periods. Should be long enough to avoid problems with # periods. Should be long enough to avoid problems with
@ -11,10 +11,10 @@ OVERLAP_DURATION = 5m
KEY_DIR = ${TALER_DATA_HOME}/crypto-eddsa/ KEY_DIR = ${TALER_DATA_HOME}/crypto-eddsa/
# Where does the helper listen for requests? # Where does the helper listen for requests?
UNIXPATH = $TALER_RUNTIME_DIR/taler-helper-crypto-eddsa.sock UNIXPATH = $TALER_RUNTIME_DIR/taler-exchange-secmod-eddsa.sock
# Where should the security module store it's private key? # Where should the security module store it's private key?
SM_PRIV_KEY = ${TALER_DATA_HOME}/taler-helper-crypto-eddsa/.private-key SM_PRIV_KEY = ${TALER_DATA_HOME}/taler-exchange-secmod-eddsa/.private-key
# For how long into the future do we pre-generate keys? # For how long into the future do we pre-generate keys?
LOOKAHEAD_SIGN = 1 year LOOKAHEAD_SIGN = 1 year

6
src/util/taler-helper-crypto-eddsa.h → src/util/taler-exchange-secmod-eddsa.h
View File

@ -14,12 +14,12 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/ */
/** /**
* @file util/taler-helper-crypto-eddsa.h * @file util/taler-exchange-secmod-eddsa.h
* @brief IPC messages for the EDDSA crypto helper. * @brief IPC messages for the EDDSA crypto helper.
* @author Christian Grothoff * @author Christian Grothoff
*/ */
#ifndef TALER_HELPER_CRYPTO_EDDSA_H #ifndef TALER_EXCHANGE_SECMOD_EDDSA_H
#define TALER_HELPER_CRYPTO_EDDSA_H #define TALER_EXCHANGE_SECMOD_EDDSA_H
#define TALER_HELPER_EDDSA_MT_PURGE 11 #define TALER_HELPER_EDDSA_MT_PURGE 11
#define TALER_HELPER_EDDSA_MT_AVAIL 12 #define TALER_HELPER_EDDSA_MT_AVAIL 12

30
src/util/taler-helper-crypto-rsa.c → src/util/taler-exchange-secmod-rsa.c
View File

@ -14,7 +14,7 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/ */
/** /**
* @file util/taler-helper-crypto-rsa.c * @file util/taler-exchange-secmod-rsa.c
* @brief Standalone process to perform private key RSA operations * @brief Standalone process to perform private key RSA operations
* @author Christian Grothoff * @author Christian Grothoff
* *
@ -34,7 +34,7 @@
*/ */
#include "platform.h" #include "platform.h"
#include "taler_util.h" #include "taler_util.h"
#include "taler-helper-crypto-rsa.h" #include "taler-exchange-secmod-rsa.h"
#include <gcrypt.h> #include <gcrypt.h>
#include <pthread.h> #include <pthread.h>
#include <sys/eventfd.h> #include <sys/eventfd.h>
@ -1612,7 +1612,7 @@ parse_denomination_cfg (const char *ct,
denom->duration_withdraw.rel_value_us) denom->duration_withdraw.rel_value_us)
{ {
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"OVERLAP_DURATION", "OVERLAP_DURATION",
"Value given must be smaller than value for DURATION_WITHDRAW!"); "Value given must be smaller than value for DURATION_WITHDRAW!");
return GNUNET_SYSERR; return GNUNET_SYSERR;
@ -1722,12 +1722,12 @@ load_durations (void)
{ {
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg, GNUNET_CONFIGURATION_get_value_time (kcfg,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"OVERLAP_DURATION", "OVERLAP_DURATION",
&overlap_duration)) &overlap_duration))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"OVERLAP_DURATION"); "OVERLAP_DURATION");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
@ -1735,12 +1735,12 @@ load_durations (void)
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg, GNUNET_CONFIGURATION_get_value_time (kcfg,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"LOOKAHEAD_SIGN", "LOOKAHEAD_SIGN",
&lookahead_sign)) &lookahead_sign))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"LOOKAHEAD_SIGN"); "LOOKAHEAD_SIGN");
return GNUNET_SYSERR; return GNUNET_SYSERR;
} }
@ -1838,12 +1838,12 @@ run (void *cls,
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg, GNUNET_CONFIGURATION_get_value_filename (kcfg,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"SM_PRIV_KEY", "SM_PRIV_KEY",
&pfn)) &pfn))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"SM_PRIV_KEY"); "SM_PRIV_KEY");
global_ret = 1; global_ret = 1;
return; return;
@ -1854,7 +1854,7 @@ run (void *cls,
&smpriv.eddsa_priv)) &smpriv.eddsa_priv))
{ {
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"SM_PRIV_KEY", "SM_PRIV_KEY",
"Could not use file to persist private key"); "Could not use file to persist private key");
GNUNET_free (pfn); GNUNET_free (pfn);
@ -1874,12 +1874,12 @@ run (void *cls,
} }
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg, GNUNET_CONFIGURATION_get_value_filename (kcfg,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"KEY_DIR", "KEY_DIR",
&keydir)) &keydir))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"KEY_DIR"); "KEY_DIR");
global_ret = 1; global_ret = 1;
return; return;
@ -1904,12 +1904,12 @@ run (void *cls,
if (GNUNET_OK != if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg, GNUNET_CONFIGURATION_get_value_filename (kcfg,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"UNIXPATH", "UNIXPATH",
&unixpath)) &unixpath))
{ {
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR, GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"UNIXPATH"); "UNIXPATH");
global_ret = 3; global_ret = 3;
return; return;
@ -2064,7 +2064,7 @@ main (int argc,
GNUNET_OS_init (TALER_project_data_default ()); GNUNET_OS_init (TALER_project_data_default ());
now = now_tmp = GNUNET_TIME_absolute_get (); now = now_tmp = GNUNET_TIME_absolute_get ();
ret = GNUNET_PROGRAM_run (argc, argv, ret = GNUNET_PROGRAM_run (argc, argv,
"taler-helper-crypto-rsa", "taler-exchange-secmod-rsa",
"Handle private RSA key operations for a Taler exchange", "Handle private RSA key operations for a Taler exchange",
options, options,
&run, &run,

6
src/util/taler-helper-crypto-rsa.conf → src/util/taler-exchange-secmod-rsa.conf
View File

@ -1,4 +1,4 @@
[taler-helper-crypto-rsa] [taler-exchange-secmod-rsa]
# How long should generated coins overlap in their validity # How long should generated coins overlap in their validity
# periods. Should be long enough to avoid problems with # periods. Should be long enough to avoid problems with
@ -11,10 +11,10 @@ OVERLAP_DURATION = 5 m
KEY_DIR = ${TALER_DATA_HOME}/crypto-rsa/ KEY_DIR = ${TALER_DATA_HOME}/crypto-rsa/
# Where does the helper listen for requests? # Where does the helper listen for requests?
UNIXPATH = $TALER_RUNTIME_DIR/taler-helper-crypto-rsa.sock UNIXPATH = $TALER_RUNTIME_DIR/taler-exchange-secmod-rsa.sock
# Where should the security module store it's private key? # Where should the security module store it's private key?
SM_PRIV_KEY = ${TALER_DATA_HOME}/taler-helper-crypto-rsa/.private-key SM_PRIV_KEY = ${TALER_DATA_HOME}/taler-exchange-secmod-rsa/.private-key
# For how long into the future do we pre-generate keys? # For how long into the future do we pre-generate keys?
LOOKAHEAD_SIGN = 1 year LOOKAHEAD_SIGN = 1 year

6
src/util/taler-helper-crypto-rsa.h → src/util/taler-exchange-secmod-rsa.h
View File

@ -14,12 +14,12 @@
TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/> TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
*/ */
/** /**
* @file util/taler-helper-crypto-rsa.h * @file util/taler-exchange-secmod-rsa.h
* @brief IPC messages for the RSA crypto helper. * @brief IPC messages for the RSA crypto helper.
* @author Christian Grothoff * @author Christian Grothoff
*/ */
#ifndef TALER_HELPER_CRYPTO_RSA_H #ifndef TALER_EXCHANGE_SECMOD_RSA_H
#define TALER_HELPER_CRYPTO_RSA_H #define TALER_EXCHANGE_SECMOD_RSA_H
#define TALER_HELPER_RSA_MT_PURGE 1 #define TALER_HELPER_RSA_MT_PURGE 1
#define TALER_HELPER_RSA_MT_AVAIL 2 #define TALER_HELPER_RSA_MT_AVAIL 2

2
src/util/test_helper_eddsa.c
View File

@ -395,7 +395,7 @@ main (int argc,
GNUNET_asprintf (&binary_name, GNUNET_asprintf (&binary_name,
"%s/%s", "%s/%s",
libexec_dir, libexec_dir,
"taler-helper-crypto-eddsa"); "taler-exchange-secmod-eddsa");
GNUNET_free (libexec_dir); GNUNET_free (libexec_dir);
helper = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR, helper = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR,
NULL, NULL, NULL, NULL, NULL, NULL,

2
src/util/test_helper_eddsa.conf
View File

@ -3,7 +3,7 @@
TALER_TEST_HOME = test_helper_eddsa_home/ TALER_TEST_HOME = test_helper_eddsa_home/
TALER_RUNTIME_DIR = /tmp/${USER}/test_helper_eddsa/ TALER_RUNTIME_DIR = /tmp/${USER}/test_helper_eddsa/
[taler-helper-crypto-eddsa] [taler-exchange-secmod-eddsa]
LOOKAHEAD_SIGN = 5 minutes LOOKAHEAD_SIGN = 5 minutes
OVERLAP_DURATION = 1 s OVERLAP_DURATION = 1 s
DURATION = 1 minute DURATION = 1 minute

2
src/util/test_helper_rsa.c
View File

@ -541,7 +541,7 @@ main (int argc,
GNUNET_asprintf (&binary_name, GNUNET_asprintf (&binary_name,
"%s/%s", "%s/%s",
libexec_dir, libexec_dir,
"taler-helper-crypto-rsa"); "taler-exchange-secmod-rsa");
GNUNET_free (libexec_dir); GNUNET_free (libexec_dir);
helper = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR, helper = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR,
NULL, NULL, NULL, NULL, NULL, NULL,

2
src/util/test_helper_rsa.conf
View File

@ -8,7 +8,7 @@ TALER_RUNTIME_DIR = /tmp/${USER}/test_helper_rsa/
DURATION_WITHDRAW = 1 minute DURATION_WITHDRAW = 1 minute
RSA_KEYSIZE = 2048 RSA_KEYSIZE = 2048
[taler-helper-crypto-rsa] [taler-exchange-secmod-rsa]
LOOKAHEAD_SIGN = 5 minutes LOOKAHEAD_SIGN = 5 minutes
OVERLAP_DURATION = 1 s OVERLAP_DURATION = 1 s
KEY_DIR = ${TALER_RUNTIME_DIR}/keydir/ KEY_DIR = ${TALER_RUNTIME_DIR}/keydir/