[taler-exchange] branch master updated: -fix fTBFS

[gnunet]

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

grothoff pushed a commit to branch master
in repository exchange.

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

commit d05c561e4f95a845e3c8793a752369365f307d5f
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Feb 9 15:33:20 2022 +0100

    -fix fTBFS
---
 src/benchmark/taler-aggregator-benchmark.c   |  2 ++
 src/lib/exchange_api_link.c                  | 33 ++++++++++++++--------------
 src/testing/testing_api_cmd_insert_deposit.c |  2 ++
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/benchmark/taler-aggregator-benchmark.c 
b/src/benchmark/taler-aggregator-benchmark.c
index 8d0f76d9..7079d214 100644
--- a/src/benchmark/taler-aggregator-benchmark.c
+++ b/src/benchmark/taler-aggregator-benchmark.c
@@ -542,6 +542,8 @@ run (void *cls,
                    TALER_denom_sig_unblind (&denom_sig,
                                             &bds,
                                             &bks,
+                                            &c_hash,
+                                            &alg_values,
                                             &denom_pub));
     TALER_blinded_denom_sig_free (&bds);
     TALER_denom_pub_free (&denom_pub);
diff --git a/src/lib/exchange_api_link.c b/src/lib/exchange_api_link.c
index a23a1606..cfa70617 100644
--- a/src/lib/exchange_api_link.c
+++ b/src/lib/exchange_api_link.c
@@ -107,6 +107,8 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh,
   struct TALER_TransferSecretP secret;
   struct TALER_PlanchetSecretsP ps;
   struct TALER_ExchangeWithdrawValues alg_values;
+  struct TALER_PlanchetDetail pd;
+  struct TALER_CoinPubHash c_hash;
 
   /* parse reply */
   if (GNUNET_OK !=
@@ -132,11 +134,25 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle 
*lh,
   TALER_planchet_blinding_secret_create (&ps,
                                          &alg_values,
                                          &bks);
+  if (GNUNET_OK !=
+      TALER_planchet_prepare (&rpub,
+                              &alg_values,
+                              &bks,
+                              coin_priv,
+                              &c_hash,
+                              &pd))
+  {
+    GNUNET_break (0);
+    GNUNET_JSON_parse_free (spec);
+    return GNUNET_SYSERR;
+  }
   /* extract coin and signature */
   if (GNUNET_OK !=
       TALER_denom_sig_unblind (sig,
                                &bsig,
                                &bks,
+                               &c_hash,
+                               &alg_values,
                                &rpub))
   {
     GNUNET_break_op (0);
@@ -144,28 +160,11 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle 
*lh,
   }
   /* verify link_sig */
   {
-    struct TALER_ExchangeWithdrawValues alg_values;
-    struct TALER_PlanchetDetail pd;
-    struct TALER_CoinPubHash c_hash;
     struct TALER_CoinSpendPublicKeyP old_coin_pub;
     struct TALER_BlindedCoinHash coin_envelope_hash;
 
     GNUNET_CRYPTO_eddsa_key_get_public (&lh->coin_priv.eddsa_priv,
                                         &old_coin_pub.eddsa_pub);
-    // TODO: implement cipher handling
-    alg_values.cipher = TALER_DENOMINATION_RSA;
-    if (GNUNET_OK !=
-        TALER_planchet_prepare (&rpub,
-                                &alg_values,
-                                &bks,
-                                coin_priv,
-                                &c_hash,
-                                &pd))
-    {
-      GNUNET_break (0);
-      GNUNET_JSON_parse_free (spec);
-      return GNUNET_SYSERR;
-    }
     TALER_coin_ev_hash (&pd.blinded_planchet,
                         &pd.denom_pub_hash,
                         &coin_envelope_hash);
diff --git a/src/testing/testing_api_cmd_insert_deposit.c 
b/src/testing/testing_api_cmd_insert_deposit.c
index ba8b8236..6c9f36e0 100644
--- a/src/testing/testing_api_cmd_insert_deposit.c
+++ b/src/testing/testing_api_cmd_insert_deposit.c
@@ -226,6 +226,8 @@ insert_deposit_run (void *cls,
                    TALER_denom_sig_unblind (&deposit.coin.denom_sig,
                                             &bds,
                                             &bks,
+                                            &c_hash,
+                                            &alg_values,
                                             &dpk));
     TALER_blinded_denom_sig_free (&bds);
   }

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