[taler-donau] branch master updated: [build] make donau_crypto_lib (*_signatures.c commented), but now what about json and other dependencies?

[gnunet]

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

pius-loosli pushed a commit to branch master
in repository donau.

The following commit(s) were added to refs/heads/master by this push:
     new ddf4ac8  [build] make donau_crypto_lib (*_signatures.c commented), but 
now what about json and other dependencies?
ddf4ac8 is described below

commit ddf4ac82bffee78020d32a379831ba7b1e1d31ef
Author: Pius Loosli <loosp2@bfh.ch>
AuthorDate: Mon Nov 13 19:34:38 2023 +0100

    [build] make donau_crypto_lib (*_signatures.c commented), but now what 
about json and other dependencies?
---
 configure.ac                   |  1 +
 src/include/donau_crypto_lib.h | 27 ++++++++++++++++++++-------
 src/json/json.c                |  4 ++--
 src/json/json_helper.c         |  4 ++--
 src/json/json_pack.c           |  4 ++--
 src/util/charity_signatures.c  |  4 ++--
 src/util/donau_signatures.c    | 13 +++++++------
 7 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6c81b37..a6b34c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -485,6 +485,7 @@ AC_CONFIG_FILES([Makefile
                  src/donaudb/Makefile
                  src/donau-tools/Makefile
                  src/lib/Makefile
+                 src/json/Makefile
                  src/testing/Makefile
                  src/include/Makefile
                  src/util/Makefile
diff --git a/src/include/donau_crypto_lib.h b/src/include/donau_crypto_lib.h
index 4ebb93f..e76501a 100644
--- a/src/include/donau_crypto_lib.h
+++ b/src/include/donau_crypto_lib.h
@@ -148,6 +148,17 @@ struct TALER_DONAU_BearerToken
   struct GNUNET_Uuid token;
 };
 
+/*
+* @brief Wrapper around GNUNET primitive for the blinded unique donation 
identifier
+*/
+struct TALER_BlindedUniqueDonationIdentifier
+{
+  /*
+  * GNUNET primitive type representing a generic blinded message
+  */
+  struct GNUNET_CRYPTO_BlindedMessage blinded_message;
+};
+
 /**
  * Information needed for a donation receipt to be signed.
  */
@@ -163,7 +174,7 @@ struct TALER_BlindedUniqueDonationIdentifierKeyPair
    * Donor's blinded donation receipt to be blindly
    * signed.
    */
-  struct TALER_BlindedUniqueDonationIdentifier budi;
+  struct TALER_BlindedUniqueDonationIdentifier blinded_udi;
 
 };
 
@@ -182,7 +193,8 @@ struct TALER_BlindedUniqueDonationIdentifierKeyPair
 void
 DONAU_charity_budi_key_pair_sign (
   const unsigned int num_bkp,
-  const struct TALER_BlindedUniqueDonationIdentifierKeyPair *bkp[static 
num_bkp],
+  const struct TALER_BlindedUniqueDonationIdentifierKeyPair *bkp[static
+                                                                 num_bkp],
   const struct TALER_DONAU_CharityPrivateKeyP *charity_priv,
   struct TALER_CharitySignatureP *charity_sig);
 
