[taler-merchant] branch master updated: modifications for new blind signing API

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new 079429a2 modifications for new blind signing API
079429a2 is described below

commit 079429a2a2e419d0e3913e163daacc55dac3cd7b
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Wed Oct 25 22:54:43 2023 +0200

    modifications for new blind signing API
---
 .../taler-merchant-httpd_post-rewards-ID-pickup.c    |  2 +-
 src/lib/merchant_api_reward_pickup.c                 | 20 ++++++++------------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/backend/taler-merchant-httpd_post-rewards-ID-pickup.c 
b/src/backend/taler-merchant-httpd_post-rewards-ID-pickup.c
index 40eec8ef..cd8d03a6 100644
--- a/src/backend/taler-merchant-httpd_post-rewards-ID-pickup.c
+++ b/src/backend/taler-merchant-httpd_post-rewards-ID-pickup.c
@@ -819,7 +819,7 @@ RETRY:
 
       for (unsigned int i = 0; i< pc->planchets_length; i++)
       {
-        if (TALER_DENOMINATION_INVALID != sigs[i].cipher)
+        if (NULL != sigs[i].blinded_sig)
           continue;
         if (! rollback)
         {
diff --git a/src/lib/merchant_api_reward_pickup.c 
b/src/lib/merchant_api_reward_pickup.c
index fd5cf9cc..6302ba06 100644
--- a/src/lib/merchant_api_reward_pickup.c
+++ b/src/lib/merchant_api_reward_pickup.c
@@ -55,7 +55,7 @@ struct PlanchetData
   /**
    * Nonce used for @e csr request, if any.
    */
-  struct TALER_CsNonce nonce;
+  union GNUNET_CRYPTO_BlindSessionNonce nonce;
 
   /**
    * Handle for a /csr request we may optionally need
@@ -241,15 +241,11 @@ pickup_post_csr (struct TALER_MERCHANT_RewardPickupHandle 
*tp)
     TALER_planchet_blinding_secret_create (&pd->ps,
                                            &pcd->exchange_vals,
                                            &pcd->bks);
-    if (TALER_DENOMINATION_CS == pcd->exchange_vals.cipher)
-    {
-      details[i].blinded_planchet.details.cs_blinded_planchet.nonce
-        = pd->nonce;
-    }
     if (GNUNET_OK !=
         TALER_planchet_prepare (&pd->pk.key,
                                 &pcd->exchange_vals,
                                 &pcd->bks,
+                                &pd->nonce,
                                 &pcd->coin_priv,
                                 NULL,
                                 &tp->planchets[i].c_hash,
@@ -368,19 +364,19 @@ TALER_MERCHANT_reward_pickup (
     tp->planchets[i].pk = *pds[i].pk;
     TALER_denom_pub_deep_copy (&tp->planchets[i].pk.key,
                                &pds[i].pk->key);
-    switch (pk->key.cipher)
+    switch (pk->key.bsign_pub_key->cipher)
     {
-    case TALER_DENOMINATION_RSA:
-      pcd->exchange_vals.cipher = TALER_DENOMINATION_RSA;
+    case GNUNET_CRYPTO_BSA_RSA:
+      pcd->exchange_vals = *TALER_denom_ewv_rsa_singleton ();
       break;
-    case TALER_DENOMINATION_CS:
+    case GNUNET_CRYPTO_BSA_CS:
       {
         TALER_cs_withdraw_nonce_derive (&pd->ps,
-                                        &pd->nonce);
+                                        &pd->nonce.cs_nonce);
         pd->csr = TALER_EXCHANGE_csr_withdraw (ctx,
                                                exchange_url,
                                                &pd->pk,
-                                               &pd->nonce,
+                                               &pd->nonce.cs_nonce,
                                                &csr_cb,
                                                pd);
         if (NULL == pd->csr)

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