diff --git a/src/signatures.ml b/src/signatures.ml index dbb0d892..8fa4c5d3 100644 --- a/src/signatures.ml +++ b/src/signatures.ml @@ -153,7 +153,7 @@ end module DenominationKeyAnnouncement = struct module R = struct (* CS: use purpose TALER_SIGNATURE_SM_CS_DENOMINATION_KEY *) - (* purpose.purpose = TALER_SIGNATURE_SM_RSA_DENOMINATION_KEY *) + (* purpose = TALER_SIGNATURE_SM_RSA_DENOMINATION_KEY *) type r = { h_denom_pub: DenominationHash.t; h_section_name: Hash.Cstring.H64.t; @@ -182,7 +182,7 @@ end module SigningKeyAnnouncement = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_SM_SIGNING_KEY *) + (* purpose = TALER_SIGNATURE_SM_SIGNING_KEY *) type r = { exchange_pub: ExchangePublicKeyP.t; anchor_time: Timestamp.t; @@ -206,7 +206,7 @@ end module DenominationKeyValidity = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY *) + (* purpose = TALER_SIGNATURE_MASTER_DENOMINATION_KEY_VALIDITY *) type r = { master: MasterPublicKeyP.t; start: Timestamp.t; @@ -274,7 +274,7 @@ end module ExchangeSigningKeyValidity = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY *) + (* purpose = TALER_SIGNATURE_MASTER_SIGNING_KEY_VALIDITY *) type r = { start: Timestamp.t; expire: Timestamp.t; @@ -301,7 +301,7 @@ end module MasterDenominationKeyRevocation = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_DENOMINATION_KEY_REVOKED. *) + (* purpose = TALER_SIGNATURE_MASTER_DENOMINATION_KEY_REVOKED. *) type r = { h_denom_pub: DenominationHash.t } let bin = @@ -319,7 +319,7 @@ end module MasterSigningKeyRevocation = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_SIGNING_KEY_REVOKED *) + (* purpose = TALER_SIGNATURE_MASTER_SIGNING_KEY_REVOKED *) type r = { exchange_pub: ExchangePublicKeyP.t } let bin = @@ -337,7 +337,7 @@ end module MasterAddAuditor = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_ADD_AUDITOR *) + (* purpose = TALER_SIGNATURE_MASTER_ADD_AUDITOR *) type r = { start_date: Timestamp.t; auditor_pub: AuditorPublicKeyP.t; @@ -361,7 +361,7 @@ end module MasterDelAuditor = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_DEL_AUDITOR *) + (* purpose = TALER_SIGNATURE_MASTER_DEL_AUDITOR *) type r = { end_date: Timestamp.t; auditor_pub: AuditorPublicKeyP.t; @@ -383,7 +383,7 @@ end module GlobalFees = struct module R = struct (* TODO signatures taler doc *) - (* purpose.purpose = TALER_SIGNATURE_MASTER_GLOBAL_FEES *) + (* purpose = TALER_SIGNATURE_MASTER_GLOBAL_FEES *) type r = { start_date: Timestamp.t; end_date: Timestamp.t; @@ -437,7 +437,7 @@ end module MasterWireDetails = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_WIRE_DETAILS *) + (* purpose = TALER_SIGNATURE_MASTER_WIRE_DETAILS *) type r = { h_wire_details: FullPaytoHash.t; h_conversion_url: Hash.Cstring.H64.t; @@ -475,7 +475,7 @@ end module MasterAddWire = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_ADD_WIRE *) + (* purpose = TALER_SIGNATURE_MASTER_ADD_WIRE *) type r = { start_date: Timestamp.t; h_wire: FullPaytoHash.t; @@ -517,7 +517,7 @@ end module MasterDelWire = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_DEL_WIRE *) + (* purpose = TALER_SIGNATURE_MASTER_DEL_WIRE *) type r = { end_date: Timestamp.t; h_wire: FullPaytoHash.t; @@ -538,7 +538,7 @@ end module MasterDrainProfit = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_DRAIN_PROFITS *) + (* purpose = TALER_SIGNATURE_MASTER_DRAIN_PROFITS *) type r = { wtid: WireTransferIdentifierRawP.t; date: Timestamp.t; @@ -566,7 +566,7 @@ end module MasterAmlOfficerStatus = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_AML_KEY *) + (* purpose = TALER_SIGNATURE_MASTER_AML_KEY *) type r = { change_date: Timestamp.t; officer_pub: AmlOfficerPublicKeyP.t; @@ -592,7 +592,7 @@ end module PartnerConfiguration = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_PARNTER_DETAILS *) + (* purpose = TALER_SIGNATURE_MASTER_PARNTER_DETAILS *) type r = { partner_pub: MasterPublicKeyP.t; start_date: Timestamp.t; @@ -631,7 +631,7 @@ end module WadPartnerSignature = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_PARTNER_DETAILS *) + (* purpose = TALER_SIGNATURE_MASTER_PARTNER_DETAILS *) type r = { h_partner_base_url: Hash.Cstring.H64.t; master_public_key: MasterPublicKeyP.t; @@ -678,7 +678,7 @@ end module MasterWireFee = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_MASTER_WIRE_FEES *) + (* purpose = TALER_SIGNATURE_MASTER_WIRE_FEES *) type r = { h_wire_method: Hash.Cstring.H64.t; start_date: Timestamp.t; @@ -707,7 +707,7 @@ end module ExchangeKeyValidity = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS *) + (* purpose = TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS *) type r = { auditor_url_hash: Hash.Cstring.H64.t; master: MasterPublicKeyP.t; @@ -773,7 +773,7 @@ end module ExchangeKeySet = struct module R = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_KEY_SET *) + (* purpose = TALER_SIGNATURE_EXCHANGE_KEY_SET *) type r = { list_issue_date: Timestamp.t; (* hash over a concatenation of master_sigs *) @@ -842,7 +842,7 @@ module WithdrawConfirmation = struct end module SingleWithdrawRequest = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW *) + (* purpose = TALER_SIGNATURE_WALLET_RESERVE_WITHDRAW *) type t = { amount_with_fee: Amount.t; h_denomination_pub: DenominationHash.t; @@ -851,7 +851,7 @@ module SingleWithdrawRequest = struct end module DepositRequest = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_DEPOSIT *) + (* purpose = TALER_SIGNATURE_WALLET_COIN_DEPOSIT *) type t = { h_contract_terms: PrivateContractHash.t; h_age_commitment: AgeCommitmentHash.t; @@ -868,7 +868,7 @@ module DepositRequest = struct end module DepositConfirmation = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT *) + (* purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_DEPOSIT *) type t = { h_contract_terms: PrivateContractHash.t; h_wire: MerchantWireHash.t; @@ -882,7 +882,7 @@ module DepositConfirmation = struct end module RefreshMeltCoinAffirmation = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_MELT *) + (* purpose = TALER_SIGNATURE_WALLET_COIN_MELT *) type t = { session_hash: RefreshCommitmentP.t; h_denom_pub: DenominationHash.t; @@ -893,7 +893,7 @@ module RefreshMeltCoinAffirmation = struct end module RefreshMeltConfirmation = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_MELT *) + (* purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_MELT *) type t = { session_hash: RefreshCommitmentP.t; noreveal_index: int; (* uint16_t mapped to OCaml int *) @@ -901,7 +901,7 @@ module RefreshMeltConfirmation = struct end module DepositTrack = struct - (* purpose.purpose = TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION *) + (* purpose = TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION *) type t = { h_contract_terms: PrivateContractHash.t; h_wire: MerchantWireHash.t; @@ -920,7 +920,7 @@ module WireDepositDetailP = struct end module WireDepositData = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE_DEPOSIT *) + (* purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE_DEPOSIT *) type t = { total: Amount.t; wire_fee: Amount.t; @@ -931,17 +931,17 @@ module WireDepositData = struct end module PaymentResponse = struct - (* purpose.purpose = TALER_SIGNATURE_MERCHANT_PAYMENT_OK *) + (* purpose = TALER_SIGNATURE_MERCHANT_PAYMENT_OK *) type t = { h_contract_terms: PrivateContractHash.t } end module Contract = struct - (* purpose.purpose = TALER_SIGNATURE_MERCHANT_CONTRACT *) + (* purpose = TALER_SIGNATURE_MERCHANT_CONTRACT *) type t = { h_contract_terms: PrivateContractHash.t } end module ConfirmWire = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE *) + (* purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_WIRE *) type t = { h_wire: MerchantWireHash.t; h_contract_terms: PrivateContractHash.t; @@ -953,7 +953,7 @@ module ConfirmWire = struct end module RefundConfirmation = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_REFUND *) + (* purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_REFUND *) type t = { h_contract_terms: PrivateContractHash.t; coin_pub: CoinSpendPublicKeyP.t; @@ -964,7 +964,7 @@ module RefundConfirmation = struct end module DepositTrackPS2 = struct - (* purpose.purpose = TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION *) + (* purpose = TALER_SIGNATURE_MERCHANT_TRACK_TRANSACTION *) type t = { h_contract_terms: PrivateContractHash.t; h_wire: MerchantWireHash.t; @@ -974,7 +974,7 @@ module DepositTrackPS2 = struct end module RefundRequest = struct - (* purpose.purpose = TALER_SIGNATURE_MERCHANT_REFUND *) + (* purpose = TALER_SIGNATURE_MERCHANT_REFUND *) type t = { h_contract_terms: PrivateContractHash.t; coin_pub: CoinSpendPublicKeyP.t; @@ -985,13 +985,13 @@ module RefundRequest = struct end module MerchantRefundConfirmation = struct - (* purpose.purpose = TALER_SIGNATURE_MERCHANT_REFUND_OK *) + (* purpose = TALER_SIGNATURE_MERCHANT_REFUND_OK *) (* Hash of the order ID (a string), hashed without the 0-termination. *) type t = { h_order_id: Hash.Cstring.H64.t } end module RecoupRequest = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_RECOUP or TALER_SIGNATURE_WALLET_COIN_RECOUP_REFRESH *) + (* purpose = TALER_SIGNATURE_WALLET_COIN_RECOUP or TALER_SIGNATURE_WALLET_COIN_RECOUP_REFRESH *) type t = { h_denom_pub: DenominationHash.t; coin_blind: DenominationBlindingKeyP.t; @@ -999,7 +999,7 @@ module RecoupRequest = struct end module RecoupRefreshConfirmation = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP_REFRESH *) + (* purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP_REFRESH *) type t = { timestamp: Timestamp.t; recoup_amount: Amount.t; @@ -1009,7 +1009,7 @@ module RecoupRefreshConfirmation = struct end module RecoupConfirmation = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP *) + (* purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_RECOUP *) type t = { timestamp: Timestamp.t; recoup_amount: Amount.t; @@ -1019,7 +1019,7 @@ module RecoupConfirmation = struct end module DenominationUnknownAffirmation = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_AFFIRM_DENOM_UNKNOWN *) + (* purpose = TALER_SIGNATURE_EXCHANGE_AFFIRM_DENOM_UNKNOWN *) type t = { timestamp: Timestamp.t; h_denom_pub: DenominationHash.t; @@ -1027,7 +1027,7 @@ module DenominationUnknownAffirmation = struct end module DenominationExpiredAffirmation = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_GENERIC_DENOMINATIN_EXPIRED *) + (* purpose = TALER_SIGNATURE_EXCHANGE_GENERIC_DENOMINATIN_EXPIRED *) type t = { timestamp: Timestamp.t; operation: string; (* char[8] → string *) @@ -1036,7 +1036,7 @@ module DenominationExpiredAffirmation = struct end module ReserveCloseConfirmation = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_RESERVE_CLOSED *) + (* purpose = TALER_SIGNATURE_EXCHANGE_RESERVE_CLOSED *) type t = { timestamp: Timestamp.t; closing_amount: Amount.t; @@ -1046,7 +1046,7 @@ module ReserveCloseConfirmation = struct end module CoinLinkSignature = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_LINK *) + (* purpose = TALER_SIGNATURE_WALLET_COIN_LINK *) type t = { h_denom_pub: DenominationHash.t; old_coin_pub: CoinSpendPublicKeyP.t; @@ -1056,17 +1056,17 @@ module CoinLinkSignature = struct end module RefreshNonceSignature = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_COIN_LINK *) + (* purpose = TALER_SIGNATURE_WALLET_COIN_LINK *) type t = { nonce: PublicRefreshCoinNonceP.t } end module ReserveStatusRequestSignature = struct - (* purpose.purpose = TALER_SIGNATURE_RESERVE_STATUS_REQUEST *) + (* purpose = TALER_SIGNATURE_RESERVE_STATUS_REQUEST *) type t = { request_timestamp: Timestamp.t } end module ReserveHistoryRequestSignature = struct - (* purpose.purpose = TALER_SIGNATURE_RESERVE_HISTORY_REQUEST *) + (* purpose = TALER_SIGNATURE_RESERVE_HISTORY_REQUEST *) type t = { history_fee: Amount.t; request_timestamp: Timestamp.t; @@ -1074,12 +1074,12 @@ module ReserveHistoryRequestSignature = struct end module PurseStatusRequestSignature = struct - (* purpose.purpose = TALER_SIGNATURE_PURSE_STATUS_REQUEST *) + (* purpose = TALER_SIGNATURE_PURSE_STATUS_REQUEST *) type t = unit end module PurseStatusResponseSignature = struct - (* purpose.purpose = TALER_SIGNATURE_PURSE_STATUS_RESPONSE *) + (* purpose = TALER_SIGNATURE_PURSE_STATUS_RESPONSE *) type t = { total_purse_amount: Amount.t; total_deposit_amount: Amount.t; @@ -1091,12 +1091,12 @@ module PurseStatusResponseSignature = struct end module ReserveCloseRequestSignature = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_CLOSE *) + (* purpose = TALER_SIGNATURE_WALLET_RESERVE_CLOSE *) type t = unit end module PurseRequestSignature = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_PURSE_CREATE *) + (* purpose = TALER_SIGNATURE_WALLET_PURSE_CREATE *) type t = { purse_expiration: Timestamp.t; merge_value_after_fees: Amount.t; @@ -1106,7 +1106,7 @@ module PurseRequestSignature = struct end module PurseDepositSignature = struct - (* purpose.purpose = TALER_SIGNATURE_PURSE_DEPOSIT *) + (* purpose = TALER_SIGNATURE_PURSE_DEPOSIT *) type t = { coin_contribution: Amount.t; h_denom_pub: DenominationHash.t; @@ -1117,7 +1117,7 @@ module PurseDepositSignature = struct end module PurseDepositSignaturePS2 = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_OPEN_DEPOSIT *) + (* purpose = TALER_SIGNATURE_WALLET_RESERVE_OPEN_DEPOSIT *) type t = { reserve_sig: ReserveSignatureP.t; coin_contribution: Amount.t; @@ -1125,7 +1125,7 @@ module PurseDepositSignaturePS2 = struct end module PurseDepositConfirmedSignature = struct - (* purpose.purpose = TALER_SIGNATURE_PURSE_DEPOSIT_CONFIRMED *) + (* purpose = TALER_SIGNATURE_PURSE_DEPOSIT_CONFIRMED *) type t = { total_purse_amount: Amount.t; total_deposit_fees: Amount.t; @@ -1136,7 +1136,7 @@ module PurseDepositConfirmedSignature = struct end module PurseMergeSignature = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_PURSE_MERGE *) + (* purpose = TALER_SIGNATURE_WALLET_PURSE_MERGE *) type t = { merge_timestamp: Timestamp.t; h_wire: NormalizedPaytoHash.t; @@ -1144,7 +1144,7 @@ module PurseMergeSignature = struct end module AccountMergeSignature = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_ACCOUNT_MERGE *) + (* purpose = TALER_SIGNATURE_WALLET_ACCOUNT_MERGE *) type t = { reserve_pub: ReservePublicKeyP.t; purse_pub: PursePublicKey.t; @@ -1157,12 +1157,12 @@ module AccountMergeSignature = struct end module AccountSetupRequestSignature = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_ACCOUNT_SETUP *) + (* purpose = TALER_SIGNATURE_WALLET_ACCOUNT_SETUP *) type t = { threshold: Amount.t } end module PurseMergeSuccessSignature = struct - (* purpose.purpose = TALER_SIGNATURE_PURSE_MERGE_SUCCESS *) + (* purpose = TALER_SIGNATURE_PURSE_MERGE_SUCCESS *) type t = { reserve_pub: ReservePublicKeyP.t; purse_pub: PursePublicKey.t; @@ -1175,7 +1175,7 @@ module PurseMergeSuccessSignature = struct end module WadDataSignature = struct - (* purpose.purpose = TALER_SIGNATURE_WAD_DATA *) + (* purpose = TALER_SIGNATURE_WAD_DATA *) type t = { wad_execution_time: Timestamp.t; total_amount: Amount.t; @@ -1185,7 +1185,7 @@ module WadDataSignature = struct end module P2PFees = struct - (* purpose.purpose = TALER_SIGNATURE_P2P_FEES *) + (* purpose = TALER_SIGNATURE_P2P_FEES *) type t = { start_date: Timestamp.t; end_date: Timestamp.t; @@ -1200,7 +1200,7 @@ module P2PFees = struct end module CoinPurseRefundConfirmation = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_REFUND *) + (* purpose = TALER_SIGNATURE_EXCHANGE_CONFIRM_PURSE_REFUND *) type t = { purse_pub: PursePublicKey.t; coin_pub: CoinSpendPublicKeyP.t; @@ -1210,7 +1210,7 @@ module CoinPurseRefundConfirmation = struct end module AmlDecision = struct - (* purpose.purpose = TALER_SIGNATURE_AML_DECISION *) + (* purpose = TALER_SIGNATURE_AML_DECISION *) type t = { h_justification: Hash.Cstring.H64.t; decision_time: Timestamp.t; @@ -1222,7 +1222,7 @@ module AmlDecision = struct end module ReserveOpen = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_OPEN *) + (* purpose = TALER_SIGNATURE_WALLET_RESERVE_OPEN *) type t = { reserve_payment: Amount.t; request_timestamp: Timestamp.t; @@ -1232,7 +1232,7 @@ module ReserveOpen = struct end module ReserveClose = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_RESERVE_CLOSE *) + (* purpose = TALER_SIGNATURE_WALLET_RESERVE_CLOSE *) type t = { request_timestamp: Timestamp.t; target_account_h_payto: FullPaytoHash.t; @@ -1240,7 +1240,7 @@ module ReserveClose = struct end module ReserveAttestRequest = struct - (* purpose.purpose = TALER_SIGNATURE_WALLET_ATTEST_REQUEST *) + (* purpose = TALER_SIGNATURE_WALLET_ATTEST_REQUEST *) type t = { request_timestamp: Timestamp.t; h_details: Hash.Cstring.H64.t; @@ -1248,7 +1248,7 @@ module ReserveAttestRequest = struct end module ExchangeAttest = struct - (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_RESERVE_ATTEST_DETAILS *) + (* purpose = TALER_SIGNATURE_EXCHANGE_RESERVE_ATTEST_DETAILS *) type t = { attest_timestamp: Timestamp.t; expiration_time: Timestamp.t;