[taler-exchange] branch master updated (fa558293 -> c9da7a0f)

[gnunet]

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

oec pushed a change to branch master
in repository exchange.

    from fa558293 [wip, #7267] more refined denomination conflict response 
during deposit
     new 76a8b46a -ptr to correct struct member
     new c9da7a0f -added GNUNET_break for rare case

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/exchange/taler-exchange-httpd_db.c | 13 +++++++------
 src/util/merchant_signatures.c         |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/exchange/taler-exchange-httpd_db.c 
b/src/exchange/taler-exchange-httpd_db.c
index 1c11a02f..6fec3fee 100644
--- a/src/exchange/taler-exchange-httpd_db.c
+++ b/src/exchange/taler-exchange-httpd_db.c
@@ -67,20 +67,21 @@ TEH_make_coin_known (const struct TALER_CoinPublicInfo 
*coin,
     /* The exchange has a seen this coin before, but with a different 
denomination.
      * Get the corresponding signature and sent it to the client as proof */
     {
-      struct conflict
+      struct
       {
         struct TALER_DenominationPublicKey pub;
         struct TALER_DenominationSignature sig;
-      } conflict = {0};
+      } prev_denom = {0};
 
       if (GNUNET_DB_STATUS_SUCCESS_ONE_RESULT !=
           TEH_plugin->get_signature_for_known_coin (TEH_plugin->cls,
                                                     &coin->coin_pub,
-                                                    &conflict.pub,
-                                                    &conflict.sig))
+                                                    &prev_denom.pub,
+                                                    &prev_denom.sig))
       {
         /* There _should_ have been a result, because
          * we ended here due to a conflict! */
+        GNUNET_break (0);
         *mhd_ret = TALER_MHD_reply_with_error (connection,
                                                MHD_HTTP_INTERNAL_SERVER_ERROR,
                                                
TALER_EC_GENERIC_DB_FETCH_FAILED,
@@ -92,8 +93,8 @@ TEH_make_coin_known (const struct TALER_CoinPublicInfo *coin,
         connection,
         TALER_EC_EXCHANGE_GENERIC_COIN_CONFLICTING_DENOMINATION_KEY,
         &coin->coin_pub,
-        &conflict.pub,
-        &conflict.sig);
+        &prev_denom.pub,
+        &prev_denom.sig);
 
       return GNUNET_DB_STATUS_HARD_ERROR;
     }
diff --git a/src/util/merchant_signatures.c b/src/util/merchant_signatures.c
index 4a913ebd..35e0b0e0 100644
--- a/src/util/merchant_signatures.c
+++ b/src/util/merchant_signatures.c
@@ -287,7 +287,7 @@ TALER_merchant_pay_sign (
 
   GNUNET_CRYPTO_eddsa_sign (&merch_priv->eddsa_priv,
                             &mr,
-                            merch_sig);
+                            &merch_sig->eddsa_sig);
 }
 
 

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