summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2021-07-30 18:37:54 +0200
committerFlorian Dold <florian@dold.me>2021-07-30 18:37:54 +0200
commitbfebdae8380456dd0392cd13b919d43d8e8f48be (patch)
treea73191eb191e7b7971cd0401fc44beef8aa8ec1e /src
parent2bdc2f61c526bdb8b7b1bc7e6df1dbd52ac3761a (diff)
downloadexchange-bfebdae8380456dd0392cd13b919d43d8e8f48be.tar.gz
exchange-bfebdae8380456dd0392cd13b919d43d8e8f48be.tar.bz2
exchange-bfebdae8380456dd0392cd13b919d43d8e8f48be.zip
fix secmod helper config, wait for client directory
Diffstat (limited to 'src')
-rw-r--r--src/util/test_helper_eddsa.c18
-rw-r--r--src/util/test_helper_eddsa.conf2
-rw-r--r--src/util/test_helper_rsa.c17
-rw-r--r--src/util/test_helper_rsa.conf2
4 files changed, 29 insertions, 10 deletions
diff --git a/src/util/test_helper_eddsa.c b/src/util/test_helper_eddsa.c
index aac85585..4b44f604 100644
--- a/src/util/test_helper_eddsa.c
+++ b/src/util/test_helper_eddsa.c
@@ -332,15 +332,27 @@ run_test (void)
GNUNET_break (0);
return 77;
}
- esh = TALER_CRYPTO_helper_esign_connect (cfg,
- &key_cb,
- NULL);
+
+ /* wait for helper to start and give us keys */
+ fprintf (stderr, "Waiting for helper client directory to become available ");
+ for (unsigned int i = 0; i<1000; i++)
+ {
+ esh = TALER_CRYPTO_helper_esign_connect (cfg,
+ &key_cb,
+ NULL);
+ if (NULL != esh)
+ break;
+ nanosleep (&req, NULL);
+ fprintf (stderr, ".");
+ }
GNUNET_CONFIGURATION_destroy (cfg);
if (NULL == esh)
{
GNUNET_break (0);
return 1;
}
+ fprintf (stderr, " done.\n");
+
/* wait for helper to start and give us keys */
fprintf (stderr, "Waiting for helper to start ");
for (unsigned int i = 0; i<1000; i++)
diff --git a/src/util/test_helper_eddsa.conf b/src/util/test_helper_eddsa.conf
index 541a8b14..321fa7cc 100644
--- a/src/util/test_helper_eddsa.conf
+++ b/src/util/test_helper_eddsa.conf
@@ -7,5 +7,3 @@ TALER_RUNTIME_DIR = ${TMPDIR:-/tmp}/${USER}/test_helper_eddsa/
LOOKAHEAD_SIGN = 5 minutes
OVERLAP_DURATION = 1 s
DURATION = 1 minute
-KEY_DIR = ${TALER_RUNTIME_DIR}keydir/
-UNIXPATH = ${TALER_RUNTIME_DIR}helper.unix
diff --git a/src/util/test_helper_rsa.c b/src/util/test_helper_rsa.c
index 96b88c34..4a9fa905 100644
--- a/src/util/test_helper_rsa.c
+++ b/src/util/test_helper_rsa.c
@@ -471,15 +471,26 @@ run_test (void)
GNUNET_break (0);
return 77;
}
- dh = TALER_CRYPTO_helper_denom_connect (cfg,
- &key_cb,
- NULL);
+
+ fprintf (stderr, "Waiting for helper client directory to become available ");
+ for (unsigned int i = 0; i<1000; i++)
+ {
+ dh = TALER_CRYPTO_helper_denom_connect (cfg,
+ &key_cb,
+ NULL);
+ if (NULL != dh)
+ break;
+ nanosleep (&req, NULL);
+ fprintf (stderr, ".");
+ }
GNUNET_CONFIGURATION_destroy (cfg);
if (NULL == dh)
{
GNUNET_break (0);
return 1;
}
+ fprintf (stderr, " done.\n");
+
/* wait for helper to start and give us keys */
fprintf (stderr, "Waiting for helper to start ");
for (unsigned int i = 0; i<1000; i++)
diff --git a/src/util/test_helper_rsa.conf b/src/util/test_helper_rsa.conf
index 524e4635..66127ee0 100644
--- a/src/util/test_helper_rsa.conf
+++ b/src/util/test_helper_rsa.conf
@@ -11,5 +11,3 @@ RSA_KEYSIZE = 2048
[taler-exchange-secmod-rsa]
LOOKAHEAD_SIGN = 5 minutes
OVERLAP_DURATION = 1 s
-KEY_DIR = ${TALER_RUNTIME_DIR}/keydir/
-UNIXPATH = ${TALER_RUNTIME_DIR}helper.unix