From 82d7d87cc3946a01bfed221c7da0fb9ef2c18eb1 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <grothoff@gnunet.org>
Date: Wed, 25 Oct 2023 22:54:20 +0200
Subject: new blind signing code builds

---
 src/exchange/taler-exchange-httpd_recoup-refresh.c | 33 +++++++++++-----------
 1 file changed, 16 insertions(+), 17 deletions(-)

(limited to 'src/exchange/taler-exchange-httpd_recoup-refresh.c')

diff --git a/src/exchange/taler-exchange-httpd_recoup-refresh.c b/src/exchange/taler-exchange-httpd_recoup-refresh.c
index d52dabda0..a5d5b2ab4 100644
--- a/src/exchange/taler-exchange-httpd_recoup-refresh.c
+++ b/src/exchange/taler-exchange-httpd_recoup-refresh.c
@@ -1,6 +1,6 @@
 /*
   This file is part of TALER
-  Copyright (C) 2017-2021 Taler Systems SA
+  Copyright (C) 2017-2023 Taler Systems SA
 
   TALER is free software; you can redistribute it and/or modify it under the
   terms of the GNU Affero General Public License as published by the Free Software
@@ -55,7 +55,7 @@ struct RecoupContext
   /**
    * Key used to blind the coin.
    */
-  const union TALER_DenominationBlindingKeyP *coin_bks;
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks;
 
   /**
    * Signature of the coin requesting recoup.
@@ -175,8 +175,8 @@ verify_and_execute_recoup_refresh (
   struct MHD_Connection *connection,
   const struct TALER_CoinPublicInfo *coin,
   const struct TALER_ExchangeWithdrawValues *exchange_vals,
-  const union TALER_DenominationBlindingKeyP *coin_bks,
-  const struct TALER_CsNonce *nonce,
+  const union GNUNET_CRYPTO_BlindingSecretP *coin_bks,
+  const union GNUNET_CRYPTO_BlindSessionNonce *nonce,
   const struct TALER_CoinSpendSignatureP *coin_sig)
 {
   struct RecoupContext pc;
@@ -219,12 +219,12 @@ verify_and_execute_recoup_refresh (
   }
 
   /* check denomination signature */
-  switch (dk->denom_pub.cipher)
+  switch (dk->denom_pub.bsign_pub_key->cipher)
   {
-  case TALER_DENOMINATION_RSA:
+  case GNUNET_CRYPTO_BSA_RSA:
     TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_RSA]++;
     break;
-  case TALER_DENOMINATION_CS:
+  case GNUNET_CRYPTO_BSA_CS:
     TEH_METRICS_num_verifications[TEH_MT_SIGNATURE_CS]++;
     break;
   default:
@@ -265,6 +265,7 @@ verify_and_execute_recoup_refresh (
     if (GNUNET_OK !=
         TALER_denom_blind (&dk->denom_pub,
                            coin_bks,
+                           nonce,
                            &coin->h_age_commitment,
                            &coin->coin_pub,
                            exchange_vals,
@@ -278,9 +279,6 @@ verify_and_execute_recoup_refresh (
         TALER_EC_EXCHANGE_RECOUP_REFRESH_BLINDING_FAILED,
         NULL);
     }
-    if (TALER_DENOMINATION_CS == blinded_planchet.cipher)
-      blinded_planchet.details.cs_blinded_planchet.nonce
-        = *nonce;
     TALER_coin_ev_hash (&blinded_planchet,
                         &coin->denom_pub_hash,
                         &h_blind);
@@ -375,10 +373,11 @@ TEH_handler_recoup_refresh (struct MHD_Connection *connection,
 {
   enum GNUNET_GenericReturnValue ret;
   struct TALER_CoinPublicInfo coin = {0};
-  union TALER_DenominationBlindingKeyP coin_bks;
+  union GNUNET_CRYPTO_BlindingSecretP coin_bks;
   struct TALER_CoinSpendSignatureP coin_sig;
   struct TALER_ExchangeWithdrawValues exchange_vals;
-  struct TALER_CsNonce nonce;
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
+  bool no_nonce;
   struct GNUNET_JSON_Specification spec[] = {
     GNUNET_JSON_spec_fixed_auto ("denom_pub_hash",
                                  &coin.denom_pub_hash),
@@ -394,19 +393,17 @@ TEH_handler_recoup_refresh (struct MHD_Connection *connection,
       GNUNET_JSON_spec_fixed_auto ("h_age_commitment",
                                    &coin.h_age_commitment),
       &coin.no_age_commitment),
+    // FIXME: rename to just 'nonce'
     GNUNET_JSON_spec_mark_optional (
       GNUNET_JSON_spec_fixed_auto ("cs_nonce",
                                    &nonce),
-      NULL),
+      &no_nonce),
     GNUNET_JSON_spec_end ()
   };
 
   memset (&coin,
           0,
           sizeof (coin));
-  memset (&nonce,
-          0,
-          sizeof (nonce));
   coin.coin_pub = *coin_pub;
   ret = TALER_MHD_parse_json_data (connection,
                                    root,
@@ -422,7 +419,9 @@ TEH_handler_recoup_refresh (struct MHD_Connection *connection,
                                              &coin,
                                              &exchange_vals,
                                              &coin_bks,
-                                             &nonce,
+                                             no_nonce
+                                             ? NULL
+                                             : &nonce,
                                              &coin_sig);
     GNUNET_JSON_parse_free (spec);
     return res;
-- 
cgit v1.2.3