-big renaming of structs for consistent naming with P suffix

24 files changed, 68 insertions, 63 deletions

diff --git a/src/exchange/taler-exchange-aggregator.c b/src/exchange/taler-exchange-aggregator.c
index a2e87e2bf..c552610a7 100644
--- a/src/exchange/taler-exchange-aggregator.c
+++ b/src/exchange/taler-exchange-aggregator.c
@@ -370,7 +370,7 @@ deposit_cb (void *cls,
             const struct TALER_CoinSpendPublicKeyP *coin_pub,
             const struct TALER_Amount *amount_with_fee,
             const struct TALER_Amount *deposit_fee,
-            const struct TALER_PrivateContractHash *h_contract_terms,
+            const struct TALER_PrivateContractHashP *h_contract_terms,
             uint64_t wire_target,
             const char *payto_uri)
 {
@@ -516,7 +516,7 @@ aggregate_cb (void *cls,
               const struct TALER_CoinSpendPublicKeyP *coin_pub,
               const struct TALER_Amount *amount_with_fee,
               const struct TALER_Amount *deposit_fee,
-              const struct TALER_PrivateContractHash *h_contract_terms)
+              const struct TALER_PrivateContractHashP *h_contract_terms)
 {
   struct AggregationUnit *au = cls;
   struct TALER_Amount old;
diff --git a/src/exchange/taler-exchange-httpd.c b/src/exchange/taler-exchange-httpd.c
index efaf63114..a65c01e4c 100644
--- a/src/exchange/taler-exchange-httpd.c
+++ b/src/exchange/taler-exchange-httpd.c
@@ -647,7 +647,7 @@ handle_post_management (struct TEH_RequestContext *rc,
   if (0 == strcmp (args[0],
                    "denominations"))
   {
-    struct TALER_DenominationHash h_denom_pub;
+    struct TALER_DenominationHashP h_denom_pub;
 
     if ( (NULL == args[0]) ||
          (NULL == args[1]) ||
@@ -794,7 +794,7 @@ handle_post_auditors (struct TEH_RequestContext *rc,
                       const char *const args[])
 {
   struct TALER_AuditorPublicKeyP auditor_pub;
-  struct TALER_DenominationHash h_denom_pub;
+  struct TALER_DenominationHashP h_denom_pub;
 
   if ( (NULL == args[0]) ||
        (NULL == args[1]) ||
diff --git a/src/exchange/taler-exchange-httpd_auditors.c b/src/exchange/taler-exchange-httpd_auditors.c
index b9ebbe582..b32feff7d 100644
--- a/src/exchange/taler-exchange-httpd_auditors.c
+++ b/src/exchange/taler-exchange-httpd_auditors.c
@@ -45,7 +45,7 @@ struct AddAuditorDenomContext
   /**
    * Denomination this is about.
    */
-  const struct TALER_DenominationHash *h_denom_pub;
+  const struct TALER_DenominationHashP *h_denom_pub;
 
   /**
    * Auditor this is about.
@@ -189,7 +189,7 @@ MHD_RESULT
 TEH_handler_auditors (
   struct MHD_Connection *connection,
   const struct TALER_AuditorPublicKeyP *auditor_pub,
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const json_t *root)
 {
   struct AddAuditorDenomContext awc = {
diff --git a/src/exchange/taler-exchange-httpd_auditors.h b/src/exchange/taler-exchange-httpd_auditors.h
index 00a2e57a9..5d5c3a49c 100644
--- a/src/exchange/taler-exchange-httpd_auditors.h
+++ b/src/exchange/taler-exchange-httpd_auditors.h
@@ -39,7 +39,7 @@ MHD_RESULT
 TEH_handler_auditors (
   struct MHD_Connection *connection,
   const struct TALER_AuditorPublicKeyP *auditor_pub,
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const json_t *root);
 
 
diff --git a/src/exchange/taler-exchange-httpd_csr.c b/src/exchange/taler-exchange-httpd_csr.c
index 94b55c706..1abe55639 100644
--- a/src/exchange/taler-exchange-httpd_csr.c
+++ b/src/exchange/taler-exchange-httpd_csr.c
@@ -78,12 +78,12 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
 
     {
       struct TALER_CsNonce nonces[csr_requests_num];
-      struct TALER_DenominationHash denom_pub_hashes[csr_requests_num];
+      struct TALER_DenominationHashP denom_pub_hashes[csr_requests_num];
 
       for (unsigned int i = 0; i < csr_requests_num; i++)
       {
         uint32_t coin_off;
-        struct TALER_DenominationHash *denom_pub_hash = &denom_pub_hashes[i];
+        struct TALER_DenominationHashP *denom_pub_hash = &denom_pub_hashes[i];
         struct GNUNET_JSON_Specification csr_spec[] = {
           GNUNET_JSON_spec_uint32 ("coin_offset",
                                    &coin_off),
@@ -112,7 +112,7 @@ TEH_handler_csr_melt (struct TEH_RequestContext *rc,
       for (unsigned int i = 0; i < csr_requests_num; i++)
       {
         const struct TALER_CsNonce *nonce = &nonces[i];
-        const struct TALER_DenominationHash *denom_pub_hash =
+        const struct TALER_DenominationHashP *denom_pub_hash =
           &denom_pub_hashes[i];
         struct TALER_DenominationCSPublicRPairP *r_pub
           = &ewvs[i].details.cs_values;
@@ -228,7 +228,7 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
                           const char *const args[])
 {
   struct TALER_CsNonce nonce;
-  struct TALER_DenominationHash denom_pub_hash;
+  struct TALER_DenominationHashP denom_pub_hash;
   struct TALER_ExchangeWithdrawValues ewv = {
     .cipher = TALER_DENOMINATION_CS
   };
@@ -238,7 +238,7 @@ TEH_handler_csr_withdraw (struct TEH_RequestContext *rc,
                             sizeof (struct TALER_CsNonce)),
     GNUNET_JSON_spec_fixed ("denom_pub_hash",
                             &denom_pub_hash,
-                            sizeof (struct TALER_DenominationHash)),
+                            sizeof (struct TALER_DenominationHashP)),
     GNUNET_JSON_spec_end ()
   };
   struct TEH_DenominationKey *dk;
diff --git a/src/exchange/taler-exchange-httpd_db.c b/src/exchange/taler-exchange-httpd_db.c
index f331e17d2..f621d8c87 100644
--- a/src/exchange/taler-exchange-httpd_db.c
+++ b/src/exchange/taler-exchange-httpd_db.c
@@ -49,7 +49,7 @@ TEH_make_coin_known (const struct TALER_CoinPublicInfo *coin,
                      MHD_RESULT *mhd_ret)
 {
   enum TALER_EXCHANGEDB_CoinKnownStatus cks;
-  struct TALER_DenominationHash h_denom_pub;
+  struct TALER_DenominationHashP h_denom_pub;
   struct TALER_AgeCommitmentHash age_hash;
 
   /* make sure coin is 'known' in database */
diff --git a/src/exchange/taler-exchange-httpd_deposit.c b/src/exchange/taler-exchange-httpd_deposit.c
index acdc6ee6d..ea319f23a 100644
--- a/src/exchange/taler-exchange-httpd_deposit.c
+++ b/src/exchange/taler-exchange-httpd_deposit.c
@@ -59,9 +59,10 @@
 static MHD_RESULT
 reply_deposit_success (struct MHD_Connection *connection,
                        const struct TALER_CoinSpendPublicKeyP *coin_pub,
-                       const struct TALER_MerchantWireHash *h_wire,
-                       const struct TALER_ExtensionContractHash *h_extensions,
-                       const struct TALER_PrivateContractHash *h_contract_terms,
+                       const struct TALER_MerchantWireHashP *h_wire,
+                       const struct TALER_ExtensionContractHashP *h_extensions,
+                       const struct
+                       TALER_PrivateContractHashP *h_contract_terms,
                        struct GNUNET_TIME_Timestamp exchange_timestamp,
                        struct GNUNET_TIME_Timestamp refund_deadline,
                        struct GNUNET_TIME_Timestamp wire_deadline,
@@ -128,7 +129,7 @@ struct DepositContext
   /**
    * Hash of the payto URI.
    */
-  struct TALER_PaytoHash h_payto;
+  struct TALER_PaytoHashP h_payto;
 
   /**
    * Row of of the coin in the known_coins table.
@@ -254,7 +255,7 @@ TEH_handler_deposit (struct MHD_Connection *connection,
                                 &deposit.wire_deadline),
     GNUNET_JSON_spec_end ()
   };
-  struct TALER_MerchantWireHash h_wire;
+  struct TALER_MerchantWireHashP h_wire;
 
   memset (&deposit,
           0,
diff --git a/src/exchange/taler-exchange-httpd_deposits_get.c b/src/exchange/taler-exchange-httpd_deposits_get.c
index 9a33f2b71..fa1b530b2 100644
--- a/src/exchange/taler-exchange-httpd_deposits_get.c
+++ b/src/exchange/taler-exchange-httpd_deposits_get.c
@@ -47,8 +47,9 @@
  */
 static MHD_RESULT
 reply_deposit_details (struct MHD_Connection *connection,
-                       const struct TALER_PrivateContractHash *h_contract_terms,
-                       const struct TALER_MerchantWireHash *h_wire,
+                       const struct
+                       TALER_PrivateContractHashP *h_contract_terms,
+                       const struct TALER_MerchantWireHashP *h_wire,
                        const struct TALER_CoinSpendPublicKeyP *coin_pub,
                        const struct TALER_Amount *coin_contribution,
                        const struct TALER_WireTransferIdentifierRawP *wtid,
diff --git a/src/exchange/taler-exchange-httpd_keys.c b/src/exchange/taler-exchange-httpd_keys.c
index 60c9c6eb0..8d90afae6 100644
--- a/src/exchange/taler-exchange-httpd_keys.c
+++ b/src/exchange/taler-exchange-httpd_keys.c
@@ -80,7 +80,7 @@ struct HelperDenomination
   /**
    * Hash of the full denomination key.
    */
-  struct TALER_DenominationHash h_denom_pub;
+  struct TALER_DenominationHashP h_denom_pub;
 
   /**
    * Signature over this key from the security module's key.
@@ -1295,7 +1295,7 @@ static void
 denomination_info_cb (
   void *cls,
   const struct TALER_DenominationPublicKey *denom_pub,
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta,
   const struct TALER_MasterSignatureP *master_sig,
   bool recoup_possible)
@@ -1472,7 +1472,7 @@ static void
 auditor_denom_cb (
   void *cls,
   const struct TALER_AuditorPublicKeyP *auditor_pub,
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_AuditorSignatureP *auditor_sig)
 {
   struct TEH_KeyStateHandle *ksh = cls;
@@ -2386,7 +2386,8 @@ TEH_keys_get_state (void)
 
 
 struct TEH_DenominationKey *
-TEH_keys_denomination_by_hash (const struct TALER_DenominationHash *h_denom_pub,
+TEH_keys_denomination_by_hash (const struct
+                               TALER_DenominationHashP *h_denom_pub,
                                struct MHD_Connection *conn,
                                MHD_RESULT *mret)
 {
@@ -2411,7 +2412,7 @@ TEH_keys_denomination_by_hash (const struct TALER_DenominationHash *h_denom_pub,
 struct TEH_DenominationKey *
 TEH_keys_denomination_by_hash2 (
   struct TEH_KeyStateHandle *ksh,
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   struct MHD_Connection *conn,
   MHD_RESULT *mret)
 {
@@ -2433,7 +2434,7 @@ TEH_keys_denomination_by_hash2 (
 
 enum TALER_ErrorCode
 TEH_keys_denomination_sign_withdraw (
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_BlindedPlanchet *bp,
   struct TALER_BlindedDenominationSignature *bs)
 {
@@ -2472,7 +2473,7 @@ TEH_keys_denomination_sign_withdraw (
 
 enum TALER_ErrorCode
 TEH_keys_denomination_sign_melt (
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_BlindedPlanchet *bp,
   struct TALER_BlindedDenominationSignature *bs)
 {
@@ -2511,7 +2512,7 @@ TEH_keys_denomination_sign_melt (
 
 enum TALER_ErrorCode
 TEH_keys_denomination_cs_r_pub_melt (
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_CsNonce *nonce,
   struct TALER_DenominationCSPublicRPairP *r_pub)
 {
@@ -2543,7 +2544,7 @@ TEH_keys_denomination_cs_r_pub_melt (
 
 enum TALER_ErrorCode
 TEH_keys_denomination_cs_r_pub_withdraw (
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_CsNonce *nonce,
   struct TALER_DenominationCSPublicRPairP *r_pub)
 {
@@ -2574,7 +2575,7 @@ TEH_keys_denomination_cs_r_pub_withdraw (
 
 
 void
-TEH_keys_denomination_revoke (const struct TALER_DenominationHash *h_denom_pub)
+TEH_keys_denomination_revoke (const struct TALER_DenominationHashP *h_denom_pub)
 {
   struct TEH_KeyStateHandle *ksh;
   struct HelperDenomination *hd;
@@ -2897,7 +2898,7 @@ load_extension_data (const char *section_name,
 
 
 enum GNUNET_GenericReturnValue
-TEH_keys_load_fees (const struct TALER_DenominationHash *h_denom_pub,
+TEH_keys_load_fees (const struct TALER_DenominationHashP *h_denom_pub,
                     struct TALER_DenominationPublicKey *denom_pub,
                     struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta)
 {
diff --git a/src/exchange/taler-exchange-httpd_keys.h b/src/exchange/taler-exchange-httpd_keys.h
index 7c6fb3e33..ee9412a65 100644
--- a/src/exchange/taler-exchange-httpd_keys.h
+++ b/src/exchange/taler-exchange-httpd_keys.h
@@ -49,7 +49,7 @@ struct TEH_DenominationKey
   /**
    * Hash code of the denomination public key.
    */
-  struct TALER_DenominationHash h_denom_pub;
+  struct TALER_DenominationHashP h_denom_pub;
 
   /**
    * Meta data about the type of the denomination, such as fees and validity
@@ -141,7 +141,8 @@ TEH_keys_update_states (void);
  *         or NULL if @a h_denom_pub could not be found
  */
 struct TEH_DenominationKey *
-TEH_keys_denomination_by_hash (const struct TALER_DenominationHash *h_denom_pub,
+TEH_keys_denomination_by_hash (const struct
+                               TALER_DenominationHashP *h_denom_pub,
                                struct MHD_Connection *conn,
                                MHD_RESULT *mret);
 
@@ -162,7 +163,7 @@ TEH_keys_denomination_by_hash (const struct TALER_DenominationHash *h_denom_pub,
 struct TEH_DenominationKey *
 TEH_keys_denomination_by_hash2 (
   struct TEH_KeyStateHandle *ksh,
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   struct MHD_Connection *conn,
   MHD_RESULT *mret);
 
@@ -179,7 +180,7 @@ TEH_keys_denomination_by_hash2 (
  */
 enum TALER_ErrorCode
 TEH_keys_denomination_sign_withdraw (
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_BlindedPlanchet *bp,
   struct TALER_BlindedDenominationSignature *bs);
 
@@ -196,7 +197,7 @@ TEH_keys_denomination_sign_withdraw (
  */
 enum TALER_ErrorCode
 TEH_keys_denomination_sign_melt (
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_BlindedPlanchet *bp,
   struct TALER_BlindedDenominationSignature *bs);
 
@@ -212,7 +213,7 @@ TEH_keys_denomination_sign_melt (
  */
 enum TALER_ErrorCode
 TEH_keys_denomination_cs_r_pub_withdraw (
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_CsNonce *nonce,
   struct TALER_DenominationCSPublicRPairP *r_pub);
 
@@ -228,7 +229,7 @@ TEH_keys_denomination_cs_r_pub_withdraw (
  */
 enum TALER_ErrorCode
 TEH_keys_denomination_cs_r_pub_melt (
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const struct TALER_CsNonce *nonce,
   struct TALER_DenominationCSPublicRPairP *r_pub);
 
@@ -245,7 +246,8 @@ TEH_keys_denomination_cs_r_pub_melt (
  * @param h_denom_pub hash of the public key to revoke
  */
 void
-TEH_keys_denomination_revoke (const struct TALER_DenominationHash *h_denom_pub);
+TEH_keys_denomination_revoke (const struct
+                              TALER_DenominationHashP *h_denom_pub);
 
 
 /**
@@ -422,7 +424,7 @@ TEH_keys_management_get_keys_handler (const struct TEH_RequestHandler *rh,
  *         #GNUNET_SYSERR on hard errors
  */
 enum GNUNET_GenericReturnValue
-TEH_keys_load_fees (const struct TALER_DenominationHash *h_denom_pub,
+TEH_keys_load_fees (const struct TALER_DenominationHashP *h_denom_pub,
                     struct TALER_DenominationPublicKey *denom_pub,
                     struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta);
 
diff --git a/src/exchange/taler-exchange-httpd_kyc-check.c b/src/exchange/taler-exchange-httpd_kyc-check.c
index 7560d6262..1e7f4da12 100644
--- a/src/exchange/taler-exchange-httpd_kyc-check.c
+++ b/src/exchange/taler-exchange-httpd_kyc-check.c
@@ -73,12 +73,12 @@ struct KycPoller
    * Hash of the payto:// URI we are confirming to
    * have finished the KYC for.
    */
-  struct TALER_PaytoHash h_payto;
+  struct TALER_PaytoHashP h_payto;
 
   /**
    * Hash of the payto:// URI that was given to us for auth.
    */
-  struct TALER_PaytoHash auth_h_payto;
+  struct TALER_PaytoHashP auth_h_payto;
 
   /**
    * When will this request time out?
diff --git a/src/exchange/taler-exchange-httpd_management.h b/src/exchange/taler-exchange-httpd_management.h
index f0d922e64..67302c96c 100644
--- a/src/exchange/taler-exchange-httpd_management.h
+++ b/src/exchange/taler-exchange-httpd_management.h
@@ -64,7 +64,7 @@ TEH_handler_management_auditors_AP_disable (
 MHD_RESULT
 TEH_handler_management_denominations_HDP_revoke (
   struct MHD_Connection *connection,
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const json_t *root);
 
 
diff --git a/src/exchange/taler-exchange-httpd_management_denominations_HDP_revoke.c b/src/exchange/taler-exchange-httpd_management_denominations_HDP_revoke.c
index a8acf2f7a..ec5251a11 100644
--- a/src/exchange/taler-exchange-httpd_management_denominations_HDP_revoke.c
+++ b/src/exchange/taler-exchange-httpd_management_denominations_HDP_revoke.c
@@ -34,7 +34,7 @@
 MHD_RESULT
 TEH_handler_management_denominations_HDP_revoke (
   struct MHD_Connection *connection,
-  const struct TALER_DenominationHash *h_denom_pub,
+  const struct TALER_DenominationHashP *h_denom_pub,
   const json_t *root)
 {
   struct TALER_MasterSignatureP master_sig;
diff --git a/src/exchange/taler-exchange-httpd_management_extensions.c b/src/exchange/taler-exchange-httpd_management_extensions.c
index ab0287e33..41df22f68 100644
--- a/src/exchange/taler-exchange-httpd_management_extensions.c
+++ b/src/exchange/taler-exchange-httpd_management_extensions.c
@@ -234,7 +234,7 @@ TEH_handler_management_post_extensions (
 
   /* Verify the signature */
   {
-    struct TALER_ExtensionConfigHash h_config;
+    struct TALER_ExtensionConfigHashP h_config;
 
     if (GNUNET_OK !=
         TALER_JSON_extensions_config_hash (extensions, &h_config) ||
diff --git a/src/exchange/taler-exchange-httpd_management_post_keys.c b/src/exchange/taler-exchange-httpd_management_post_keys.c
index 2e48497a5..93b7252e3 100644
--- a/src/exchange/taler-exchange-httpd_management_post_keys.c
+++ b/src/exchange/taler-exchange-httpd_management_post_keys.c
@@ -40,7 +40,7 @@ struct DenomSig
   /**
    * Hash of a denomination public key.
    */
-  struct TALER_DenominationHash h_denom_pub;
+  struct TALER_DenominationHashP h_denom_pub;
 
   /**
    * Master signature for the @e h_denom_pub.
diff --git a/src/exchange/taler-exchange-httpd_melt.c b/src/exchange/taler-exchange-httpd_melt.c
index 1585af71f..03075280d 100644
--- a/src/exchange/taler-exchange-httpd_melt.c
+++ b/src/exchange/taler-exchange-httpd_melt.c
@@ -362,7 +362,7 @@ check_melt_valid (struct MHD_Connection *connection,
   if (GNUNET_TIME_absolute_is_past (dk->meta.expire_deposit.abs_time))
   {
     /* We are past deposit expiration time, but maybe this is a zombie? */
-    struct TALER_DenominationHash denom_hash;
+    struct TALER_DenominationHashP denom_hash;
     enum GNUNET_DB_QueryStatus qs;
 
     /* Check that the coin is dirty (we have seen it before), as we will
diff --git a/src/exchange/taler-exchange-httpd_recoup-refresh.c b/src/exchange/taler-exchange-httpd_recoup-refresh.c
index 4326dfe4b..d21aa02ce 100644
--- a/src/exchange/taler-exchange-httpd_recoup-refresh.c
+++ b/src/exchange/taler-exchange-httpd_recoup-refresh.c
@@ -180,7 +180,7 @@ verify_and_execute_recoup_refresh (
   struct RecoupContext pc;
   const struct TEH_DenominationKey *dk;
   MHD_RESULT mret;
-  struct TALER_BlindedCoinHash h_blind;
+  struct TALER_BlindedCoinHashP h_blind;
 
   /* check denomination exists and is in recoup mode */
   dk = TEH_keys_denomination_by_hash (&coin->denom_pub_hash,
@@ -245,7 +245,7 @@ verify_and_execute_recoup_refresh (
   }
 
   {
-    struct TALER_CoinPubHash c_hash;
+    struct TALER_CoinPubHashP c_hash;
     struct TALER_BlindedPlanchet blinded_planchet;
 
     if (GNUNET_OK !=
diff --git a/src/exchange/taler-exchange-httpd_recoup.c b/src/exchange/taler-exchange-httpd_recoup.c
index 0f6bb2460..da576e94f 100644
--- a/src/exchange/taler-exchange-httpd_recoup.c
+++ b/src/exchange/taler-exchange-httpd_recoup.c
@@ -42,7 +42,7 @@ struct RecoupContext
   /**
    * Hash identifying the withdraw request.
    */
-  struct TALER_BlindedCoinHash h_coin_ev;
+  struct TALER_BlindedCoinHashP h_coin_ev;
 
   /**
    * Set by #recoup_transaction() to the reserve that will
@@ -250,7 +250,7 @@ verify_and_execute_recoup (
      (a bit later) check that this coin was indeed
      signed by us. */
   {
-    struct TALER_CoinPubHash c_hash;
+    struct TALER_CoinPubHashP c_hash;
     struct TALER_BlindedPlanchet blinded_planchet;
 
     if (GNUNET_OK !=
diff --git a/src/exchange/taler-exchange-httpd_refreshes_reveal.c b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
index 0a4dd638b..bace776da 100644
--- a/src/exchange/taler-exchange-httpd_refreshes_reveal.c
+++ b/src/exchange/taler-exchange-httpd_refreshes_reveal.c
@@ -279,7 +279,7 @@ check_commitment (struct RevealContext *rctx,
             = &rctx->rrcs[j].exchange_vals;
           struct TALER_PlanchetDetail pd;
           struct TALER_AgeCommitmentHash *hac = NULL;
-          struct TALER_CoinPubHash c_hash;
+          struct TALER_CoinPubHashP c_hash;
           struct TALER_PlanchetMasterSecretP ps;
 
           rcd->dk = &rctx->dks[j]->denom_pub;
diff --git a/src/exchange/taler-exchange-httpd_refund.c b/src/exchange/taler-exchange-httpd_refund.c
index 628fe6993..70ab3fd0f 100644
--- a/src/exchange/taler-exchange-httpd_refund.c
+++ b/src/exchange/taler-exchange-httpd_refund.c
@@ -204,7 +204,7 @@ static MHD_RESULT
 verify_and_execute_refund (struct MHD_Connection *connection,
                            struct TALER_EXCHANGEDB_Refund *refund)
 {
-  struct TALER_DenominationHash denom_hash;
+  struct TALER_DenominationHashP denom_hash;
   struct RefundContext rctx = {
     .refund = refund
   };
diff --git a/src/exchange/taler-exchange-httpd_responses.c b/src/exchange/taler-exchange-httpd_responses.c
index ad10cc18f..9007e9d9f 100644
--- a/src/exchange/taler-exchange-httpd_responses.c
+++ b/src/exchange/taler-exchange-httpd_responses.c
@@ -61,7 +61,7 @@ TEH_RESPONSE_compile_transaction_history (
       {
         const struct TALER_EXCHANGEDB_DepositListEntry *deposit =
           pos->details.deposit;
-        struct TALER_MerchantWireHash h_wire;
+        struct TALER_MerchantWireHashP h_wire;
 
         TALER_merchant_wire_signature_hash (deposit->receiver_wire_account,
                                             &deposit->wire_salt,
@@ -410,7 +410,7 @@ TEH_RESPONSE_compile_transaction_history (
 MHD_RESULT
 TEH_RESPONSE_reply_unknown_denom_pub_hash (
   struct MHD_Connection *connection,
-  const struct TALER_DenominationHash *dph)
+  const struct TALER_DenominationHashP *dph)
 {
   struct TALER_ExchangePublicKeyP epub;
   struct TALER_ExchangeSignatureP esig;
@@ -456,7 +456,7 @@ TEH_RESPONSE_reply_unknown_denom_pub_hash (
 MHD_RESULT
 TEH_RESPONSE_reply_expired_denom_pub_hash (
   struct MHD_Connection *connection,
-  const struct TALER_DenominationHash *dph,
+  const struct TALER_DenominationHashP *dph,
   enum TALER_ErrorCode ec,
   const char *oper)
 {
@@ -509,7 +509,7 @@ TEH_RESPONSE_reply_expired_denom_pub_hash (
 MHD_RESULT
 TEH_RESPONSE_reply_invalid_denom_cipher_for_operation (
   struct MHD_Connection *connection,
-  const struct TALER_DenominationHash *dph)
+  const struct TALER_DenominationHashP *dph)
 {
   struct TALER_ExchangePublicKeyP epub;
   struct TALER_ExchangeSignatureP esig;
diff --git a/src/exchange/taler-exchange-httpd_responses.h b/src/exchange/taler-exchange-httpd_responses.h
index 48309a41d..ffd2cc9e1 100644
--- a/src/exchange/taler-exchange-httpd_responses.h
+++ b/src/exchange/taler-exchange-httpd_responses.h
@@ -58,7 +58,7 @@ TEH_RESPONSE_compile_reserve_history (
 MHD_RESULT
 TEH_RESPONSE_reply_unknown_denom_pub_hash (
   struct MHD_Connection *connection,
-  const struct TALER_DenominationHash *dph);
+  const struct TALER_DenominationHashP *dph);
 
 
 /**
@@ -74,7 +74,7 @@ TEH_RESPONSE_reply_unknown_denom_pub_hash (
 MHD_RESULT
 TEH_RESPONSE_reply_expired_denom_pub_hash (
   struct MHD_Connection *connection,
-  const struct TALER_DenominationHash *dph,
+  const struct TALER_DenominationHashP *dph,
   enum TALER_ErrorCode ec,
   const char *oper);
 
@@ -89,7 +89,7 @@ TEH_RESPONSE_reply_expired_denom_pub_hash (
 MHD_RESULT
 TEH_RESPONSE_reply_invalid_denom_cipher_for_operation (
   struct MHD_Connection *connection,
-  const struct TALER_DenominationHash *dph);
+  const struct TALER_DenominationHashP *dph);
 
 
 /**
diff --git a/src/exchange/taler-exchange-httpd_transfers_get.c b/src/exchange/taler-exchange-httpd_transfers_get.c
index 7ca0da974..99946a326 100644
--- a/src/exchange/taler-exchange-httpd_transfers_get.c
+++ b/src/exchange/taler-exchange-httpd_transfers_get.c
@@ -51,7 +51,7 @@ struct AggregatedDepositDetail
   /**
    * Hash of the contract terms.
    */
-  struct TALER_PrivateContractHash h_contract_terms;
+  struct TALER_PrivateContractHashP h_contract_terms;
 
   /**
    * Coin's public key of the deposited coin.
@@ -273,7 +273,7 @@ handle_deposit_data (void *cls,
                      const struct TALER_MerchantPublicKeyP *merchant_pub,
                      const char *account_payto_uri,
                      struct GNUNET_TIME_Timestamp exec_time,
-                     const struct TALER_PrivateContractHash *h_contract_terms,
+                     const struct TALER_PrivateContractHashP *h_contract_terms,
                      const struct TALER_DenominationPublicKey *denom_pub,
                      const struct TALER_CoinSpendPublicKeyP *coin_pub,
                      const struct TALER_Amount *deposit_value,
diff --git a/src/exchange/taler-exchange-httpd_withdraw.c b/src/exchange/taler-exchange-httpd_withdraw.c
index 5f159a429..ac47824e5 100644
--- a/src/exchange/taler-exchange-httpd_withdraw.c
+++ b/src/exchange/taler-exchange-httpd_withdraw.c
@@ -94,7 +94,7 @@ struct WithdrawContext
   /**
    * Hash of the (blinded) message to be signed by the Exchange.
    */
-  struct TALER_BlindedCoinHash h_coin_envelope;
+  struct TALER_BlindedCoinHashP h_coin_envelope;
 
   /**
    * Value of the coin being exchanged (matching the denomination key)