[taler-exchange] branch master updated (e7a9a291 -> 5bc3217b)

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a change to branch master
in repository exchange.

    from e7a9a291 -add logic to purge SECM_TOFU_FILE when purging secmod 
KEY_DIRS
     new 2bdc2f61 put generated secmod keys in separate dir
     new bfebdae8 fix secmod helper config, wait for client directory
     new 5bc3217b gitignore

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/util/.gitignore                       |  1 +
 src/util/taler-exchange-secmod-eddsa.conf |  6 +++---
 src/util/taler-exchange-secmod-rsa.conf   |  8 ++++----
 src/util/test_helper_eddsa.c              | 18 +++++++++++++++---
 src/util/test_helper_eddsa.conf           |  2 --
 src/util/test_helper_rsa.c                | 17 ++++++++++++++---
 src/util/test_helper_rsa.conf             |  2 --
 7 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/util/.gitignore b/src/util/.gitignore
index 4246c180..f25567f3 100644
--- a/src/util/.gitignore
+++ b/src/util/.gitignore
@@ -3,5 +3,6 @@ test_payto
 taler-exchange-secmod-rsa
 taler-exchange-secmod-eddsa
 test_helper_rsa
+test_helper_rsa_home/
 test_helper_eddsa
 test_helper_eddsa_home/
diff --git a/src/util/taler-exchange-secmod-eddsa.conf 
b/src/util/taler-exchange-secmod-eddsa.conf
index 25803d3c..ea09f033 100644
--- a/src/util/taler-exchange-secmod-eddsa.conf
+++ b/src/util/taler-exchange-secmod-eddsa.conf
@@ -8,7 +8,7 @@
 OVERLAP_DURATION = 5m
 
 # Where do we store the private keys.
-KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-eddsa/
+KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-eddsa/keys
 
 # Where does the helper listen for requests?
 UNIXPATH = $TALER_RUNTIME_DIR/exchange-secmod-eddsa/server.sock
@@ -16,8 +16,8 @@ UNIXPATH = 
$TALER_RUNTIME_DIR/exchange-secmod-eddsa/server.sock
 # Directory for clients.
 CLIENT_DIR = $TALER_RUNTIME_DIR/exchange-secmod-eddsa/clients
 
-# Where should the security module store it's private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-eddsa/private-key
+# Where should the security module store its own private key?
+SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-eddsa/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
diff --git a/src/util/taler-exchange-secmod-rsa.conf 
b/src/util/taler-exchange-secmod-rsa.conf
index 74a90310..dfa87f05 100644
--- a/src/util/taler-exchange-secmod-rsa.conf
+++ b/src/util/taler-exchange-secmod-rsa.conf
@@ -7,8 +7,8 @@
 # must be longer than this value.
 OVERLAP_DURATION = 5 m
 
-# Where do we store the private keys.
-KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-rsa/
+# Where do we store the generated private keys.
+KEY_DIR = ${TALER_DATA_HOME}/exchange-secmod-rsa/keys
 
 # Where does the helper listen for requests?
 UNIXPATH = $TALER_RUNTIME_DIR/exchange-secmod-rsa/server.sock
@@ -16,8 +16,8 @@ UNIXPATH = $TALER_RUNTIME_DIR/exchange-secmod-rsa/server.sock
 # Directory for clients.
 CLIENT_DIR = $TALER_RUNTIME_DIR/exchange-secmod-rsa/clients
 
-# Where should the security module store it's private key?
-SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-rsa/private-key
+# Where should the security module store its own private key?
+SM_PRIV_KEY = ${TALER_DATA_HOME}/exchange-secmod-rsa/secmod-private-key
 
 # For how long into the future do we pre-generate keys?
 LOOKAHEAD_SIGN = 1 year
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

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.