@@ -199,7 +211,8 @@ DONAU_charity_budi_key_pair_sign (
 enum GNUNET_GenericReturnValue
 DONAU_charity_budi_key_pair_verify (
   const unsigned int num_bkp,
-  const struct TALER_BlindedUniqueDonationIdentifierKeyPair *bkp[static 
num_bkp],
+  const struct TALER_BlindedUniqueDonationIdentifierKeyPair *bkp[static
+                                                                 num_bkp],
   const struct TALER_DONAU_CharityPublicKeyP *charity_pub,
   const struct TALER_CharitySignatureP *charity_sig);
 
@@ -208,7 +221,7 @@ DONAU_charity_budi_key_pair_verify (
 
 
 /**
- * Create donau eddsa signature. Another name for this 
+ * Create donau eddsa signature. Another name for this
  * is the donation statement.
  *
  * @param amount_tot total donated amount of @a year
@@ -221,7 +234,7 @@ void
 DONAU_donation_statement_sign (
   const struct TALER_Amount *amount_tot,
   const unsigned int year,
-  const struct TALER_DONAU_HashDonorTaxId *i, 
+  const struct TALER_DONAU_HashDonorTaxId *i,
   const struct TALER_DONAU_PrivateKeyP *donau_priv,
   struct TALER_DonauSignatureP *statement_sig);
 
@@ -240,8 +253,8 @@ enum GNUNET_GenericReturnValue
 DONAU_donation_statement_verify (
   const struct TALER_Amount *amount_tot,
   const unsigned int year,
-  const struct TALER_DONAU_HashDonorTaxId *i, 
-  const struct TALER_DONAU_PublicKeyP *donau_pub,
+  const struct TALER_DONAU_HashDonorTaxId *i,
+  const struct TALER_DONAU_EddsaPublicKeyP *donau_pub,
   const struct TALER_DonauSignatureP *statement_sig);
 
 
diff --git a/src/json/json.c b/src/json/json.c
index fb00fb5..d64903f 100644
--- a/src/json/json.c
+++ b/src/json/json.c
@@ -19,10 +19,10 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Christian Grothoff
  */
-#include "platform.h"
+#include "taler/platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include "taler_util.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
 #include <unistr.h>
 
 
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 6c96035..a254876 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -20,10 +20,10 @@
  * @author Sree Harsha Totakura <sreeharsha@totakura.in>
  * @author Christian Grothoff
  */
-#include "platform.h"
+#include "taler/platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include "taler_util.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
 
 
 /**
diff --git a/src/json/json_pack.c b/src/json/json_pack.c
index c6844c1..5292aed 100644
--- a/src/json/json_pack.c
+++ b/src/json/json_pack.c
@@ -18,10 +18,10 @@
  * @brief helper functions for JSON object packing
  * @author Christian Grothoff
  */
-#include "platform.h"
+#include "taler/platform.h"
 #include <gnunet/gnunet_util_lib.h>
 #include "taler_util.h"
-#include "taler_json_lib.h"
+#include "taler/taler_json_lib.h"
 
 
 struct GNUNET_JSON_PackSpec
diff --git a/src/util/charity_signatures.c b/src/util/charity_signatures.c
index 20aa67d..9921265 100644
--- a/src/util/charity_signatures.c
+++ b/src/util/charity_signatures.c
@@ -55,7 +55,7 @@ struct TALER_BudiKeyPairTrackPS
 
 };
 GNUNET_NETWORK_STRUCT_END
-
+/*
 void
 DONAU_charity_budi_key_pair_sign (
   const unsigned int num_bkp,
@@ -97,6 +97,6 @@ DONAU_charity_budi_key_pair_verify (
                                 &charity_sig->eddsa_sig,
                                 &charity_pub->eddsa_pub);
 }
-
+*/
 
 /* end of charity_signatures.c */
diff --git a/src/util/donau_signatures.c b/src/util/donau_signatures.c
index 77d1160..9166c4b 100644
--- a/src/util/donau_signatures.c
+++ b/src/util/donau_signatures.c
@@ -27,7 +27,7 @@
 GNUNET_NETWORK_STRUCT_BEGIN
 
 /**
- * @brief Format used to generate the signature/donation statement 
+ * @brief Format used to generate the signature/donation statement
  * over the total amount and a donor identifier of a year.
  */
 struct TALER_DonationStatementConfirmationPS
@@ -57,12 +57,12 @@ struct TALER_DonationStatementConfirmationPS
 
 GNUNET_NETWORK_STRUCT_END
 
-
+/*
 void
 DONAU_donation_statement_sign (
   const struct TALER_Amount *amount_tot,
   const unsigned int year,
-  const struct TALER_DONAU_HashDonorTaxId *i, 
+  const struct TALER_DONAU_HashDonorTaxId *i,
   const struct TALER_DONAU_PrivateKeyP *donau_priv,
   struct TALER_DonauSignatureP *statement_sig)
 {
@@ -78,13 +78,14 @@ DONAU_donation_statement_sign (
                             &tps,
                             &statement_sig->eddsa_sig);
 }
+*/
 
-
+/*
 enum GNUNET_GenericReturnValue
 DONAU_donation_statement_verify (
   const struct TALER_Amount *amount_tot,
   const unsigned int year,
-  const struct TALER_DONAU_HashDonorTaxId *i, 
+  const struct TALER_DONAU_HashDonorTaxId *i,
   const struct TALER_DONAU_PublicKeyP *donau_pub,
   const TALER_DonauSignatureP *statement_sig)
 {
@@ -102,5 +103,5 @@ DONAU_donation_statement_verify (
                                 &statement_sig->eddsa_sig,
                                 &donau_pub->eddsa_pub);
 }
-
+*/
 /* end of donau_signatures.c */

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