diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/auditor_api_deposit_confirmation.c | 12 | ||||
-rw-r--r-- | src/lib/exchange_api_auditor_add_denomination.c | 2 | ||||
-rw-r--r-- | src/lib/exchange_api_common.c | 14 | ||||
-rw-r--r-- | src/lib/exchange_api_csr_withdraw.c | 2 | ||||
-rw-r--r-- | src/lib/exchange_api_deposit.c | 24 | ||||
-rw-r--r-- | src/lib/exchange_api_deposits_get.c | 12 | ||||
-rw-r--r-- | src/lib/exchange_api_handle.c | 6 | ||||
-rw-r--r-- | src/lib/exchange_api_kyc_check.c | 4 | ||||
-rw-r--r-- | src/lib/exchange_api_link.c | 4 | ||||
-rw-r--r-- | src/lib/exchange_api_management_get_keys.c | 2 | ||||
-rw-r--r-- | src/lib/exchange_api_management_revoke_denomination_key.c | 2 | ||||
-rw-r--r-- | src/lib/exchange_api_melt.c | 6 | ||||
-rw-r--r-- | src/lib/exchange_api_recoup.c | 4 | ||||
-rw-r--r-- | src/lib/exchange_api_recoup_refresh.c | 4 | ||||
-rw-r--r-- | src/lib/exchange_api_refresh_common.c | 2 | ||||
-rw-r--r-- | src/lib/exchange_api_refreshes_reveal.c | 6 | ||||
-rw-r--r-- | src/lib/exchange_api_refund.c | 15 | ||||
-rw-r--r-- | src/lib/exchange_api_withdraw.c | 2 | ||||
-rw-r--r-- | src/lib/exchange_api_withdraw2.c | 2 |
19 files changed, 63 insertions, 62 deletions
diff --git a/src/lib/auditor_api_deposit_confirmation.c b/src/lib/auditor_api_deposit_confirmation.c index cdf1c5ef3..18155fe2c 100644 --- a/src/lib/auditor_api_deposit_confirmation.c +++ b/src/lib/auditor_api_deposit_confirmation.c @@ -170,9 +170,9 @@ handle_deposit_confirmation_finished (void *cls, * @return #GNUNET_OK if signatures are OK, #GNUNET_SYSERR if not */ static enum GNUNET_GenericReturnValue -verify_signatures (const struct TALER_MerchantWireHash *h_wire, - const struct TALER_ExtensionContractHash *h_extensions, - const struct TALER_PrivateContractHash *h_contract_terms, +verify_signatures (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, @@ -236,9 +236,9 @@ verify_signatures (const struct TALER_MerchantWireHash *h_wire, 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/lib/exchange_api_auditor_add_denomination.c b/src/lib/exchange_api_auditor_add_denomination.c index 27eb43bcf..d01252a83 100644 --- a/src/lib/exchange_api_auditor_add_denomination.c +++ b/src/lib/exchange_api_auditor_add_denomination.c @@ -142,7 +142,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/lib/exchange_api_common.c b/src/lib/exchange_api_common.c index 4f3e878d4..17e00a813 100644 --- a/src/lib/exchange_api_common.c +++ b/src/lib/exchange_api_common.c @@ -124,8 +124,8 @@ TALER_EXCHANGE_parse_reserve_history ( "WITHDRAW")) { struct TALER_ReserveSignatureP sig; - struct TALER_DenominationHash h_denom_pub; - struct TALER_BlindedCoinHash bch; + struct TALER_DenominationHashP h_denom_pub; + struct TALER_BlindedCoinHashP bch; struct TALER_Amount withdraw_fee; struct GNUNET_JSON_Specification withdraw_spec[] = { GNUNET_JSON_spec_fixed_auto ("reserve_sig", @@ -411,7 +411,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) { size_t len; @@ -470,9 +470,9 @@ TALER_EXCHANGE_verify_coin_history ( if (0 == strcasecmp (type, "DEPOSIT")) { - struct TALER_MerchantWireHash h_wire; - struct TALER_PrivateContractHash h_contract_terms; - // struct TALER_ExtensionContractHash h_extensions; // FIXME! + struct TALER_MerchantWireHashP h_wire; + struct TALER_PrivateContractHashP h_contract_terms; + // struct TALER_ExtensionContractHashP h_extensions; // FIXME! struct GNUNET_TIME_Timestamp wallet_timestamp; struct TALER_MerchantPublicKeyP merchant_pub; struct GNUNET_TIME_Timestamp refund_deadline = {0}; @@ -609,7 +609,7 @@ TALER_EXCHANGE_verify_coin_history ( else if (0 == strcasecmp (type, "REFUND")) { - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; struct TALER_MerchantPublicKeyP merchant_pub; struct TALER_MerchantSignatureP sig; struct TALER_Amount refund_fee; diff --git a/src/lib/exchange_api_csr_withdraw.c b/src/lib/exchange_api_csr_withdraw.c index d23f8ef85..fa806857d 100644 --- a/src/lib/exchange_api_csr_withdraw.c +++ b/src/lib/exchange_api_csr_withdraw.c @@ -240,7 +240,7 @@ TALER_EXCHANGE_csr_withdraw (struct TALER_EXCHANGE_Handle *exchange, sizeof(struct TALER_CsNonce)), GNUNET_JSON_pack_data_varsize ("denom_pub_hash", &pk->h_key, - sizeof(struct TALER_DenominationHash))); + sizeof(struct TALER_DenominationHashP))); GNUNET_assert (NULL != req); ctx = TEAH_handle_to_context (exchange); eh = TALER_EXCHANGE_curl_easy_get_ (csrh->url); diff --git a/src/lib/exchange_api_deposit.c b/src/lib/exchange_api_deposit.c index 82ee064b9..15bf76fe0 100644 --- a/src/lib/exchange_api_deposit.c +++ b/src/lib/exchange_api_deposit.c @@ -83,18 +83,18 @@ struct TALER_EXCHANGE_DepositHandle /** * 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 @@ -242,7 +242,7 @@ verify_deposit_signature_conflict ( json_t *history; struct TALER_Amount total; enum TALER_ErrorCode ec; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; memset (&h_denom_pub, 0, @@ -476,14 +476,14 @@ handle_deposit_finished (void *cls, static enum GNUNET_GenericReturnValue verify_signatures (const struct TALER_EXCHANGE_DenomPublicKey *dki, const struct TALER_Amount *amount, - const struct TALER_MerchantWireHash *h_wire, - const struct TALER_PrivateContractHash *h_contract_terms, - const struct TALER_ExtensionContractHash *ech, + const struct TALER_MerchantWireHashP *h_wire, + const struct TALER_PrivateContractHashP *h_contract_terms, + const struct TALER_ExtensionContractHashP *ech, const struct TALER_CoinSpendPublicKeyP *coin_pub, const struct TALER_AgeCommitmentHash *h_age_commitment, const struct TALER_DenominationSignature *denom_sig, const struct TALER_DenominationPublicKey *denom_pub, - const struct TALER_DenominationHash *denom_pub_hash, + const struct TALER_DenominationHashP *denom_pub_hash, struct GNUNET_TIME_Timestamp timestamp, const struct TALER_MerchantPublicKeyP *merchant_pub, struct GNUNET_TIME_Timestamp refund_deadline, @@ -554,7 +554,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, @@ -574,10 +574,10 @@ TALER_EXCHANGE_deposit ( struct GNUNET_CURL_Context *ctx; json_t *deposit_obj; CURL *eh; - struct TALER_MerchantWireHash h_wire; - struct TALER_DenominationHash denom_pub_hash; + struct TALER_MerchantWireHashP h_wire; + struct TALER_DenominationHashP denom_pub_hash; struct TALER_Amount amount_without_fee; - struct TALER_ExtensionContractHash ech; + struct TALER_ExtensionContractHashP ech; char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32]; if (NULL != extension_details) diff --git a/src/lib/exchange_api_deposits_get.c b/src/lib/exchange_api_deposits_get.c index 30f3ee7f4..5d069d5c8 100644 --- a/src/lib/exchange_api_deposits_get.c +++ b/src/lib/exchange_api_deposits_get.c @@ -262,8 +262,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) @@ -274,9 +274,9 @@ TALER_EXCHANGE_deposits_get ( struct GNUNET_CURL_Context *ctx; CURL *eh; char arg_str[(sizeof (struct TALER_CoinSpendPublicKeyP) - + sizeof (struct TALER_MerchantWireHash) + + sizeof (struct TALER_MerchantWireHashP) + sizeof (struct TALER_MerchantPublicKeyP) - + sizeof (struct TALER_PrivateContractHash) + + sizeof (struct TALER_PrivateContractHashP) + sizeof (struct TALER_MerchantSignatureP)) * 2 + 48]; if (GNUNET_YES != @@ -300,8 +300,8 @@ TALER_EXCHANGE_deposits_get ( char cpub_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2]; char mpub_str[sizeof (struct TALER_MerchantPublicKeyP) * 2]; char msig_str[sizeof (struct TALER_MerchantSignatureP) * 2]; - char chash_str[sizeof (struct TALER_PrivateContractHash) * 2]; - char whash_str[sizeof (struct TALER_MerchantWireHash) * 2]; + char chash_str[sizeof (struct TALER_PrivateContractHashP) * 2]; + char whash_str[sizeof (struct TALER_MerchantWireHashP) * 2]; char *end; end = GNUNET_STRINGS_data_to_string (h_wire, diff --git a/src/lib/exchange_api_handle.c b/src/lib/exchange_api_handle.c index ee5f44a00..24b762c22 100644 --- a/src/lib/exchange_api_handle.c +++ b/src/lib/exchange_api_handle.c @@ -437,7 +437,7 @@ parse_json_auditor (struct TALER_EXCHANGE_AuditorInformation *auditor, off = 0; json_array_foreach (keys, i, key) { struct TALER_AuditorSignatureP auditor_sig; - struct TALER_DenominationHash denom_h; + struct TALER_DenominationHashP denom_h; const struct TALER_EXCHANGE_DenomPublicKey *dk; unsigned int dk_off; struct GNUNET_JSON_Specification kspec[] = { @@ -1005,7 +1005,7 @@ decode_keys_json (const json_t *resp_obj, EXITIF (JSON_ARRAY != json_typeof (recoup_array)); json_array_foreach (recoup_array, index, recoup_info) { - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_fixed_auto ("h_denom_pub", &h_denom_pub), @@ -2099,7 +2099,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) { for (unsigned int i = 0; i<keys->num_denom_keys; i++) if (0 == GNUNET_memcmp (hc, diff --git a/src/lib/exchange_api_kyc_check.c b/src/lib/exchange_api_kyc_check.c index bf7b0bf40..303368ea0 100644 --- a/src/lib/exchange_api_kyc_check.c +++ b/src/lib/exchange_api_kyc_check.c @@ -64,7 +64,7 @@ struct TALER_EXCHANGE_KycCheckHandle /** * Hash of the payto:// URL that is being KYC'ed. */ - struct TALER_PaytoHash h_payto; + struct TALER_PaytoHashP h_payto; }; @@ -216,7 +216,7 @@ handle_kyc_check_finished (void *cls, struct TALER_EXCHANGE_KycCheckHandle * TALER_EXCHANGE_kyc_check (struct TALER_EXCHANGE_Handle *exchange, 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) diff --git a/src/lib/exchange_api_link.c b/src/lib/exchange_api_link.c index 0702ba4e8..902f2b422 100644 --- a/src/lib/exchange_api_link.c +++ b/src/lib/exchange_api_link.c @@ -117,7 +117,7 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh, }; struct TALER_TransferSecretP secret; struct TALER_PlanchetDetail pd; - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; struct TALER_AgeCommitmentHash *hac = NULL; /* parse reply */ @@ -207,7 +207,7 @@ parse_link_coin (const struct TALER_EXCHANGE_LinkHandle *lh, /* verify link_sig */ { struct TALER_CoinSpendPublicKeyP old_coin_pub; - struct TALER_BlindedCoinHash coin_envelope_hash; + struct TALER_BlindedCoinHashP coin_envelope_hash; GNUNET_CRYPTO_eddsa_key_get_public (&lh->coin_priv.eddsa_priv, &old_coin_pub.eddsa_pub); diff --git a/src/lib/exchange_api_management_get_keys.c b/src/lib/exchange_api_management_get_keys.c index 4d6866338..8a279d1ef 100644 --- a/src/lib/exchange_api_management_get_keys.c +++ b/src/lib/exchange_api_management_get_keys.c @@ -215,7 +215,7 @@ handle_ok (struct TALER_EXCHANGE_ManagementGetKeysHandle *gh, } { - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; struct GNUNET_TIME_Relative duration = GNUNET_TIME_absolute_get_difference ( denom_key->valid_from.abs_time, diff --git a/src/lib/exchange_api_management_revoke_denomination_key.c b/src/lib/exchange_api_management_revoke_denomination_key.c index 383d9532e..f7ddeaed2 100644 --- a/src/lib/exchange_api_management_revoke_denomination_key.c +++ b/src/lib/exchange_api_management_revoke_denomination_key.c @@ -126,7 +126,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) diff --git a/src/lib/exchange_api_melt.c b/src/lib/exchange_api_melt.c index 71e6f55f0..f7f770272 100644 --- a/src/lib/exchange_api_melt.c +++ b/src/lib/exchange_api_melt.c @@ -199,7 +199,7 @@ verify_melt_signature_denom_conflict (struct TALER_EXCHANGE_MeltHandle *mh, { json_t *history; struct TALER_Amount total; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; memset (&h_denom_pub, 0, @@ -246,7 +246,7 @@ verify_melt_signature_spend_conflict (struct TALER_EXCHANGE_MeltHandle *mh, }; const struct MeltedCoin *mc; enum TALER_ErrorCode ec; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; /* parse JSON reply */ if (GNUNET_OK != @@ -458,7 +458,7 @@ start_melt (struct TALER_EXCHANGE_MeltHandle *mh) struct GNUNET_CURL_Context *ctx; struct TALER_CoinSpendSignatureP confirm_sig; char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32]; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; struct TALER_ExchangeWithdrawValues alg_values[mh->rd->fresh_pks_len]; for (unsigned int i = 0; i<mh->rd->fresh_pks_len; i++) diff --git a/src/lib/exchange_api_recoup.c b/src/lib/exchange_api_recoup.c index c94296c74..5c197e2f6 100644 --- a/src/lib/exchange_api_recoup.c +++ b/src/lib/exchange_api_recoup.c @@ -169,7 +169,7 @@ handle_recoup_finished (void *cls, /* Insufficient funds, proof attached */ json_t *history; struct TALER_Amount total; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; const struct TALER_EXCHANGE_DenomPublicKey *dki; enum TALER_ErrorCode ec; @@ -293,7 +293,7 @@ TALER_EXCHANGE_recoup (struct TALER_EXCHANGE_Handle *exchange, struct GNUNET_CURL_Context *ctx; struct TALER_CoinSpendSignatureP coin_sig; struct TALER_CoinSpendPublicKeyP coin_pub; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; json_t *recoup_obj; CURL *eh; char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32]; diff --git a/src/lib/exchange_api_recoup_refresh.c b/src/lib/exchange_api_recoup_refresh.c index 0fff3a23b..8ae8f9764 100644 --- a/src/lib/exchange_api_recoup_refresh.c +++ b/src/lib/exchange_api_recoup_refresh.c @@ -183,7 +183,7 @@ handle_recoup_refresh_finished (void *cls, /* Insufficient funds, proof attached */ json_t *history; struct TALER_Amount total; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; const struct TALER_EXCHANGE_DenomPublicKey *dki; enum TALER_ErrorCode ec; @@ -297,7 +297,7 @@ TALER_EXCHANGE_recoup_refresh ( struct GNUNET_CURL_Context *ctx; struct TALER_CoinSpendSignatureP coin_sig; struct TALER_CoinSpendPublicKeyP coin_pub; - struct TALER_DenominationHash h_denom_pub; + struct TALER_DenominationHashP h_denom_pub; json_t *recoup_obj; CURL *eh; char arg_str[sizeof (struct TALER_CoinSpendPublicKeyP) * 2 + 32]; diff --git a/src/lib/exchange_api_refresh_common.c b/src/lib/exchange_api_refresh_common.c index b15e0d0d7..8e9e8da37 100644 --- a/src/lib/exchange_api_refresh_common.c +++ b/src/lib/exchange_api_refresh_common.c @@ -166,7 +166,7 @@ TALER_EXCHANGE_get_melt_data_ ( struct TALER_RefreshCoinData *rcd = &md->rcd[i][j]; union TALER_DenominationBlindingKeyP *bks = &fcd->bks[i]; struct TALER_PlanchetDetail pd; - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; struct TALER_AgeCommitmentHash *ach = NULL; TALER_transfer_secret_to_planchet_secret (&trans_sec, diff --git a/src/lib/exchange_api_refreshes_reveal.c b/src/lib/exchange_api_refreshes_reveal.c index 896258903..461432db7 100644 --- a/src/lib/exchange_api_refreshes_reveal.c +++ b/src/lib/exchange_api_refreshes_reveal.c @@ -145,7 +145,7 @@ refresh_reveal_ok (struct TALER_EXCHANGE_RefreshesRevealHandle *rrh, json_t *jsonai; struct TALER_BlindedDenominationSignature blind_sig; struct TALER_CoinSpendPublicKeyP coin_pub; - struct TALER_CoinPubHash coin_hash; + struct TALER_CoinPubHashP coin_hash; struct GNUNET_JSON_Specification spec[] = { TALER_JSON_spec_blinded_denom_sig ("ev_sig", &blind_sig), @@ -375,7 +375,7 @@ TALER_EXCHANGE_refreshes_reveal ( for (unsigned int i = 0; i<md.num_fresh_coins; i++) { const struct TALER_RefreshCoinData *rcd = &md.rcd[noreveal_index][i]; - struct TALER_DenominationHash denom_hash; + struct TALER_DenominationHashP denom_hash; if (TALER_DENOMINATION_CS == md.fcds[i].fresh_pk.cipher) send_rms = true; @@ -394,7 +394,7 @@ TALER_EXCHANGE_refreshes_reveal ( &rcd->blinded_planchet)))); { struct TALER_CoinSpendSignatureP link_sig; - struct TALER_BlindedCoinHash bch; + struct TALER_BlindedCoinHashP bch; TALER_coin_ev_hash (&rcd->blinded_planchet, &denom_hash, diff --git a/src/lib/exchange_api_refund.c b/src/lib/exchange_api_refund.c index a9510715b..9ae907dc1 100644 --- a/src/lib/exchange_api_refund.c +++ b/src/lib/exchange_api_refund.c @@ -201,11 +201,11 @@ verify_conflict_history_ok (struct TALER_EXCHANGE_RefundHandle *rh, "DEPOSIT")) { struct TALER_Amount deposit_fee; - struct TALER_MerchantWireHash h_wire; - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_MerchantWireHashP h_wire; + struct TALER_PrivateContractHashP h_contract_terms; struct TALER_AgeCommitmentHash h_age_commitment = {{{0}}}; - // struct TALER_ExtensionContractHash h_extensions; // FIXME! - struct TALER_DenominationHash h_denom_pub; + // struct TALER_ExtensionContractHashP h_extensions; // FIXME! + struct TALER_DenominationHashP h_denom_pub; struct GNUNET_TIME_Timestamp wallet_timestamp; struct TALER_MerchantPublicKeyP merchant_pub; struct GNUNET_TIME_Timestamp refund_deadline; @@ -298,7 +298,7 @@ verify_conflict_history_ok (struct TALER_EXCHANGE_RefundHandle *rh, struct TALER_MerchantSignatureP sig; struct TALER_Amount refund_fee; struct TALER_Amount sig_amount; - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; uint64_t rtransaction_id; struct TALER_MerchantPublicKeyP merchant_pub; struct GNUNET_JSON_Specification ispec[] = { @@ -476,7 +476,7 @@ verify_failed_dependency_ok (struct TALER_EXCHANGE_RefundHandle *rh, const char *type; struct TALER_MerchantSignatureP sig; struct TALER_Amount refund_fee; - struct TALER_PrivateContractHash h_contract_terms; + struct TALER_PrivateContractHashP h_contract_terms; uint64_t rtransaction_id; struct TALER_MerchantPublicKeyP merchant_pub; struct GNUNET_JSON_Specification ispec[] = { @@ -671,7 +671,8 @@ handle_refund_finished (void *cls, 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, diff --git a/src/lib/exchange_api_withdraw.c b/src/lib/exchange_api_withdraw.c index 01b6e8bab..f6a60f534 100644 --- a/src/lib/exchange_api_withdraw.c +++ b/src/lib/exchange_api_withdraw.c @@ -101,7 +101,7 @@ struct TALER_EXCHANGE_WithdrawHandle /** * Hash of the public key of the coin we are signing. */ - struct TALER_CoinPubHash c_hash; + struct TALER_CoinPubHashP c_hash; /** * Handler for the CS R request (only used for TALER_DENOMINATION_CS denominations) diff --git a/src/lib/exchange_api_withdraw2.c b/src/lib/exchange_api_withdraw2.c index 2441a1417..ade6fe8a7 100644 --- a/src/lib/exchange_api_withdraw2.c +++ b/src/lib/exchange_api_withdraw2.c @@ -380,7 +380,7 @@ TALER_EXCHANGE_withdraw2 ( const struct TALER_EXCHANGE_DenomPublicKey *dk; struct TALER_ReserveSignatureP reserve_sig; char arg_str[sizeof (struct TALER_ReservePublicKeyP) * 2 + 32]; - struct TALER_BlindedCoinHash bch; + struct TALER_BlindedCoinHashP bch; keys = TALER_EXCHANGE_get_keys (exchange); if (NULL == keys) |