diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-05-22 23:50:58 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-05-22 23:51:14 +0200 |
| commit | 3599ac0ac2452fb3a9017b7aa38ef7c1122ce3bc (patch) | |
| tree | a7079f651b348c281a24eccb20bfd0226b262081 /src/lib | |
| parent | 67535ebf65a15901d6d63a164aaae6521045267e (diff) | |
-complete extended reserve history signature check logic to libtalerexchange
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/exchange_api_common.c | 41 |
1 files changed, 33 insertions, 8 deletions
diff --git a/src/lib/exchange_api_common.c b/src/lib/exchange_api_common.c index 5bc64e6d..5e76bca3 100644 --- a/src/lib/exchange_api_common.c +++ b/src/lib/exchange_api_common.c @@ -397,17 +397,18 @@ parse_merge (struct TALER_EXCHANGE_ReserveHistoryEntry *rh, struct HistoryParseContext *uc, const json_t *transaction) { + uint32_t flags32; struct GNUNET_JSON_Specification merge_spec[] = { GNUNET_JSON_spec_fixed_auto ("h_contract_terms", &rh->details.merge_details.h_contract_terms), GNUNET_JSON_spec_fixed_auto ("merge_pub", &rh->details.merge_details.merge_pub), - GNUNET_JSON_spec_fixed_auto ("purse_sig", - &rh->details.merge_details.purse_sig), GNUNET_JSON_spec_fixed_auto ("purse_pub", &rh->details.merge_details.purse_pub), - GNUNET_JSON_spec_fixed_auto ("merge_sig", - &rh->details.merge_details.merge_sig), + GNUNET_JSON_spec_uint32 ("min_age", + &rh->details.merge_details.min_age), + GNUNET_JSON_spec_uint32 ("flags", + &flags32), GNUNET_JSON_spec_fixed_auto ("reserve_sig", &rh->details.merge_details.reserve_sig), TALER_JSON_spec_amount_any ("purse_fee", @@ -426,8 +427,24 @@ parse_merge (struct TALER_EXCHANGE_ReserveHistoryEntry *rh, GNUNET_break_op (0); return GNUNET_SYSERR; } - - GNUNET_break (0); // FIXME: verify signatures! + rh->details.merge_details.flags = + (enum TALER_WalletAccountMergeFlags) flags32; + if (GNUNET_OK != + TALER_wallet_account_merge_verify ( + rh->details.merge_details.merge_timestamp, + &rh->details.merge_details.purse_pub, + rh->details.merge_details.purse_expiration, + &rh->details.merge_details.h_contract_terms, + &rh->amount, + &rh->details.merge_details.purse_fee, + rh->details.merge_details.min_age, + rh->details.merge_details.flags, + uc->reserve_pub, + &rh->details.merge_details.reserve_sig)) + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } if (0 > TALER_amount_add (uc->total_in, uc->total_in, @@ -473,8 +490,16 @@ parse_history (struct TALER_EXCHANGE_ReserveHistoryEntry *rh, GNUNET_break_op (0); return GNUNET_SYSERR; } - - GNUNET_break (0); // FIXME: verify signature! + if (GNUNET_OK != + TALER_wallet_reserve_history_verify ( + rh->details.history_details.request_timestamp, + &rh->details.history_details.history_fee, + uc->reserve_pub, + &rh->details.history_details.reserve_sig)) + { + GNUNET_break_op (0); + return GNUNET_SYSERR; + } if (0 > TALER_amount_add (uc->total_out, uc->total_out, |