From 3da15349a7d24155497fa104e7881ce9ca9e1d94 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Sat, 24 Aug 2024 23:25:26 +0200
Subject: fix badly named structure, it is a pointer, not packed

---
 src/include/taler_crypto_lib.h |  4 ++--
 src/include/taler_json_lib.h   |  4 ++--
 src/json/json_helper.c         |  2 +-
 src/json/json_pack.c           |  2 +-
 src/util/tokens.c              | 16 +++++++++-------
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h
index ac95e4756..ac5d21aeb 100644
--- a/src/include/taler_crypto_lib.h
+++ b/src/include/taler_crypto_lib.h
@@ -2465,7 +2465,7 @@ struct TALER_TokenUseMerchantValues
 /**
  * The blinded token use public key of a token. Ready to be signed by the merchant.
  */
-struct TALER_TokenEnvelopeP
+struct TALER_TokenEnvelope
 {
   /**
    * Blinded public key of the token.
@@ -2566,7 +2566,7 @@ TALER_token_blind_input_copy (struct TALER_TokenUseMerchantValues *bi_dst,
  */
 enum GNUNET_GenericReturnValue
 TALER_token_issue_sign (const struct TALER_TokenIssuePrivateKeyP *issue_priv,
-                        const struct TALER_TokenEnvelopeP *envelope,
+                        const struct TALER_TokenEnvelope *envelope,
                         struct TALER_TokenIssueBlindSignatureP *issue_sig);
 
 
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
index dd47feb12..806b39dc1 100644
--- a/src/include/taler_json_lib.h
+++ b/src/include/taler_json_lib.h
@@ -151,7 +151,7 @@ TALER_JSON_pack_token_issue_sig (
 struct GNUNET_JSON_PackSpec
 TALER_JSON_pack_token_envelope (
   const char *name,
-  const struct TALER_TokenEnvelopeP *envelope);
+  const struct TALER_TokenEnvelope *envelope);
 
 
 /**
@@ -635,7 +635,7 @@ TALER_JSON_spec_blinded_token_issue_sig (
 struct GNUNET_JSON_Specification
 TALER_JSON_spec_token_envelope (
   const char *field,
-  struct TALER_TokenEnvelopeP *env);
+  struct TALER_TokenEnvelope *env);
 
 
 /**
diff --git a/src/json/json_helper.c b/src/json/json_helper.c
index 82cc13413..db0a425db 100644
--- a/src/json/json_helper.c
+++ b/src/json/json_helper.c
@@ -555,7 +555,7 @@ TALER_JSON_spec_blinded_token_issue_sig (
 
 struct GNUNET_JSON_Specification
 TALER_JSON_spec_token_envelope (const char *field,
-                                struct TALER_TokenEnvelopeP *env)
+                                struct TALER_TokenEnvelope *env)
 {
   env->blinded_pub = NULL;
   return GNUNET_JSON_spec_blinded_message (field,
diff --git a/src/json/json_pack.c b/src/json/json_pack.c
index 82eb91cc8..85c9c5686 100644
--- a/src/json/json_pack.c
+++ b/src/json/json_pack.c
@@ -173,7 +173,7 @@ TALER_JSON_pack_token_issue_sig (
 struct GNUNET_JSON_PackSpec
 TALER_JSON_pack_token_envelope (
   const char *name,
-  const struct TALER_TokenEnvelopeP *envelope)
+  const struct TALER_TokenEnvelope *envelope)
 {
   struct GNUNET_JSON_PackSpec ps = {
     .field_name = name,
diff --git a/src/util/tokens.c b/src/util/tokens.c
index 5d99c5dfe..b79dda61a 100644
--- a/src/util/tokens.c
+++ b/src/util/tokens.c
@@ -176,7 +176,7 @@ TALER_token_blind_input_copy (struct TALER_TokenUseMerchantValues *bi_dst,
 
 enum GNUNET_GenericReturnValue
 TALER_token_issue_sign (const struct TALER_TokenIssuePrivateKeyP *issue_priv,
-                        const struct TALER_TokenEnvelopeP *envelope,
+                        const struct TALER_TokenEnvelope *envelope,
                         struct TALER_TokenIssueBlindSignatureP *issue_sig)
 {
   issue_sig->signature
@@ -188,6 +188,7 @@ TALER_token_issue_sign (const struct TALER_TokenIssuePrivateKeyP *issue_priv,
   return GNUNET_OK;
 }
 
+
 enum GNUNET_GenericReturnValue
 TALER_token_issue_verify (const struct TALER_TokenUsePublicKeyP *use_pub,
                           const struct TALER_TokenIssuePublicKeyP *issue_pub,
@@ -211,6 +212,7 @@ TALER_token_issue_verify (const struct TALER_TokenUsePublicKeyP *use_pub,
   return GNUNET_OK;
 }
 
+
 enum GNUNET_GenericReturnValue
 TALER_token_issue_sig_unblind (
   struct TALER_TokenIssueSignatureP *issue_sig,
@@ -221,12 +223,12 @@ TALER_token_issue_sig_unblind (
   const struct TALER_TokenIssuePublicKeyP *issue_pub)
 {
   issue_sig->signature
-        = GNUNET_CRYPTO_blind_sig_unblind (blinded_sig->signature,
-                                           secret,
-                                           &use_pub_hash->hash,
-                                           sizeof (use_pub_hash->hash),
-                                           alg_values->blinding_inputs,
-                                           issue_pub->public_key);
+    = GNUNET_CRYPTO_blind_sig_unblind (blinded_sig->signature,
+                                       secret,
+                                       &use_pub_hash->hash,
+                                       sizeof (use_pub_hash->hash),
+                                       alg_values->blinding_inputs,
+                                       issue_pub->public_key);
   if (NULL == issue_sig->signature)
   {
     GNUNET_break_op (0);
-- 
cgit v1.2.3