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/util | |
parent | 19624fd776f28812354f7e2b50b26e984ff077ab (diff) | |
download | exchange-544ba42f445cbff2f544d7e1c83aaffcfa75af3a.tar.xz |
-big renaming of structs for consistent naming with P suffix
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/auditor_signatures.c | 4 | ||||
-rw-r--r-- | src/util/crypto.c | 16 | ||||
-rw-r--r-- | src/util/crypto_wire.c | 2 | ||||
-rw-r--r-- | src/util/denom.c | 8 | ||||
-rw-r--r-- | src/util/exchange_signatures.c | 6 | ||||
-rw-r--r-- | src/util/merchant_signatures.c | 4 | ||||
-rw-r--r-- | src/util/offline_signatures.c | 12 | ||||
-rw-r--r-- | src/util/payto.c | 2 | ||||
-rw-r--r-- | src/util/test_crypto.c | 4 | ||||
-rw-r--r-- | src/util/test_helper_cs.c | 6 | ||||
-rw-r--r-- | src/util/test_helper_rsa.c | 4 | ||||
-rw-r--r-- | src/util/wallet_signatures.c | 44 |
12 files changed, 56 insertions, 56 deletions
diff --git a/src/util/auditor_signatures.c b/src/util/auditor_signatures.c index 2ab690a03..77db296c7 100644 --- a/src/util/auditor_signatures.c +++ b/src/util/auditor_signatures.c @@ -26,7 +26,7 @@ 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, @@ -64,7 +64,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, diff --git a/src/util/crypto.c b/src/util/crypto.c index 13f692c1b..aced73f2a 100644 --- a/src/util/crypto.c +++ b/src/util/crypto.c @@ -78,9 +78,9 @@ enum GNUNET_GenericReturnValue TALER_test_coin_valid (const struct TALER_CoinPublicInfo *coin_public_info, const struct TALER_DenominationPublicKey *denom_pub) { - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; #if ENABLE_SANITY_CHECKS - struct TALER_DenominationHash d_hash; + struct TALER_DenominationHashP d_hash; TALER_denom_pub_hash (denom_pub, &d_hash); @@ -259,7 +259,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 ) { @@ -300,7 +300,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) { @@ -364,7 +364,7 @@ TALER_refresh_get_commitment (struct TALER_RefreshCommitmentP *rc, hash_context */ for (unsigned int i = 0; i<num_new_coins; i++) { - struct TALER_DenominationHash denom_hash; + struct TALER_DenominationHashP denom_hash; /* The denomination keys should / must all be identical regardless of what offset we use, so we use [0]. */ @@ -413,7 +413,7 @@ TALER_refresh_get_commitment (struct TALER_RefreshCommitmentP *rc, void TALER_coin_pub_hash (const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_AgeCommitmentHash *ach, - struct TALER_CoinPubHash *coin_h) + struct TALER_CoinPubHashP *coin_h) { if (TALER_AgeCommitmentHash_isNullOrZero (ach)) { @@ -717,8 +717,8 @@ TALER_age_commitment_free ( 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) { struct GNUNET_HashContext *hash_context; diff --git a/src/util/crypto_wire.c b/src/util/crypto_wire.c index 144b8ee9a..93a952983 100644 --- a/src/util/crypto_wire.c +++ b/src/util/crypto_wire.c @@ -65,7 +65,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) { GNUNET_assert (GNUNET_YES == GNUNET_CRYPTO_kdf (hc, diff --git a/src/util/denom.c b/src/util/denom.c index 86c83d7cf..b567b6def 100644 --- a/src/util/denom.c +++ b/src/util/denom.c @@ -147,7 +147,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) { @@ -227,7 +227,7 @@ TALER_cs_pub_hash (const struct GNUNET_CRYPTO_CsPublicKey *cs, void TALER_denom_pub_hash (const struct TALER_DenominationPublicKey *denom_pub, - struct TALER_DenominationHash *denom_hash) + struct TALER_DenominationHashP *denom_hash) { uint32_t opt[2] = { htonl (denom_pub->age_mask.mask), @@ -302,7 +302,7 @@ TALER_denom_blind ( const struct TALER_AgeCommitmentHash *ach, 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) { TALER_coin_pub_hash (coin_pub, @@ -352,7 +352,7 @@ TALER_denom_blind ( 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) { if (denom_pub->cipher != denom_sig->cipher) { diff --git a/src/util/exchange_signatures.c b/src/util/exchange_signatures.c index c0c775dc0..b4a1f9d70 100644 --- a/src/util/exchange_signatures.c +++ b/src/util/exchange_signatures.c @@ -25,9 +25,9 @@ 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, diff --git a/src/util/merchant_signatures.c b/src/util/merchant_signatures.c index ae1769552..4cc00a6c7 100644 --- a/src/util/merchant_signatures.c +++ b/src/util/merchant_signatures.c @@ -26,7 +26,7 @@ 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, @@ -51,7 +51,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, diff --git a/src/util/offline_signatures.c b/src/util/offline_signatures.c index fa4b80fe2..bc1625992 100644 --- a/src/util/offline_signatures.c +++ b/src/util/offline_signatures.c @@ -117,7 +117,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) { @@ -135,7 +135,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) { @@ -249,7 +249,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, @@ -285,7 +285,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, @@ -474,7 +474,7 @@ TALER_exchange_offline_wire_fee_verify ( 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) { @@ -491,7 +491,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/util/payto.c b/src/util/payto.c index 746b2624d..bfc8eb1ba 100644 --- a/src/util/payto.c +++ b/src/util/payto.c @@ -226,7 +226,7 @@ TALER_payto_validate (const char *payto_uri) void TALER_payto_hash (const char *payto, - struct TALER_PaytoHash *h_payto) + struct TALER_PaytoHashP *h_payto) { GNUNET_CRYPTO_hash (payto, strlen (payto) + 1, diff --git a/src/util/test_crypto.c b/src/util/test_crypto.c index 35b964021..fea90b78a 100644 --- a/src/util/test_crypto.c +++ b/src/util/test_crypto.c @@ -119,7 +119,7 @@ test_planchets_rsa (void) struct TALER_PlanchetDetail pd; struct TALER_BlindedDenominationSignature blind_sig; struct TALER_FreshCoin coin; - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; GNUNET_CRYPTO_random_block (GNUNET_CRYPTO_QUALITY_STRONG, &ps, @@ -228,7 +228,7 @@ test_planchets_cs (void) struct TALER_DenominationPrivateKey dk_priv; struct TALER_DenominationPublicKey dk_pub; struct TALER_PlanchetDetail pd; - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; struct TALER_BlindedDenominationSignature blind_sig; struct TALER_FreshCoin coin; struct TALER_ExchangeWithdrawValues alg_values; diff --git a/src/util/test_helper_cs.c b/src/util/test_helper_cs.c index c2708353d..566f1d611 100644 --- a/src/util/test_helper_cs.c +++ b/src/util/test_helper_cs.c @@ -269,7 +269,7 @@ test_r_derive (struct TALER_CRYPTO_CsDenominationHelper *dh) struct TALER_PlanchetMasterSecretP ps; struct TALER_CoinSpendPrivateKeyP coin_priv; union TALER_DenominationBlindingKeyP bks; - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; struct TALER_ExchangeWithdrawValues alg_values; TALER_planchet_master_setup_random (&ps); @@ -413,7 +413,7 @@ test_signing (struct TALER_CRYPTO_CsDenominationHelper *dh) struct TALER_PlanchetMasterSecretP ps; struct TALER_CoinSpendPrivateKeyP coin_priv; union TALER_DenominationBlindingKeyP bks; - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; struct TALER_ExchangeWithdrawValues alg_values; TALER_planchet_master_setup_random (&ps); @@ -616,7 +616,7 @@ perf_signing (struct TALER_CRYPTO_CsDenominationHelper *dh, keys[i].validity_duration)) continue; { - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; struct TALER_PlanchetDetail pd; pd.blinded_planchet.cipher = TALER_DENOMINATION_CS; diff --git a/src/util/test_helper_rsa.c b/src/util/test_helper_rsa.c index 2ead8a6e1..eaf43622a 100644 --- a/src/util/test_helper_rsa.c +++ b/src/util/test_helper_rsa.c @@ -270,7 +270,7 @@ test_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh) struct TALER_PlanchetMasterSecretP ps; struct TALER_ExchangeWithdrawValues alg_values; struct TALER_AgeCommitmentHash ach; - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; struct TALER_CoinSpendPrivateKeyP coin_priv; union TALER_DenominationBlindingKeyP bks; @@ -477,7 +477,7 @@ perf_signing (struct TALER_CRYPTO_RsaDenominationHelper *dh, keys[i].validity_duration)) continue; { - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; struct TALER_PlanchetDetail pd; GNUNET_assert (GNUNET_YES == diff --git a/src/util/wallet_signatures.c b/src/util/wallet_signatures.c index 6c664bbd3..a21c73bef 100644 --- a/src/util/wallet_signatures.c +++ b/src/util/wallet_signatures.c @@ -27,11 +27,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, @@ -69,11 +69,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_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, @@ -117,9 +117,9 @@ TALER_wallet_deposit_verify ( void -TALER_wallet_link_sign (const struct TALER_DenominationHash *h_denom_pub, +TALER_wallet_link_sign (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) { @@ -139,9 +139,9 @@ TALER_wallet_link_sign (const struct TALER_DenominationHash *h_denom_pub, 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) { @@ -163,7 +163,7 @@ TALER_wallet_link_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) @@ -184,7 +184,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) @@ -204,7 +204,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) @@ -225,7 +225,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) @@ -248,7 +248,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) { @@ -274,7 +274,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) @@ -304,9 +304,9 @@ TALER_wallet_melt_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) { @@ -327,9 +327,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) { |