diff options
author | Christian Grothoff <christian@grothoff.org> | 2022-02-21 00:23:23 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2022-02-21 00:23:23 +0100 |
commit | 544ba42f445cbff2f544d7e1c83aaffcfa75af3a (patch) | |
tree | f942bcc479657e794b01c94c796013aa58098781 /src/include | |
parent | 19624fd776f28812354f7e2b50b26e984ff077ab (diff) | |
download | exchange-544ba42f445cbff2f544d7e1c83aaffcfa75af3a.tar.xz |
-big renaming of structs for consistent naming with P suffix
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/taler_auditor_service.h | 6 | ||||
-rw-r--r-- | src/include/taler_auditordb_plugin.h | 64 | ||||
-rw-r--r-- | src/include/taler_crypto_lib.h | 114 | ||||
-rw-r--r-- | src/include/taler_exchange_service.h | 33 | ||||
-rw-r--r-- | src/include/taler_exchangedb_plugin.h | 96 | ||||
-rw-r--r-- | src/include/taler_json_lib.h | 8 | ||||
-rw-r--r-- | src/include/taler_signatures.h | 72 |
7 files changed, 197 insertions, 196 deletions
diff --git a/src/include/taler_auditor_service.h b/src/include/taler_auditor_service.h index 1d252f9d2..30d18e6e9 100644 --- a/src/include/taler_auditor_service.h +++ b/src/include/taler_auditor_service.h @@ -256,9 +256,9 @@ typedef void struct TALER_AUDITOR_DepositConfirmationHandle * TALER_AUDITOR_deposit_confirmation ( struct TALER_AUDITOR_Handle *auditor, - 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 wire_deadline, struct GNUNET_TIME_Timestamp refund_deadline, diff --git a/src/include/taler_auditordb_plugin.h b/src/include/taler_auditordb_plugin.h index e4ff8e8e2..71cd79808 100644 --- a/src/include/taler_auditordb_plugin.h +++ b/src/include/taler_auditordb_plugin.h @@ -62,7 +62,7 @@ typedef void typedef enum GNUNET_GenericReturnValue (*TALER_AUDITORDB_HistoricDenominationRevenueDataCallback)( void *cls, - const struct TALER_DenominationHash *denom_pub_hash, + const struct TALER_DenominationHashP *denom_pub_hash, struct GNUNET_TIME_Timestamp revenue_timestamp, const struct TALER_Amount *revenue_balance, const struct TALER_Amount *loss_balance); @@ -274,17 +274,17 @@ struct TALER_AUDITORDB_DepositConfirmation /** * Hash over the contract for which this deposit is made. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Hash over the extensions for the deposit. */ - struct TALER_ExtensionContractHash h_extensions; + struct TALER_ExtensionContractHashP h_extensions; /** * Hash over the wiring information of the merchant. */ - struct TALER_MerchantWireHash h_wire; + struct TALER_MerchantWireHashP h_wire; /** * Time when this deposit confirmation was generated by the exchange. @@ -1048,14 +1048,14 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*insert_denomination_balance)(void *cls, - const struct - TALER_DenominationHash *denom_pub_hash, - const struct TALER_Amount *denom_balance, - const struct TALER_Amount *denom_loss, - const struct TALER_Amount *denom_risk, - const struct TALER_Amount *recoup_loss, - uint64_t num_issued); + (*insert_denomination_balance)( + void *cls, + const struct TALER_DenominationHashP *denom_pub_hash, + const struct TALER_Amount *denom_balance, + const struct TALER_Amount *denom_loss, + const struct TALER_Amount *denom_risk, + const struct TALER_Amount *recoup_loss, + uint64_t num_issued); /** @@ -1072,14 +1072,14 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*update_denomination_balance)(void *cls, - const struct - TALER_DenominationHash *denom_pub_hash, - const struct TALER_Amount *denom_balance, - const struct TALER_Amount *denom_loss, - const struct TALER_Amount *denom_risk, - const struct TALER_Amount *recoup_loss, - uint64_t num_issued); + (*update_denomination_balance)( + void *cls, + const struct TALER_DenominationHashP *denom_pub_hash, + const struct TALER_Amount *denom_balance, + const struct TALER_Amount *denom_loss, + const struct TALER_Amount *denom_risk, + const struct TALER_Amount *recoup_loss, + uint64_t num_issued); /** @@ -1095,14 +1095,14 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*get_denomination_balance)(void *cls, - const struct - TALER_DenominationHash *denom_pub_hash, - struct TALER_Amount *denom_balance, - struct TALER_Amount *denom_loss, - struct TALER_Amount *denom_risk, - struct TALER_Amount *recoup_loss, - uint64_t *num_issued); + (*get_denomination_balance)( + void *cls, + const struct TALER_DenominationHashP *denom_pub_hash, + struct TALER_Amount *denom_balance, + struct TALER_Amount *denom_loss, + struct TALER_Amount *denom_risk, + struct TALER_Amount *recoup_loss, + uint64_t *num_issued); /** @@ -1113,9 +1113,9 @@ struct TALER_AUDITORDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*del_denomination_balance)(void *cls, - const struct - TALER_DenominationHash *denom_pub_hash); + (*del_denomination_balance)( + void *cls, + const struct TALER_DenominationHashP *denom_pub_hash); /** @@ -1219,7 +1219,7 @@ struct TALER_AUDITORDB_Plugin (*insert_historic_denom_revenue)( void *cls, const struct TALER_MasterPublicKeyP *master_pub, - const struct TALER_DenominationHash *denom_pub_hash, + const struct TALER_DenominationHashP *denom_pub_hash, struct GNUNET_TIME_Timestamp revenue_timestamp, const struct TALER_Amount *revenue_balance, const struct TALER_Amount *recoup_loss_balance); diff --git a/src/include/taler_crypto_lib.h b/src/include/taler_crypto_lib.h index 793b16eec..20b9ff303 100644 --- a/src/include/taler_crypto_lib.h +++ b/src/include/taler_crypto_lib.h @@ -489,7 +489,7 @@ struct TALER_RefreshMasterSecretP * Hash used to represent a denomination public key * and associated age restrictions (if any). */ -struct TALER_DenominationHash +struct TALER_DenominationHashP { /** * Actual hash value. @@ -502,7 +502,7 @@ struct TALER_DenominationHash * Hash used to represent the private part * of a contract between merchant and consumer. */ -struct TALER_PrivateContractHash +struct TALER_PrivateContractHashP { /** * Actual hash value. @@ -515,7 +515,7 @@ struct TALER_PrivateContractHash * Hash used to represent the "public" extensions to * a contract that is shared with the exchange. */ -struct TALER_ExtensionContractHash +struct TALER_ExtensionContractHashP { /** * Actual hash value. @@ -528,7 +528,7 @@ struct TALER_ExtensionContractHash * Hash used to represent the salted hash of a * merchant's bank account. */ -struct TALER_MerchantWireHash +struct TALER_MerchantWireHashP { /** * Actual hash value. @@ -541,7 +541,7 @@ struct TALER_MerchantWireHash * Hash used to represent the unsalted hash of a * payto:// URI representing a bank account. */ -struct TALER_PaytoHash +struct TALER_PaytoHashP { /** * Actual hash value. @@ -554,7 +554,7 @@ struct TALER_PaytoHash * Hash used to represent a commitment to a blinded * coin, i.e. the hash of the envelope. */ -struct TALER_BlindedCoinHash +struct TALER_BlindedCoinHashP { /** * Actual hash value. @@ -567,7 +567,7 @@ struct TALER_BlindedCoinHash * Hash used to represent the hash of the public * key of a coin (without blinding). */ -struct TALER_CoinPubHash +struct TALER_CoinPubHashP { /** * Actual hash value. @@ -604,7 +604,7 @@ struct TALER_PickupIdentifierP * @brief Salted hash over the JSON object representing the configuration of an * extension. */ -struct TALER_ExtensionConfigHash +struct TALER_ExtensionConfigHashP { /** * Actual hash value. @@ -1047,7 +1047,7 @@ struct TALER_CoinPublicInfo * Hash of the public key representing the denomination of the coin that is * being deposited. */ - struct TALER_DenominationHash denom_pub_hash; + struct TALER_DenominationHashP denom_pub_hash; /** * Hash of the age commitment. If no age commitment was provided, it must be @@ -1072,7 +1072,7 @@ struct TALER_TrackTransferDetails /** * Hash of the proposal data. */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Which coin was deposited? @@ -1227,7 +1227,7 @@ TALER_denom_blind (const struct TALER_DenominationPublicKey *dk, const struct TALER_AgeCommitmentHash *age_commitment_hash, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_ExchangeWithdrawValues *alg_values, - struct TALER_CoinPubHash *c_hash, + struct TALER_CoinPubHashP *c_hash, struct TALER_BlindedPlanchet *blinded_planchet); @@ -1263,7 +1263,7 @@ TALER_denom_sig_unblind ( struct TALER_DenominationSignature *denom_sig, const struct TALER_BlindedDenominationSignature *bdenom_sig, const union TALER_DenominationBlindingKeyP *bks, - const struct TALER_CoinPubHash *c_hash, + const struct TALER_CoinPubHashP *c_hash, const struct TALER_ExchangeWithdrawValues *alg_values, const struct TALER_DenominationPublicKey *denom_pub); @@ -1286,7 +1286,7 @@ TALER_blinded_denom_sig_free ( */ void TALER_denom_pub_hash (const struct TALER_DenominationPublicKey *denom_pub, - struct TALER_DenominationHash *denom_hash); + struct TALER_DenominationHashP *denom_hash); /** @@ -1401,7 +1401,7 @@ TALER_denom_priv_to_pub (const struct TALER_DenominationPrivateKey *denom_priv, enum GNUNET_GenericReturnValue TALER_denom_pub_verify (const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_DenominationSignature *denom_sig, - const struct TALER_CoinPubHash *c_hash); + const struct TALER_CoinPubHashP *c_hash); /** @@ -1429,8 +1429,8 @@ TALER_test_coin_valid (const struct TALER_CoinPublicInfo *coin_public_info, */ enum GNUNET_GenericReturnValue TALER_coin_ev_hash (const struct TALER_BlindedPlanchet *blinded_planchet, - const struct TALER_DenominationHash *denom_hash, - struct TALER_BlindedCoinHash *bch); + const struct TALER_DenominationHashP *denom_hash, + struct TALER_BlindedCoinHashP *bch); /** @@ -1443,7 +1443,7 @@ TALER_coin_ev_hash (const struct TALER_BlindedPlanchet *blinded_planchet, void TALER_coin_pub_hash (const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_AgeCommitmentHash *age_commitment_hash, - struct TALER_CoinPubHash *coin_h); + struct TALER_CoinPubHashP *coin_h); /** @@ -1454,7 +1454,7 @@ TALER_coin_pub_hash (const struct TALER_CoinSpendPublicKeyP *coin_pub, */ void TALER_payto_hash (const char *payto, - struct TALER_PaytoHash *h_payto); + struct TALER_PaytoHashP *h_payto); /** * Details about a planchet that the customer wants to obtain @@ -1467,7 +1467,7 @@ struct TALER_PlanchetDetail /** * Hash of the denomination public key. */ - struct TALER_DenominationHash denom_pub_hash; + struct TALER_DenominationHashP denom_pub_hash; /** * The blinded planchet @@ -1681,7 +1681,7 @@ TALER_planchet_prepare (const struct TALER_DenominationPublicKey *dk, const union TALER_DenominationBlindingKeyP *bks, const struct TALER_CoinSpendPrivateKeyP *coin_priv, const struct TALER_AgeCommitmentHash *ach, - struct TALER_CoinPubHash *c_hash, + struct TALER_CoinPubHashP *c_hash, struct TALER_PlanchetDetail *pd); @@ -1725,7 +1725,7 @@ TALER_planchet_to_coin ( const union TALER_DenominationBlindingKeyP *bks, const struct TALER_CoinSpendPrivateKeyP *coin_priv, const struct TALER_AgeCommitmentHash *ach, - const struct TALER_CoinPubHash *c_hash, + const struct TALER_CoinPubHashP *c_hash, const struct TALER_ExchangeWithdrawValues *alg_values, struct TALER_FreshCoin *coin); @@ -2320,9 +2320,9 @@ TALER_CRYPTO_helper_esign_disconnect ( */ enum GNUNET_GenericReturnValue TALER_exchange_deposit_confirm_verify ( - const struct TALER_PrivateContractHash *h_contract_terms, - const struct TALER_MerchantWireHash *h_wire, - const struct TALER_ExtensionContractHash *h_extensions, + const struct TALER_PrivateContractHashP *h_contract_terms, + const struct TALER_MerchantWireHashP *h_wire, + const struct TALER_ExtensionContractHashP *h_extensions, struct GNUNET_TIME_Timestamp exchange_timestamp, struct GNUNET_TIME_Timestamp wire_deadline, struct GNUNET_TIME_Timestamp refund_deadline, @@ -2367,11 +2367,11 @@ void TALER_wallet_deposit_sign ( const struct TALER_Amount *amount, const struct TALER_Amount *deposit_fee, - const struct TALER_MerchantWireHash *h_wire, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_MerchantWireHashP *h_wire, + const struct TALER_PrivateContractHashP *h_contract_terms, const struct TALER_AgeCommitmentHash *h_age_commitment, - const struct TALER_ExtensionContractHash *h_extensions, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_ExtensionContractHashP *h_extensions, + const struct TALER_DenominationHashP *h_denom_pub, struct GNUNET_TIME_Timestamp wallet_timestamp, const struct TALER_MerchantPublicKeyP *merchant_pub, struct GNUNET_TIME_Timestamp refund_deadline, @@ -2400,11 +2400,11 @@ enum GNUNET_GenericReturnValue TALER_wallet_deposit_verify ( const struct TALER_Amount *amount, const struct TALER_Amount *deposit_fee, - const struct TALER_MerchantWireHash *h_wire, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_MerchantWireHashP *h_wire, + const struct TALER_PrivateContractHashP *h_contract_terms, const struct TALER_AgeCommitmentHash *h_commitment_hash, - const struct TALER_ExtensionContractHash *h_extensions, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_ExtensionContractHashP *h_extensions, + const struct TALER_DenominationHashP *h_denom_pub, struct GNUNET_TIME_Timestamp wallet_timestamp, const struct TALER_MerchantPublicKeyP *merchant_pub, struct GNUNET_TIME_Timestamp refund_deadline, @@ -2427,7 +2427,7 @@ TALER_wallet_melt_sign ( const struct TALER_Amount *amount_with_fee, const struct TALER_Amount *melt_fee, const struct TALER_RefreshCommitmentP *rc, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_CoinSpendPrivateKeyP *coin_priv, struct TALER_CoinSpendSignatureP *coin_sig); @@ -2449,7 +2449,7 @@ TALER_wallet_melt_verify ( const struct TALER_Amount *amount_with_fee, const struct TALER_Amount *melt_fee, const struct TALER_RefreshCommitmentP *rc, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_AgeCommitmentHash *h_age_commitment, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendSignatureP *coin_sig); @@ -2466,9 +2466,9 @@ TALER_wallet_melt_verify ( */ void TALER_wallet_link_sign ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_TransferPublicKeyP *transfer_pub, - const struct TALER_BlindedCoinHash *bch, + const struct TALER_BlindedCoinHashP *bch, const struct TALER_CoinSpendPrivateKeyP *old_coin_priv, struct TALER_CoinSpendSignatureP *coin_sig); @@ -2485,9 +2485,9 @@ TALER_wallet_link_sign ( */ enum GNUNET_GenericReturnValue TALER_wallet_link_verify ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_TransferPublicKeyP *transfer_pub, - const struct TALER_BlindedCoinHash *h_coin_ev, + const struct TALER_BlindedCoinHashP *h_coin_ev, const struct TALER_CoinSpendPublicKeyP *old_coin_pub, const struct TALER_CoinSpendSignatureP *coin_sig); @@ -2503,9 +2503,9 @@ TALER_wallet_link_verify ( */ void TALER_wallet_withdraw_sign ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_Amount *amount_with_fee, - const struct TALER_BlindedCoinHash *bch, + const struct TALER_BlindedCoinHashP *bch, const struct TALER_ReservePrivateKeyP *reserve_priv, struct TALER_ReserveSignatureP *reserve_sig); @@ -2522,9 +2522,9 @@ TALER_wallet_withdraw_sign ( */ enum GNUNET_GenericReturnValue TALER_wallet_withdraw_verify ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_Amount *amount_with_fee, - const struct TALER_BlindedCoinHash *bch, + const struct TALER_BlindedCoinHashP *bch, const struct TALER_ReservePublicKeyP *reserve_pub, const struct TALER_ReserveSignatureP *reserve_sig); @@ -2557,7 +2557,7 @@ TALER_exchange_melt_confirmation_verify ( */ enum GNUNET_GenericReturnValue TALER_wallet_recoup_verify ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const union TALER_DenominationBlindingKeyP *coin_bks, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendSignatureP *coin_sig); @@ -2573,7 +2573,7 @@ TALER_wallet_recoup_verify ( */ void TALER_wallet_recoup_sign ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const union TALER_DenominationBlindingKeyP *coin_bks, const struct TALER_CoinSpendPrivateKeyP *coin_priv, struct TALER_CoinSpendSignatureP *coin_sig); @@ -2590,7 +2590,7 @@ TALER_wallet_recoup_sign ( */ enum GNUNET_GenericReturnValue TALER_wallet_recoup_refresh_verify ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const union TALER_DenominationBlindingKeyP *coin_bks, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_CoinSpendSignatureP *coin_sig); @@ -2606,7 +2606,7 @@ TALER_wallet_recoup_refresh_verify ( */ void TALER_wallet_recoup_refresh_sign ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const union TALER_DenominationBlindingKeyP *coin_bks, const struct TALER_CoinSpendPrivateKeyP *coin_priv, struct TALER_CoinSpendSignatureP *coin_sig); @@ -2628,7 +2628,7 @@ TALER_wallet_recoup_refresh_sign ( void TALER_merchant_refund_sign ( const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, uint64_t rtransaction_id, const struct TALER_Amount *amount, const struct TALER_MerchantPrivateKeyP *merchant_priv, @@ -2649,7 +2649,7 @@ TALER_merchant_refund_sign ( enum GNUNET_GenericReturnValue TALER_merchant_refund_verify ( const struct TALER_CoinSpendPublicKeyP *coin_pub, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, uint64_t rtransaction_id, const struct TALER_Amount *amount, const struct TALER_MerchantPublicKeyP *merchant_pub, @@ -2738,7 +2738,7 @@ TALER_exchange_offline_auditor_del_verify ( */ void TALER_exchange_offline_denomination_revoke_sign ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_MasterPrivateKeyP *master_priv, struct TALER_MasterSignatureP *master_sig); @@ -2753,7 +2753,7 @@ TALER_exchange_offline_denomination_revoke_sign ( */ enum GNUNET_GenericReturnValue TALER_exchange_offline_denomination_revoke_verify ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_MasterPublicKeyP *master_pub, const struct TALER_MasterSignatureP *master_sig); @@ -2843,7 +2843,7 @@ TALER_exchange_offline_signkey_validity_verify ( */ void TALER_exchange_offline_denom_validity_sign ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, struct GNUNET_TIME_Timestamp stamp_start, struct GNUNET_TIME_Timestamp stamp_expire_withdraw, struct GNUNET_TIME_Timestamp stamp_expire_deposit, @@ -2870,7 +2870,7 @@ TALER_exchange_offline_denom_validity_sign ( */ enum GNUNET_GenericReturnValue TALER_exchange_offline_denom_validity_verify ( - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, struct GNUNET_TIME_Timestamp stamp_start, struct GNUNET_TIME_Timestamp stamp_expire_withdraw, struct GNUNET_TIME_Timestamp stamp_expire_deposit, @@ -3018,7 +3018,7 @@ TALER_exchange_secmod_cs_verify ( void TALER_auditor_denom_validity_sign ( const char *auditor_url, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_MasterPublicKeyP *master_pub, struct GNUNET_TIME_Timestamp stamp_start, struct GNUNET_TIME_Timestamp stamp_expire_withdraw, @@ -3049,7 +3049,7 @@ TALER_auditor_denom_validity_sign ( enum GNUNET_GenericReturnValue TALER_auditor_denom_validity_verify ( const char *auditor_url, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_MasterPublicKeyP *master_pub, struct GNUNET_TIME_Timestamp stamp_start, struct GNUNET_TIME_Timestamp stamp_expire_withdraw, @@ -3216,7 +3216,7 @@ TALER_exchange_wire_signature_make ( void TALER_merchant_wire_signature_hash (const char *payto_uri, const struct TALER_WireSaltP *salt, - struct TALER_MerchantWireHash *hc); + struct TALER_MerchantWireHashP *hc); /** @@ -3263,7 +3263,7 @@ TALER_merchant_wire_signature_make ( */ void TALER_exchange_offline_extension_config_hash_sign ( - const struct TALER_ExtensionConfigHash *h_config, + const struct TALER_ExtensionConfigHashP *h_config, const struct TALER_MasterPrivateKeyP *master_priv, struct TALER_MasterSignatureP *master_sig); @@ -3279,7 +3279,7 @@ TALER_exchange_offline_extension_config_hash_sign ( */ enum GNUNET_GenericReturnValue TALER_exchange_offline_extension_config_hash_verify ( - const struct TALER_ExtensionConfigHash *h_config, + const struct TALER_ExtensionConfigHashP *h_config, const struct TALER_MasterPublicKeyP *master_pub, const struct TALER_MasterSignatureP *master_sig ); diff --git a/src/include/taler_exchange_service.h b/src/include/taler_exchange_service.h index 666bf101b..92e841ef2 100644 --- a/src/include/taler_exchange_service.h +++ b/src/include/taler_exchange_service.h @@ -97,7 +97,7 @@ struct TALER_EXCHANGE_DenomPublicKey /** * The hash of the public key. */ - struct TALER_DenominationHash h_key; + struct TALER_DenominationHashP h_key; /** * Exchange's master signature over this denomination record. @@ -609,7 +609,7 @@ TALER_EXCHANGE_destroy_denomination_key ( const struct TALER_EXCHANGE_DenomPublicKey * TALER_EXCHANGE_get_denomination_key_by_hash ( const struct TALER_EXCHANGE_Keys *keys, - const struct TALER_DenominationHash *hc); + const struct TALER_DenominationHashP *hc); /** @@ -775,10 +775,10 @@ void TALER_EXCHANGE_deposit_permission_sign ( const struct TALER_Amount *amount, const struct TALER_Amount *deposit_fee, - const struct TALER_MerchantWireHash *h_wire, - const struct TALER_PrivateContractHash *h_contract_terms, - const struct TALER_ExtensionContractHash *h_extensions, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_MerchantWireHashP *h_wire, + const struct TALER_PrivateContractHashP *h_contract_terms, + const struct TALER_ExtensionContractHashP *h_extensions, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_CoinSpendPrivateKeyP *coin_priv, const struct TALER_AgeCommitment *age_commitment, struct GNUNET_TIME_Timestamp wallet_timestamp, @@ -905,7 +905,7 @@ TALER_EXCHANGE_deposit ( struct GNUNET_TIME_Timestamp wire_deadline, const char *merchant_payto_uri, const struct TALER_WireSaltP *wire_salt, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, const struct TALER_AgeCommitmentHash *h_age_commitment, const json_t *extension_details, const struct TALER_CoinSpendPublicKeyP *coin_pub, @@ -996,7 +996,8 @@ typedef void struct TALER_EXCHANGE_RefundHandle * TALER_EXCHANGE_refund (struct TALER_EXCHANGE_Handle *exchange, const struct TALER_Amount *amount, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct + TALER_PrivateContractHashP *h_contract_terms, const struct TALER_CoinSpendPublicKeyP *coin_pub, uint64_t rtransaction_id, const struct TALER_MerchantPrivateKeyP *merchant_priv, @@ -2125,7 +2126,7 @@ struct TALER_EXCHANGE_TransferData /** * hash of the payto:// URI the transfer went to */ - struct TALER_PaytoHash h_payto; + struct TALER_PaytoHashP h_payto; /** * time when the exchange claims to have performed the wire transfer @@ -2324,8 +2325,8 @@ struct TALER_EXCHANGE_DepositGetHandle * TALER_EXCHANGE_deposits_get ( struct TALER_EXCHANGE_Handle *exchange, const struct TALER_MerchantPrivateKeyP *merchant_priv, - const struct TALER_MerchantWireHash *h_wire, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_MerchantWireHashP *h_wire, + const struct TALER_PrivateContractHashP *h_contract_terms, const struct TALER_CoinSpendPublicKeyP *coin_pub, TALER_EXCHANGE_DepositGetCallback cb, void *cb_cls); @@ -2360,7 +2361,7 @@ TALER_EXCHANGE_verify_coin_history ( const char *currency, const struct TALER_CoinSpendPublicKeyP *coin_pub, json_t *history, - struct TALER_DenominationHash *h_denom_pub, + struct TALER_DenominationHashP *h_denom_pub, struct TALER_Amount *total); @@ -2622,7 +2623,7 @@ typedef void struct TALER_EXCHANGE_KycCheckHandle * TALER_EXCHANGE_kyc_check (struct TALER_EXCHANGE_Handle *eh, uint64_t payment_target, - const struct TALER_PaytoHash *h_payto, + const struct TALER_PaytoHashP *h_payto, struct GNUNET_TIME_Relative timeout, TALER_EXCHANGE_KycStatusCallback cb, void *cb_cls); @@ -3010,7 +3011,7 @@ struct TALER_EXCHANGE_DenominationKeySignature /** * The hash of the denomination's public key */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; /** * Signature over this denomination key by the exchange's master signature. @@ -3187,7 +3188,7 @@ struct TALER_EXCHANGE_ManagementRevokeDenominationKeyHandle * TALER_EXCHANGE_management_revoke_denomination_key ( struct GNUNET_CURL_Context *ctx, const char *url, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_MasterSignatureP *master_sig, TALER_EXCHANGE_ManagementRevokeDenominationKeyCallback cb, void *cb_cls); @@ -3559,7 +3560,7 @@ struct TALER_EXCHANGE_AuditorAddDenominationHandle * TALER_EXCHANGE_add_auditor_denomination ( struct GNUNET_CURL_Context *ctx, const char *url, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_AuditorPublicKeyP *auditor_pub, const struct TALER_AuditorSignatureP *auditor_sig, TALER_EXCHANGE_AuditorAddDenominationCallback cb, diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h index b6eee195e..10ab1ac94 100644 --- a/src/include/taler_exchangedb_plugin.h +++ b/src/include/taler_exchangedb_plugin.h @@ -109,7 +109,7 @@ struct TALER_KycCompletedEventP /** * Public key of the reserve the event is about. */ - struct TALER_PaytoHash h_payto; + struct TALER_PaytoHashP h_payto; }; @@ -257,7 +257,7 @@ struct TALER_EXCHANGEDB_TableData struct { - struct TALER_BlindedCoinHash h_blind_ev; + struct TALER_BlindedCoinHashP h_blind_ev; uint64_t denominations_serial; struct TALER_BlindedDenominationSignature denom_sig; uint64_t reserve_uuid; @@ -342,7 +342,7 @@ struct TALER_EXCHANGEDB_TableData struct GNUNET_TIME_Timestamp refund_deadline; struct GNUNET_TIME_Timestamp wire_deadline; struct TALER_MerchantPublicKeyP merchant_pub; - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; struct TALER_CoinSpendSignatureP coin_sig; struct TALER_WireSaltP wire_salt; uint64_t wire_target_serial_id; @@ -648,7 +648,7 @@ typedef void (*TALER_EXCHANGEDB_DenominationsCallback)( 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); @@ -700,7 +700,7 @@ typedef void (*TALER_EXCHANGEDB_AuditorDenominationsCallback)( 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); @@ -720,7 +720,7 @@ struct TALER_EXCHANGEDB_CollectableBlindcoin /** * Hash of the denomination key (which coin was generated). */ - struct TALER_DenominationHash denom_pub_hash; + struct TALER_DenominationHashP denom_pub_hash; /** * Value of the coin being exchangeed (matching the denomination key) @@ -753,7 +753,7 @@ struct TALER_EXCHANGEDB_CollectableBlindcoin * Hash over the blinded message, needed to verify * the @e reserve_sig. */ - struct TALER_BlindedCoinHash h_coin_envelope; + struct TALER_BlindedCoinHashP h_coin_envelope; /** * Signature confirming the withdrawal, matching @e reserve_pub, @@ -844,7 +844,7 @@ struct TALER_EXCHANGEDB_RecoupListEntry /** * Hash of the public denomination key used to sign the coin. */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; /** * Public key of the reserve the coin was paid back into. @@ -1024,7 +1024,7 @@ struct TALER_EXCHANGEDB_Deposit * Hash over the proposal data between merchant and customer * (remains unknown to the Exchange). */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Salt used by the merchant to compute "h_wire". @@ -1112,12 +1112,12 @@ struct TALER_EXCHANGEDB_DepositListEntry * Hash over the proposa data between merchant and customer * (remains unknown to the Exchange). */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Hash of the public denomination key used to sign the coin. */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; /** * Age commitment hash, if applicable ot the denomination. Should be all @@ -1205,7 +1205,7 @@ struct TALER_EXCHANGEDB_RefundListEntry * Hash over the proposal data between merchant and customer * (remains unknown to the Exchange). */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Merchant-generated REFUND transaction ID to detect duplicate @@ -1318,7 +1318,7 @@ struct TALER_EXCHANGEDB_MeltListEntry /** * Hash of the public denomination key used to sign the coin. */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; /** * Hash of the age commitment used to sign the coin, if age restriction was @@ -1549,7 +1549,7 @@ typedef enum GNUNET_DB_QueryStatus 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); /** @@ -1576,7 +1576,7 @@ typedef enum GNUNET_DB_QueryStatus 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); @@ -1671,7 +1671,7 @@ struct TALER_EXCHANGEDB_RefreshRevealedCoin /** * Hash of the public denomination key of the coin. */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; /** * Signature of the original coin being refreshed over the @@ -1682,7 +1682,7 @@ struct TALER_EXCHANGEDB_RefreshRevealedCoin /** * Hash of the blinded new coin, that is @e coin_ev. */ - struct TALER_BlindedCoinHash coin_envelope_hash; + struct TALER_BlindedCoinHashP coin_envelope_hash; /** * Signature generated by the exchange over the coin (in blinded format). @@ -1712,7 +1712,7 @@ struct TALER_EXCHANGEDB_CsRevealFreshCoinData /** * Denomination of the fresh coin. */ - struct TALER_DenominationHash new_denom_pub_hash; + struct TALER_DenominationHashP new_denom_pub_hash; /** * Blind signature of the fresh coin (possibly updated @@ -1834,7 +1834,7 @@ typedef enum GNUNET_GenericReturnValue const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_MerchantPublicKeyP *merchant_pub, const struct TALER_MerchantSignatureP *merchant_sig, - const struct TALER_PrivateContractHash *h_contract_terms, + const struct TALER_PrivateContractHashP *h_contract_terms, uint64_t rtransaction_id, const struct TALER_Amount *amount_with_fee); @@ -1915,7 +1915,7 @@ typedef enum GNUNET_GenericReturnValue (*TALER_EXCHANGEDB_WithdrawCallback)( void *cls, uint64_t rowid, - const struct TALER_BlindedCoinHash *h_blind_ev, + const struct TALER_BlindedCoinHashP *h_blind_ev, const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_ReservePublicKeyP *reserve_pub, const struct TALER_ReserveSignatureP *reserve_sig, @@ -1960,7 +1960,7 @@ typedef void 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 *coin_value, @@ -2059,7 +2059,7 @@ typedef enum GNUNET_GenericReturnValue struct GNUNET_TIME_Timestamp timestamp, const struct TALER_Amount *amount, const struct TALER_CoinSpendPublicKeyP *old_coin_pub, - const struct TALER_DenominationHash *old_denom_pub_hash, + const struct TALER_DenominationHashP *old_denom_pub_hash, const struct TALER_CoinPublicInfo *coin, const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_CoinSpendSignatureP *coin_sig, @@ -2142,7 +2142,7 @@ typedef void const struct TALER_CoinPublicInfo *coin, const struct TALER_CoinSpendSignatureP *coin_sig, const union TALER_DenominationBlindingKeyP *coin_blind, - const struct TALER_BlindedCoinHash *h_blinded_ev, + const struct TALER_BlindedCoinHashP *h_blinded_ev, const struct TALER_Amount *amount); @@ -2357,7 +2357,7 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*get_denomination_info)( void *cls, - const struct TALER_DenominationHash *denom_pub_hash, + const struct TALER_DenominationHashP *denom_pub_hash, struct TALER_EXCHANGEDB_DenominationKeyInformationP *issue); @@ -2483,7 +2483,7 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*select_kyc_status)(void *cls, uint64_t payment_target_uuid, - struct TALER_PaytoHash *h_payto, + struct TALER_PaytoHashP *h_payto, struct TALER_EXCHANGEDB_KycStatus *kyc); @@ -2537,7 +2537,7 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*lock_nonce)(void *cls, const struct TALER_CsNonce *nonce, - const struct TALER_DenominationHash *denom_pub_hash, + const struct TALER_DenominationHashP *denom_pub_hash, const union TALER_EXCHANGEDB_NonceLockTargetP *target); @@ -2554,7 +2554,7 @@ struct TALER_EXCHANGEDB_Plugin */ enum GNUNET_DB_QueryStatus (*get_withdraw_info)(void *cls, - const struct TALER_BlindedCoinHash *bch, + const struct TALER_BlindedCoinHashP *bch, struct TALER_EXCHANGEDB_CollectableBlindcoin *collectable); @@ -2623,7 +2623,7 @@ struct TALER_EXCHANGEDB_Plugin void *cls, const struct TALER_EXCHANGEDB_Deposit *deposit, uint64_t known_coin_id, - const struct TALER_PaytoHash *h_payto, + const struct TALER_PaytoHashP *h_payto, bool extension_blocked, struct GNUNET_TIME_Timestamp *exchange_timestamp, bool *balance_ok, @@ -2798,7 +2798,7 @@ struct TALER_EXCHANGEDB_Plugin */ long long (*count_known_coins) (void *cls, - const struct TALER_DenominationHash *denom_pub_hash); + const struct TALER_DenominationHashP *denom_pub_hash); /** @@ -2846,7 +2846,7 @@ struct TALER_EXCHANGEDB_Plugin (*ensure_coin_known)(void *cls, const struct TALER_CoinPublicInfo *coin, uint64_t *known_coin_id, - struct TALER_DenominationHash *denom_pub_hash, + struct TALER_DenominationHashP *denom_pub_hash, struct TALER_AgeCommitmentHash *age_hash); @@ -2876,7 +2876,7 @@ struct TALER_EXCHANGEDB_Plugin (*get_coin_denomination)(void *cls, const struct TALER_CoinSpendPublicKeyP *coin_pub, uint64_t *known_coin_id, - struct TALER_DenominationHash *denom_hash); + struct TALER_DenominationHashP *denom_hash); /** @@ -2898,8 +2898,8 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*have_deposit2)( void *cls, - 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_MerchantPublicKeyP *merchant, struct GNUNET_TIME_Timestamp refund_deadline, @@ -2950,7 +2950,7 @@ struct TALER_EXCHANGEDB_Plugin (*select_refunds_by_coin)(void *cls, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_MerchantPublicKeyP *merchant_pub, - const struct TALER_PrivateContractHash *h_contract, + const struct TALER_PrivateContractHashP *h_contract, TALER_EXCHANGEDB_RefundCoinCallback cb, void *cb_cls); @@ -3189,8 +3189,8 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*lookup_transfer_by_deposit)( void *cls, - 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_MerchantPublicKeyP *merchant_pub, bool *pending, @@ -3614,7 +3614,7 @@ struct TALER_EXCHANGEDB_Plugin */ enum GNUNET_DB_QueryStatus (*get_reserve_by_h_blind)(void *cls, - const struct TALER_BlindedCoinHash *bch, + const struct TALER_BlindedCoinHashP *bch, struct TALER_ReservePublicKeyP *reserve_pub, uint64_t *reserve_out_serial_id); @@ -3631,7 +3631,7 @@ struct TALER_EXCHANGEDB_Plugin */ enum GNUNET_DB_QueryStatus (*get_old_coin_by_h_blind)(void *cls, - const struct TALER_BlindedCoinHash *h_blind_ev, + const struct TALER_BlindedCoinHashP *h_blind_ev, struct TALER_CoinSpendPublicKeyP *old_coin_pub, uint64_t *rrc_serial); @@ -3648,7 +3648,7 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*insert_denomination_revocation)( void *cls, - const struct TALER_DenominationHash *denom_pub_hash, + const struct TALER_DenominationHashP *denom_pub_hash, const struct TALER_MasterSignatureP *master_sig); @@ -3663,11 +3663,11 @@ struct TALER_EXCHANGEDB_Plugin * @return transaction status code */ enum GNUNET_DB_QueryStatus - (*get_denomination_revocation)(void *cls, - const struct - TALER_DenominationHash *denom_pub_hash, - struct TALER_MasterSignatureP *master_sig, - uint64_t *rowid); + (*get_denomination_revocation)( + void *cls, + const struct TALER_DenominationHashP *denom_pub_hash, + struct TALER_MasterSignatureP *master_sig, + uint64_t *rowid); /** @@ -3882,7 +3882,7 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*lookup_denomination_key)( void *cls, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta); @@ -3899,7 +3899,7 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*add_denomination_key)( void *cls, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_DenominationPublicKey *denom_pub, const struct TALER_EXCHANGEDB_DenominationKeyMetaData *meta, const struct TALER_MasterSignatureP *master_sig); @@ -3950,7 +3950,7 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*insert_auditor_denom_sig)( void *cls, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_AuditorPublicKeyP *auditor_pub, const struct TALER_AuditorSignatureP *auditor_sig); @@ -3967,7 +3967,7 @@ struct TALER_EXCHANGEDB_Plugin enum GNUNET_DB_QueryStatus (*select_auditor_denom_sig)( void *cls, - const struct TALER_DenominationHash *h_denom_pub, + const struct TALER_DenominationHashP *h_denom_pub, const struct TALER_AuditorPublicKeyP *auditor_pub, struct TALER_AuditorSignatureP *auditor_sig); diff --git a/src/include/taler_json_lib.h b/src/include/taler_json_lib.h index 8a7e5cd8b..6238c07d3 100644 --- a/src/include/taler_json_lib.h +++ b/src/include/taler_json_lib.h @@ -400,7 +400,7 @@ TALER_JSON_spec_i18n_str (const char *name, */ enum GNUNET_GenericReturnValue TALER_JSON_contract_hash (const json_t *json, - struct TALER_PrivateContractHash *hc); + struct TALER_PrivateContractHashP *hc); /** @@ -522,7 +522,7 @@ TALER_JSON_get_error_code2 (const void *data, */ enum GNUNET_GenericReturnValue TALER_JSON_merchant_wire_signature_hash (const json_t *wire_s, - struct TALER_MerchantWireHash *hc); + struct TALER_MerchantWireHashP *hc); /** @@ -623,7 +623,7 @@ TALER_JSON_wire_to_payto (const json_t *wire_s); */ void TALER_deposit_extension_hash (const json_t *extensions, - struct TALER_ExtensionContractHash *ech); + struct TALER_ExtensionContractHashP *ech); /** * Hash the @a config of an extension, given as JSON @@ -634,7 +634,7 @@ TALER_deposit_extension_hash (const json_t *extensions, */ enum GNUNET_GenericReturnValue TALER_JSON_extensions_config_hash (const json_t *config, - struct TALER_ExtensionConfigHash *eh); + struct TALER_ExtensionConfigHashP *eh); /** * Canonicalize a JSON input to a string according to RFC 8785. diff --git a/src/include/taler_signatures.h b/src/include/taler_signatures.h index 8a799eaea..72150ca65 100644 --- a/src/include/taler_signatures.h +++ b/src/include/taler_signatures.h @@ -345,7 +345,7 @@ struct TALER_DenominationKeyAnnouncementPS /** * Hash of the denomination public key. */ - struct TALER_DenominationHash h_denom; + struct TALER_DenominationHashP h_denom; /** * Hash of the section name in the configuration of this denomination. @@ -412,7 +412,7 @@ struct TALER_LinkDataPS /** * Hash of the denomination public key of the new coin. */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; /** * Transfer public key (for which the private key was not revealed) @@ -427,7 +427,7 @@ struct TALER_LinkDataPS /** * Hash of the blinded new coin. */ - struct TALER_BlindedCoinHash coin_envelope_hash; + struct TALER_BlindedCoinHashP coin_envelope_hash; }; @@ -456,12 +456,12 @@ struct TALER_WithdrawRequestPS /** * Hash of the denomination public key for the coin that is withdrawn. */ - struct TALER_DenominationHash h_denomination_pub GNUNET_PACKED; + struct TALER_DenominationHashP h_denomination_pub GNUNET_PACKED; /** * Hash of the (blinded) message to be signed by the Exchange. */ - struct TALER_BlindedCoinHash h_coin_envelope GNUNET_PACKED; + struct TALER_BlindedCoinHashP h_coin_envelope GNUNET_PACKED; }; @@ -480,7 +480,7 @@ struct TALER_DepositRequestPS /** * Hash over the contract for which this deposit is made. */ - struct TALER_PrivateContractHash h_contract_terms GNUNET_PACKED; + struct TALER_PrivateContractHashP h_contract_terms GNUNET_PACKED; /** * Hash over the age commitment that went into the coin. Maybe all zero, if @@ -491,17 +491,17 @@ struct TALER_DepositRequestPS /** * Hash over extension attributes shared with the exchange. */ - struct TALER_ExtensionContractHash h_extensions GNUNET_PACKED; + struct TALER_ExtensionContractHashP h_extensions GNUNET_PACKED; /** * Hash over the wiring information of the merchant. */ - struct TALER_MerchantWireHash h_wire GNUNET_PACKED; + struct TALER_MerchantWireHashP h_wire GNUNET_PACKED; /** * Hash over the denomination public key used to sign the coin. */ - struct TALER_DenominationHash h_denom_pub GNUNET_PACKED; + struct TALER_DenominationHashP h_denom_pub GNUNET_PACKED; /** * Time when this request was generated. Used, for example, to @@ -567,18 +567,18 @@ struct TALER_DepositConfirmationPS /** * Hash over the contract for which this deposit is made. */ - struct TALER_PrivateContractHash h_contract_terms GNUNET_PACKED; + struct TALER_PrivateContractHashP h_contract_terms GNUNET_PACKED; /** * Hash over the wiring information of the merchant. */ - struct TALER_MerchantWireHash h_wire GNUNET_PACKED; + struct TALER_MerchantWireHashP h_wire GNUNET_PACKED; /** * Hash over the extension options of the deposit, 0 if there * were not extension options. */ - struct TALER_ExtensionContractHash h_extensions GNUNET_PACKED; + struct TALER_ExtensionContractHashP h_extensions GNUNET_PACKED; /** * Time when this confirmation was generated / when the exchange received @@ -636,7 +636,7 @@ struct TALER_RefundRequestPS * Hash over the proposal data to identify the contract * which is being refunded. */ - struct TALER_PrivateContractHash h_contract_terms GNUNET_PACKED; + struct TALER_PrivateContractHashP h_contract_terms GNUNET_PACKED; /** * The coin's public key. This is the value that must have been @@ -672,7 +672,7 @@ struct TALER_RefundConfirmationPS * Hash over the proposal data to identify the contract * which is being refunded. */ - struct TALER_PrivateContractHash h_contract_terms GNUNET_PACKED; + struct TALER_PrivateContractHashP h_contract_terms GNUNET_PACKED; /** * The coin's public key. This is the value that must have been @@ -719,7 +719,7 @@ struct TALER_RefreshMeltCoinAffirmationPS /** * Hash over the denomination public key used to sign the coin. */ - struct TALER_DenominationHash h_denom_pub GNUNET_PACKED; + struct TALER_DenominationHashP h_denom_pub GNUNET_PACKED; /** * If age commitment was provided during the withdrawal of the coin, this is @@ -866,7 +866,7 @@ struct TALER_ExchangeAccountSetupSuccessPS * Hash over the payto for which the signature was * made. */ - struct TALER_PaytoHash h_payto; + struct TALER_PaytoHashP h_payto; /** * When was the signature made. @@ -952,7 +952,7 @@ struct TALER_MasterAddWirePS /** * Hash over the exchange's payto URI. */ - struct TALER_PaytoHash h_payto GNUNET_PACKED; + struct TALER_PaytoHashP h_payto GNUNET_PACKED; }; @@ -977,7 +977,7 @@ struct TALER_MasterDelWirePS /** * Hash over the exchange's payto URI. */ - struct TALER_PaytoHash h_payto GNUNET_PACKED; + struct TALER_PaytoHashP h_payto GNUNET_PACKED; }; @@ -997,7 +997,7 @@ struct TALER_MasterExtensionConfigurationPS /** * Hash of the JSON object that represents the configuration of an extension. */ - struct TALER_ExtensionConfigHash h_config GNUNET_PACKED; + struct TALER_ExtensionConfigHashP h_config GNUNET_PACKED; }; @@ -1073,7 +1073,7 @@ struct TALER_DenominationKeyValidityPS * Hash code of the denomination public key. (Used to avoid having * the variable-size RSA key in this struct.) */ - struct TALER_DenominationHash denom_hash GNUNET_PACKED; + struct TALER_DenominationHashP denom_hash GNUNET_PACKED; }; @@ -1156,7 +1156,7 @@ struct TALER_ExchangeKeyValidityPS * Hash code of the denomination public key. (Used to avoid having * the variable-size RSA key in this struct.) */ - struct TALER_DenominationHash denom_hash GNUNET_PACKED; + struct TALER_DenominationHashP denom_hash GNUNET_PACKED; }; @@ -1176,7 +1176,7 @@ struct TALER_MasterWireDetailsPS /** * Hash over the account holder's payto:// URL. */ - struct TALER_PaytoHash h_wire_details GNUNET_PACKED; + struct TALER_PaytoHashP h_wire_details GNUNET_PACKED; }; @@ -1197,7 +1197,7 @@ struct TALER_MerchantWireDetailsPS * Salted hash over the account holder's payto:// URL and * the salt, as done by #TALER_merchant_wire_signature_hash(). */ - struct TALER_MerchantWireHash h_wire_details GNUNET_PACKED; + struct TALER_MerchantWireHashP h_wire_details GNUNET_PACKED; }; @@ -1257,7 +1257,7 @@ struct TALER_MasterDenominationKeyRevocationPS /** * Hash of the denomination key. */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; }; @@ -1294,12 +1294,12 @@ struct TALER_DepositTrackPS /** * Hash over the proposal data of the contract for which this deposit is made. */ - struct TALER_PrivateContractHash h_contract_terms GNUNET_PACKED; + struct TALER_PrivateContractHashP h_contract_terms GNUNET_PACKED; /** * Hash over the wiring information of the merchant. */ - struct TALER_MerchantWireHash h_wire GNUNET_PACKED; + struct TALER_MerchantWireHashP h_wire GNUNET_PACKED; /** * The Merchant's public key. The deposit inquiry request is to be @@ -1326,7 +1326,7 @@ struct TALER_WireDepositDetailP /** * Hash of the contract */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; /** * Time when the wire transfer was performed by the exchange. @@ -1381,7 +1381,7 @@ struct TALER_WireDepositDataPS /** * Hash of bank account of the merchant. */ - struct TALER_PaytoHash h_payto; + struct TALER_PaytoHashP h_payto; /** * Hash of the individual deposits that were aggregated, @@ -1406,7 +1406,7 @@ struct TALER_ProposalDataPS * Hash of the JSON contract in UTF-8 including 0-termination, * using JSON_COMPACT | JSON_SORT_KEYS */ - struct TALER_PrivateContractHash hash; + struct TALER_PrivateContractHashP hash; }; /** @@ -1424,7 +1424,7 @@ struct TALER_PaymentResponsePS /** * Hash of the proposal data associated with this confirmation */ - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; }; @@ -1443,12 +1443,12 @@ struct TALER_ConfirmWirePS /** * Hash over the wiring information of the merchant. */ - struct TALER_MerchantWireHash h_wire GNUNET_PACKED; + struct TALER_MerchantWireHashP h_wire GNUNET_PACKED; /** * Hash over the contract for which this deposit is made. */ - struct TALER_PrivateContractHash h_contract_terms GNUNET_PACKED; + struct TALER_PrivateContractHashP h_contract_terms GNUNET_PACKED; /** * Raw value (binary encoding) of the wire transfer subject. @@ -1493,7 +1493,7 @@ struct TALER_RecoupRequestPS /** * Hash of the (revoked) denomination public key of the coin. */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; /** * Blinding factor that was used to withdraw the coin. @@ -1600,7 +1600,7 @@ struct TALER_DenominationUnknownAffirmationPS /** * Hash of the public denomination key we do not know. */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; }; @@ -1630,7 +1630,7 @@ struct TALER_DenominationExpiredAffirmationPS /** * Hash of the public denomination key we do not know. */ - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; }; @@ -1670,7 +1670,7 @@ struct TALER_ReserveCloseConfirmationPS /** * Hash of the receiver's bank account. */ - struct TALER_PaytoHash h_payto; + struct TALER_PaytoHashP h_payto; /** * Wire transfer subject. |