From 05f539c127f4e3fce56a04f7aeb1bb204ab3cff2 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Tue, 8 Dec 2020 19:13:39 +0100
Subject: initialize master_pub field

---
 src/lib/exchange_api_handle.c | 4 ++--
 src/util/Makefile.am          | 3 ++-
 src/util/offline_signatures.c | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c
index 9d4ebf569..78d1fcfd7 100644
--- a/src/lib/exchange_api_handle.c
+++ b/src/lib/exchange_api_handle.c
@@ -395,8 +395,8 @@ parse_json_signkey (struct TALER_EXCHANGE_SigningPublicKey *sign_key,
   if (! check_sigs)
     return GNUNET_OK;
   if (GNUNET_OK !=
-      TALER_exchange_offline_signkey_validity_verify
-        (&sign_key->key,
+      TALER_exchange_offline_signkey_validity_verify (
+        &sign_key->key,
         sign_key->valid_from,
         sign_key->valid_until,
         sign_key->valid_legal,
diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 9dcc40356..2c8038d07 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -13,10 +13,11 @@ pkgcfgdir = $(prefix)/share/taler/config.d/
 
 pkgcfg_DATA = \
   paths.conf \
+  taler-helper-crypto-eddsa.conf \
   taler-helper-crypto-rsa.conf
 
 EXTRA_DIST = \
-  paths.conf \
+  $(pkgcfg_DATA) \
   taler-config.in \
   test_helper_eddsa.conf \
   test_helper_rsa.conf
diff --git a/src/util/offline_signatures.c b/src/util/offline_signatures.c
index d8f040321..be5783df4 100644
--- a/src/util/offline_signatures.c
+++ b/src/util/offline_signatures.c
@@ -121,6 +121,8 @@ TALER_exchange_offline_signkey_validity_sign (
     .signkey_pub = *exchange_pub
   };
 
+  GNUNET_CRYPTO_eddsa_key_get_public (&master_priv->eddsa_priv,
+                                      &skv.master_public_key.eddsa_pub);
   GNUNET_CRYPTO_eddsa_sign (&master_priv->eddsa_priv,
                             &skv,
                             &master_sig->eddsa_signature);
@@ -140,6 +142,7 @@ TALER_exchange_offline_signkey_validity_verify (
     .purpose.purpose = htonl (
       TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY),
     .purpose.size = htonl (sizeof (skv)),
+    .master_public_key = *master_pub,
     .start = GNUNET_TIME_absolute_hton (start_sign),
     .expire = GNUNET_TIME_absolute_hton (end_sign),
     .end = GNUNET_TIME_absolute_hton (end_legal),
-- 
cgit v1.2.3