From 50bc862a684f8c5d4e3ece2712322bf078fe604f Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Wed, 8 Apr 2020 18:18:20 +0200
Subject: adapt to new GNUnet sign API (#6164)

---
 src/exchange-tools/taler-exchange-keycheck.c |  4 ++--
 src/exchange-tools/taler-exchange-keyup.c    | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

(limited to 'src/exchange-tools')

diff --git a/src/exchange-tools/taler-exchange-keycheck.c b/src/exchange-tools/taler-exchange-keycheck.c
index 6b6ce9eb9..917ca879f 100644
--- a/src/exchange-tools/taler-exchange-keycheck.c
+++ b/src/exchange-tools/taler-exchange-keycheck.c
@@ -92,7 +92,7 @@ signkeys_iter (void *cls,
 
   if (GNUNET_OK !=
       GNUNET_CRYPTO_eddsa_verify (TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY,
-                                  &ski->issue.purpose,
+                                  &ski->issue,
                                   &ski->master_sig.eddsa_signature,
                                   &ski->issue.master_public_key.eddsa_pub))
   {
@@ -171,7 +171,7 @@ denomkeys_iter (void *cls,
   if (GNUNET_OK !=
       GNUNET_CRYPTO_eddsa_verify (
         TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY,
-        &dki->issue.properties.purpose,
+        &dki->issue.properties,
         &dki->issue.signature.eddsa_signature,
         &dki->issue.properties.master.eddsa_pub))
   {
diff --git a/src/exchange-tools/taler-exchange-keyup.c b/src/exchange-tools/taler-exchange-keyup.c
index f4d389752..5472f5e0e 100644
--- a/src/exchange-tools/taler-exchange-keyup.c
+++ b/src/exchange-tools/taler-exchange-keyup.c
@@ -497,10 +497,9 @@ create_signkey_issue_priv (
   issue->purpose.purpose = htonl (TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY);
   issue->purpose.size = htonl (sizeof (struct
                                        TALER_ExchangeSigningKeyValidityPS));
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CRYPTO_eddsa_sign (&master_priv.eddsa_priv,
-                                           &issue->purpose,
-                                           &pi->master_sig.eddsa_signature));
+  GNUNET_CRYPTO_eddsa_sign (&master_priv.eddsa_priv,
+                            issue,
+                            &pi->master_sig.eddsa_signature);
 }
 
 
@@ -796,10 +795,9 @@ create_denomkey_issue (
     = htonl (TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY);
   dki->issue.properties.purpose.size
     = htonl (sizeof (struct TALER_DenominationKeyValidityPS));
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CRYPTO_eddsa_sign (&master_priv.eddsa_priv,
-                                           &dki->issue.properties.purpose,
-                                           &dki->issue.signature.eddsa_signature));
+  GNUNET_CRYPTO_eddsa_sign (&master_priv.eddsa_priv,
+                            &dki->issue.properties,
+                            &dki->issue.signature.eddsa_signature);
 }
 
 
@@ -948,10 +946,9 @@ sign_af (struct TALER_EXCHANGEDB_AggregateFees *af,
   TALER_EXCHANGEDB_fees_2_wf (method,
                               af,
                               &wf);
-  GNUNET_assert (GNUNET_OK ==
-                 GNUNET_CRYPTO_eddsa_sign (priv,
-                                           &wf.purpose,
-                                           &af->master_sig.eddsa_signature));
+  GNUNET_CRYPTO_eddsa_sign (priv,
+                            &wf,
+                            &af->master_sig.eddsa_signature);
 }
 
 
-- 
cgit v1.2.3