[taler-merchant] branch master updated: -fix key initialization

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new a67b6c93 -fix key initialization
a67b6c93 is described below

commit a67b6c930917c793ed2e74e2953fa6df79705318
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jul 30 21:07:54 2021 +0200

    -fix key initialization
---
 contrib/merchant-backoffice                                           | 2 +-
 src/testing/initialize_taler_system.sh                                | 4 ++--
 .../.local/share/taler/exchange-offline/master.priv                   | 1 +
 .../test_reducer_home/.local/share/taler/exchange-offline/master.priv | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index 4320467d..fe987187 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit 4320467db1392e5f48a4acd079f7e2a253cf9984
+Subproject commit fe987187e178816d42ed12178d430c8771cb5a75
diff --git a/src/testing/initialize_taler_system.sh 
b/src/testing/initialize_taler_system.sh
index c4127684..abe8a6d2 100755
--- a/src/testing/initialize_taler_system.sh
+++ b/src/testing/initialize_taler_system.sh
@@ -66,11 +66,11 @@ DATA_DIR=`taler-config -f -c $CONF -s PATHS -o TALER_HOME`
 rm -rf $DATA_DIR
 
 # obtain key configuration data
-MASTER_PRIV_FILE=`taler-config -f -c $CONF -s EXCHANGE -o MASTER_PRIV_FILE`
+MASTER_PRIV_FILE=`taler-config -f -c ${CONF} -s "EXCHANGE-OFFLINE" -o 
"MASTER_PRIV_FILE"`
 MASTER_PRIV_DIR=`dirname $MASTER_PRIV_FILE`
 mkdir -p $MASTER_PRIV_DIR
 gnunet-ecc -g1 $MASTER_PRIV_FILE > /dev/null 2> /dev/null
-MASTER_PUB=`gnunet-ecc -p $MASTER_PRIV_FILE`
+MASTER_PUB=`gnunet-ecc -p ${MASTER_PRIV_FILE}`
 EXCHANGE_URL=`taler-config -c $CONF -s EXCHANGE -o BASE_URL`
 MERCHANT_PORT=`taler-config -c $CONF -s MERCHANT -o PORT`
 MERCHANT_URL=http://localhost:${MERCHANT_PORT}/
diff --git 
a/src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv
 
b/src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv
new file mode 100644
index 00000000..c20942d6
--- /dev/null
+++ 
b/src/testing/test_merchant_api_home/.local/share/taler/exchange-offline/master.priv
@@ -0,0 +1 @@
+��k;d�_U�}�A.w�"!G��v_m�"_��
\ No newline at end of file
diff --git 
a/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv 
b/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv
new file mode 100644
index 00000000..35575146
--- /dev/null
+++ 
b/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv
@@ -0,0 +1 @@
+�MW��r)�f(+���ME����]�k�����
\ No newline at end of file

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