exchange

commit 3af7bc0a292715766c3b0196d31a3eea8dc6ca4b
parent ec3d5a7655d63c0d5675c095e3ebbb3cdc72a087
Author: Christian Grothoff <christian@grothoff.org>
Date:   Mon, 25 Oct 2021 10:40:32 +0200

-more FTBFS fixes

Diffstat:
M
src/include/taler_json_lib.h
 | 
2
+-
M
src/json/json_pack.c
 | 
8
+++-----
M
src/json/json_wire.c
 | 
2
+-

3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h
@@ -505,7 +505,7 @@ TALER_JSON_get_error_code2 (const void *data,
  */
 enum GNUNET_GenericReturnValue
 TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
-                                         struct GNUNET_HashCode *hc);
+                                         struct TALER_MerchantWireHash *hc);
 
 
 /**
diff --git a/src/json/json_pack.c b/src/json/json_pack.c
@@ -101,16 +101,15 @@ TALER_JSON_pack_denomination_public_key (
   case TALER_DENOMINATION_RSA:
     ps.object
       = GNUNET_JSON_PACK (
-          GNUNET_JSON_pack_uint32 ("cipher",
+          GNUNET_JSON_pack_uint64 ("cipher",
                                    TALER_DENOMINATION_RSA),
-          GNUNET_JSON_pack_uint32 ("age_mask",
+          GNUNET_JSON_pack_uint64 ("age_mask",
                                    pk->age_mask),
           GNUNET_JSON_pack_rsa_public_key ("rsa_public_key",
                                            pk->details.rsa_public_key));
     break;
   default:
     GNUNET_assert (0);
-    return GNUNET_SYSERR;
   }
   return ps;
 }
@@ -130,14 +129,13 @@ TALER_JSON_pack_denomination_signature (
   case TALER_DENOMINATION_RSA:
     ps.object
       = GNUNET_JSON_PACK (
-          GNUNET_JSON_pack_uint32 ("cipher",
+          GNUNET_JSON_pack_uint64 ("cipher",
                                    TALER_DENOMINATION_RSA),
           GNUNET_JSON_pack_rsa_signature ("rsa_signature",
                                           sig->details.rsa_signature));
     break;
   default:
     GNUNET_assert (0);
-    return GNUNET_SYSERR;
   }
   return ps;
 }
diff --git a/src/json/json_wire.c b/src/json/json_wire.c
@@ -26,7 +26,7 @@
 
 enum GNUNET_GenericReturnValue
 TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s,
-                                         struct GNUNET_HashCode *hc)
+                                         struct TALER_MerchantWireHash *hc)
 {
   const char *payto_uri;
   struct TALER_WireSalt salt;