summaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-01-17 20:07:55 +0100
committerFlorian Dold <florian@dold.me>2021-01-17 20:07:55 +0100
commitb23f9b78a4220fda5ee8e1c4fc1bbae83dedeb39 (patch)
treed900710097f485150c55104e1f26304eac0ac55e /src/util
parented9c37ef4fb49949b06fccac72e498b67c4c61ce (diff)
downloadexchange-b23f9b78a4220fda5ee8e1c4fc1bbae83dedeb39.tar.gz
exchange-b23f9b78a4220fda5ee8e1c4fc1bbae83dedeb39.tar.bz2
exchange-b23f9b78a4220fda5ee8e1c4fc1bbae83dedeb39.zip
rename taler-helper-crypto-* to taler-exchange-secmod-*
Diffstat (limited to 'src/util')
-rw-r--r--src/util/.gitignore4
-rw-r--r--src/util/Makefile.am20
-rw-r--r--src/util/crypto_helper_denom.c8
-rw-r--r--src/util/crypto_helper_esign.c8
-rw-r--r--src/util/taler-exchange-secmod-eddsa.c (renamed from src/util/taler-helper-crypto-eddsa.c)32
-rw-r--r--src/util/taler-exchange-secmod-eddsa.conf (renamed from src/util/taler-helper-crypto-eddsa.conf)6
-rw-r--r--src/util/taler-exchange-secmod-eddsa.h (renamed from src/util/taler-helper-crypto-eddsa.h)6
-rw-r--r--src/util/taler-exchange-secmod-rsa.c (renamed from src/util/taler-helper-crypto-rsa.c)30
-rw-r--r--src/util/taler-exchange-secmod-rsa.conf (renamed from src/util/taler-helper-crypto-rsa.conf)6
-rw-r--r--src/util/taler-exchange-secmod-rsa.h (renamed from src/util/taler-helper-crypto-rsa.h)6
-rw-r--r--src/util/test_helper_eddsa.c2
-rw-r--r--src/util/test_helper_eddsa.conf2
-rw-r--r--src/util/test_helper_rsa.c2
-rw-r--r--src/util/test_helper_rsa.conf2
14 files changed, 67 insertions, 67 deletions
diff --git a/src/util/.gitignore b/src/util/.gitignore
index a576b82fb..4246c180d 100644
--- a/src/util/.gitignore
+++ b/src/util/.gitignore
@@ -1,7 +1,7 @@
taler-config
test_payto
-taler-helper-crypto-rsa
-taler-helper-crypto-eddsa
+taler-exchange-secmod-rsa
+taler-exchange-secmod-eddsa
test_helper_rsa
test_helper_eddsa
test_helper_eddsa_home/
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index c4df708b1..d9660c710 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -11,8 +11,8 @@ pkgcfgdir = $(prefix)/share/taler/config.d/
pkgcfg_DATA = \
paths.conf \
- taler-helper-crypto-eddsa.conf \
- taler-helper-crypto-rsa.conf
+ taler-exchange-secmod-eddsa.conf \
+ taler-exchange-secmod-rsa.conf
EXTRA_DIST = \
$(pkgcfg_DATA) \
@@ -21,8 +21,8 @@ EXTRA_DIST = \
test_helper_rsa.conf
bin_PROGRAMS = \
- taler-helper-crypto-eddsa \
- taler-helper-crypto-rsa
+ taler-exchange-secmod-eddsa \
+ taler-exchange-secmod-rsa
bin_SCRIPTS = \
taler-config
@@ -38,18 +38,18 @@ taler-config: taler-config.in
CLEANFILES = \
taler-config
-taler_helper_crypto_rsa_SOURCES = \
- taler-helper-crypto-rsa.c taler-helper-crypto-rsa.h
-taler_helper_crypto_rsa_LDADD = \
+taler_exchange_secmod_rsa_SOURCES = \
+ taler-exchange-secmod-rsa.c taler-exchange-secmod-rsa.h
+taler_exchange_secmod_rsa_LDADD = \
libtalerutil.la \
-lgnunetutil \
-lpthread \
$(LIBGCRYPT_LIBS) \
$(XLIB)
-taler_helper_crypto_eddsa_SOURCES = \
- taler-helper-crypto-eddsa.c taler-helper-crypto-eddsa.h
-taler_helper_crypto_eddsa_LDADD = \
+taler_exchange_secmod_eddsa_SOURCES = \
+ taler-exchange-secmod-eddsa.c taler-exchange-secmod-eddsa.h
+taler_exchange_secmod_eddsa_LDADD = \
libtalerutil.la \
-lgnunetutil \
-lpthread \
diff --git a/src/util/crypto_helper_denom.c b/src/util/crypto_helper_denom.c
index 88eecec20..0545863d1 100644
--- a/src/util/crypto_helper_denom.c
+++ b/src/util/crypto_helper_denom.c
@@ -21,7 +21,7 @@
#include "platform.h"
#include "taler_util.h"
#include "taler_signatures.h"
-#include "taler-helper-crypto-rsa.h"
+#include "taler-exchange-secmod-rsa.h"
#include <poll.h>
@@ -193,12 +193,12 @@ TALER_CRYPTO_helper_denom_connect (
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"UNIXPATH",
&unixpath))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"UNIXPATH");
return NULL;
}
@@ -207,7 +207,7 @@ TALER_CRYPTO_helper_denom_connect (
if (strlen (unixpath) >= sizeof (dh->sa.sun_path))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"UNIXPATH",
"path too long");
GNUNET_free (unixpath);
diff --git a/src/util/crypto_helper_esign.c b/src/util/crypto_helper_esign.c
index 8308934bc..4d8daf886 100644
--- a/src/util/crypto_helper_esign.c
+++ b/src/util/crypto_helper_esign.c
@@ -21,7 +21,7 @@
#include "platform.h"
#include "taler_util.h"
#include "taler_signatures.h"
-#include "taler-helper-crypto-eddsa.h"
+#include "taler-exchange-secmod-eddsa.h"
#include <poll.h>
@@ -194,12 +194,12 @@ TALER_CRYPTO_helper_esign_connect (
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (cfg,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"UNIXPATH",
&unixpath))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"UNIXPATH");
return NULL;
}
@@ -208,7 +208,7 @@ TALER_CRYPTO_helper_esign_connect (
if (strlen (unixpath) >= sizeof (esh->sa.sun_path))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"UNIXPATH",
"path too long");
GNUNET_free (unixpath);
diff --git a/src/util/taler-helper-crypto-eddsa.c b/src/util/taler-exchange-secmod-eddsa.c
index 7839ac841..609a5361f 100644
--- a/src/util/taler-helper-crypto-eddsa.c
+++ b/src/util/taler-exchange-secmod-eddsa.c
@@ -14,7 +14,7 @@
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
* @author Christian Grothoff
*
@@ -34,7 +34,7 @@
*/
#include "platform.h"
#include "taler_util.h"
-#include "taler-helper-crypto-eddsa.h"
+#include "taler-exchange-secmod-eddsa.h"
#include <gcrypt.h>
#include <pthread.h>
#include <sys/eventfd.h>
@@ -1335,23 +1335,23 @@ load_durations (void)
{
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"OVERLAP_DURATION",
&overlap_duration))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"OVERLAP_DURATION");
return GNUNET_SYSERR;
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"DURATION",
&duration))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"DURATION");
return GNUNET_SYSERR;
}
@@ -1359,12 +1359,12 @@ load_durations (void)
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"LOOKAHEAD_SIGN",
&lookahead_sign))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"LOOKAHEAD_SIGN");
return GNUNET_SYSERR;
}
@@ -1462,12 +1462,12 @@ run (void *cls,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"SM_PRIV_KEY",
&pfn))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"SM_PRIV_KEY");
global_ret = 1;
return;
@@ -1478,7 +1478,7 @@ run (void *cls,
&smpriv.eddsa_priv))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"SM_PRIV_KEY",
"Could not use file to persist private key");
GNUNET_free (pfn);
@@ -1498,12 +1498,12 @@ run (void *cls,
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"KEY_DIR",
&keydir))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"KEY_DIR");
global_ret = 1;
return;
@@ -1528,12 +1528,12 @@ run (void *cls,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"UNIXPATH",
&unixpath))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"UNIXPATH");
global_ret = 3;
return;
@@ -1665,7 +1665,7 @@ main (int argc,
GNUNET_OS_init (TALER_project_data_default ());
now = now_tmp = GNUNET_TIME_absolute_get ();
ret = GNUNET_PROGRAM_run (argc, argv,
- "taler-helper-crypto-eddsa",
+ "taler-exchange-secmod-eddsa",
"Handle private EDDSA key operations for a Taler exchange",
options,
&run,
diff --git a/src/util/taler-helper-crypto-eddsa.conf b/src/util/taler-exchange-secmod-eddsa.conf
index b3d272c39..8a171353d 100644
--- a/src/util/taler-helper-crypto-eddsa.conf
+++ b/src/util/taler-exchange-secmod-eddsa.conf
@@ -1,4 +1,4 @@
-[taler-helper-crypto-eddsa]
+[taler-exchange-secmod-eddsa]
# How long should generated coins overlap in their validity
# periods. Should be long enough to avoid problems with
@@ -11,10 +11,10 @@ OVERLAP_DURATION = 5m
KEY_DIR = ${TALER_DATA_HOME}/crypto-eddsa/
# 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?
-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?
LOOKAHEAD_SIGN = 1 year
diff --git a/src/util/taler-helper-crypto-eddsa.h b/src/util/taler-exchange-secmod-eddsa.h
index 5d632301f..39054c414 100644
--- a/src/util/taler-helper-crypto-eddsa.h
+++ b/src/util/taler-exchange-secmod-eddsa.h
@@ -14,12 +14,12 @@
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.
* @author Christian Grothoff
*/
-#ifndef TALER_HELPER_CRYPTO_EDDSA_H
-#define TALER_HELPER_CRYPTO_EDDSA_H
+#ifndef TALER_EXCHANGE_SECMOD_EDDSA_H
+#define TALER_EXCHANGE_SECMOD_EDDSA_H
#define TALER_HELPER_EDDSA_MT_PURGE 11
#define TALER_HELPER_EDDSA_MT_AVAIL 12
diff --git a/src/util/taler-helper-crypto-rsa.c b/src/util/taler-exchange-secmod-rsa.c
index dc7100dca..10a52af00 100644
--- a/src/util/taler-helper-crypto-rsa.c
+++ b/src/util/taler-exchange-secmod-rsa.c
@@ -14,7 +14,7 @@
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
* @author Christian Grothoff
*
@@ -34,7 +34,7 @@
*/
#include "platform.h"
#include "taler_util.h"
-#include "taler-helper-crypto-rsa.h"
+#include "taler-exchange-secmod-rsa.h"
#include <gcrypt.h>
#include <pthread.h>
#include <sys/eventfd.h>
@@ -1612,7 +1612,7 @@ parse_denomination_cfg (const char *ct,
denom->duration_withdraw.rel_value_us)
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"OVERLAP_DURATION",
"Value given must be smaller than value for DURATION_WITHDRAW!");
return GNUNET_SYSERR;
@@ -1722,12 +1722,12 @@ load_durations (void)
{
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"OVERLAP_DURATION",
&overlap_duration))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"OVERLAP_DURATION");
return GNUNET_SYSERR;
}
@@ -1735,12 +1735,12 @@ load_durations (void)
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_time (kcfg,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"LOOKAHEAD_SIGN",
&lookahead_sign))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"LOOKAHEAD_SIGN");
return GNUNET_SYSERR;
}
@@ -1838,12 +1838,12 @@ run (void *cls,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"SM_PRIV_KEY",
&pfn))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"SM_PRIV_KEY");
global_ret = 1;
return;
@@ -1854,7 +1854,7 @@ run (void *cls,
&smpriv.eddsa_priv))
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"SM_PRIV_KEY",
"Could not use file to persist private key");
GNUNET_free (pfn);
@@ -1874,12 +1874,12 @@ run (void *cls,
}
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"KEY_DIR",
&keydir))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"KEY_DIR");
global_ret = 1;
return;
@@ -1904,12 +1904,12 @@ run (void *cls,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_filename (kcfg,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"UNIXPATH",
&unixpath))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"UNIXPATH");
global_ret = 3;
return;
@@ -2064,7 +2064,7 @@ main (int argc,
GNUNET_OS_init (TALER_project_data_default ());
now = now_tmp = GNUNET_TIME_absolute_get ();
ret = GNUNET_PROGRAM_run (argc, argv,
- "taler-helper-crypto-rsa",
+ "taler-exchange-secmod-rsa",
"Handle private RSA key operations for a Taler exchange",
options,
&run,
diff --git a/src/util/taler-helper-crypto-rsa.conf b/src/util/taler-exchange-secmod-rsa.conf
index 231e04fb0..f9a6c7d1f 100644
--- a/src/util/taler-helper-crypto-rsa.conf
+++ b/src/util/taler-exchange-secmod-rsa.conf
@@ -1,4 +1,4 @@
-[taler-helper-crypto-rsa]
+[taler-exchange-secmod-rsa]
# How long should generated coins overlap in their validity
# periods. Should be long enough to avoid problems with
@@ -11,10 +11,10 @@ OVERLAP_DURATION = 5 m
KEY_DIR = ${TALER_DATA_HOME}/crypto-rsa/
# 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?
-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?
LOOKAHEAD_SIGN = 1 year \ No newline at end of file
diff --git a/src/util/taler-helper-crypto-rsa.h b/src/util/taler-exchange-secmod-rsa.h
index 00087a735..146b6948f 100644
--- a/src/util/taler-helper-crypto-rsa.h
+++ b/src/util/taler-exchange-secmod-rsa.h
@@ -14,12 +14,12 @@
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.
* @author Christian Grothoff
*/
-#ifndef TALER_HELPER_CRYPTO_RSA_H
-#define TALER_HELPER_CRYPTO_RSA_H
+#ifndef TALER_EXCHANGE_SECMOD_RSA_H
+#define TALER_EXCHANGE_SECMOD_RSA_H
#define TALER_HELPER_RSA_MT_PURGE 1
#define TALER_HELPER_RSA_MT_AVAIL 2
diff --git a/src/util/test_helper_eddsa.c b/src/util/test_helper_eddsa.c
index 126965714..d20f2d837 100644
--- a/src/util/test_helper_eddsa.c
+++ b/src/util/test_helper_eddsa.c
@@ -395,7 +395,7 @@ main (int argc,
GNUNET_asprintf (&binary_name,
"%s/%s",
libexec_dir,
- "taler-helper-crypto-eddsa");
+ "taler-exchange-secmod-eddsa");
GNUNET_free (libexec_dir);
helper = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR,
NULL, NULL, NULL,
diff --git a/src/util/test_helper_eddsa.conf b/src/util/test_helper_eddsa.conf
index 9529ec579..35413d0bf 100644
--- a/src/util/test_helper_eddsa.conf
+++ b/src/util/test_helper_eddsa.conf
@@ -3,7 +3,7 @@
TALER_TEST_HOME = test_helper_eddsa_home/
TALER_RUNTIME_DIR = /tmp/${USER}/test_helper_eddsa/
-[taler-helper-crypto-eddsa]
+[taler-exchange-secmod-eddsa]
LOOKAHEAD_SIGN = 5 minutes
OVERLAP_DURATION = 1 s
DURATION = 1 minute
diff --git a/src/util/test_helper_rsa.c b/src/util/test_helper_rsa.c
index 8edab5ff0..17006a66d 100644
--- a/src/util/test_helper_rsa.c
+++ b/src/util/test_helper_rsa.c
@@ -541,7 +541,7 @@ main (int argc,
GNUNET_asprintf (&binary_name,
"%s/%s",
libexec_dir,
- "taler-helper-crypto-rsa");
+ "taler-exchange-secmod-rsa");
GNUNET_free (libexec_dir);
helper = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ERR,
NULL, NULL, NULL,
diff --git a/src/util/test_helper_rsa.conf b/src/util/test_helper_rsa.conf
index bba7f657d..b6974e4ba 100644
--- a/src/util/test_helper_rsa.conf
+++ b/src/util/test_helper_rsa.conf
@@ -8,7 +8,7 @@ TALER_RUNTIME_DIR = /tmp/${USER}/test_helper_rsa/
DURATION_WITHDRAW = 1 minute
RSA_KEYSIZE = 2048
-[taler-helper-crypto-rsa]
+[taler-exchange-secmod-rsa]
LOOKAHEAD_SIGN = 5 minutes
OVERLAP_DURATION = 1 s
KEY_DIR = ${TALER_RUNTIME_DIR}/keydir/