From 7ab87f28e508239b5f5742dc43b7087f0c97435c Mon Sep 17 00:00:00 2001 From: swrup Date: Thu, 5 Feb 2026 17:54:39 +0100 Subject: [PATCH] . --- src/bin_sig.ml | 79 +++++++++++++++++++++--------------------- src/hash.ml | 78 +++++++++++++++++++++-------------------- src/http_keys.ml | 2 +- src/http_management.ml | 24 ++++++------- tools/offline_impl.ml | 6 ++-- tools/offline_sig.ml | 3 +- 6 files changed, 97 insertions(+), 95 deletions(-) diff --git a/src/bin_sig.ml b/src/bin_sig.ml index f961f6c4..6cda3669 100644 --- a/src/bin_sig.ml +++ b/src/bin_sig.ml @@ -140,7 +140,7 @@ module DenominationKeyAnnouncement = struct (* purpose.purpose = TALER_SIGNATURE_SM_DENOMINATION_KEY *) type r = { h_denom_pub: DenominationHash.t; - h_section_name: Hash_64_cstr.t; + h_section_name: Hash.Cstring.H64.t; anchor_time: TimestampNBO.t; duration_withdraw: TimeRelativeNBO.t; } @@ -155,7 +155,7 @@ module DenominationKeyAnnouncement = struct { h_denom_pub; h_section_name; anchor_time; duration_withdraw }) |+ Purpose.field purpose |+ field DenominationHash.bin (fun t -> t.h_denom_pub) - |+ field Hash_64_cstr.bin (fun t -> t.h_section_name) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_section_name) |+ field TimestampNBO.bin (fun t -> t.anchor_time) |+ field TimeRelativeNBO.bin (fun t -> t.duration_withdraw) |> sealr @@ -326,7 +326,7 @@ module MasterAddAuditor = struct type r = { start_date: TimestampNBO.t; auditor_pub: AuditorPublicKeyP.t; - h_auditor_url: Hash_64_cstr.t; + h_auditor_url: Hash.Cstring.H64.t; } let bin = @@ -337,7 +337,7 @@ module MasterAddAuditor = struct |+ Purpose.field purpose |+ field TimestampNBO.bin (fun t -> t.start_date) |+ field AuditorPublicKeyP.bin (fun t -> t.auditor_pub) - |+ field Hash_64_cstr.bin (fun t -> t.h_auditor_url) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_auditor_url) |> sealr end @@ -435,9 +435,9 @@ module MasterWireDetails = struct (* purpose.purpose = TALER_SIGNATURE_MASTER_WIRE_DETAILS *) type r = { h_wire_details: FullPaytoHash.t; - h_conversion_url: Hash_64_cstr.t; - h_credit_restrictions: Hash_64_cstr.t; - h_debit_restrictions: Hash_64_cstr.t; + h_conversion_url: Hash.Cstring.H64.t; + h_credit_restrictions: Hash.Cstring.H64.t; + h_debit_restrictions: Hash.Cstring.H64.t; } let bin = @@ -459,9 +459,9 @@ module MasterWireDetails = struct }) |+ Purpose.field purpose |+ field FullPaytoHash.bin (fun t -> t.h_wire_details) - |+ field Hash_64_cstr.bin (fun t -> t.h_conversion_url) - |+ field Hash_64_cstr.bin (fun t -> t.h_credit_restrictions) - |+ field Hash_64_cstr.bin (fun t -> t.h_debit_restrictions) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_conversion_url) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_credit_restrictions) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_debit_restrictions) |> sealr end @@ -475,9 +475,9 @@ module MasterAddWire = struct type r = { start_date: TimestampNBO.t; h_wire: FullPaytoHash.t; - h_conversion_url: Hash_64_cstr.t; - h_credit_restrictions: Hash_64_cstr.t; - h_debit_restrictions: Hash_64_cstr.t; + h_conversion_url: Hash.Cstring.H64.t; + h_credit_restrictions: Hash.Cstring.H64.t; + h_debit_restrictions: Hash.Cstring.H64.t; } let bin = @@ -502,9 +502,9 @@ module MasterAddWire = struct |+ Purpose.field _purpose |+ field TimestampNBO.bin (fun t -> t.start_date) |+ field FullPaytoHash.bin (fun t -> t.h_wire) - |+ field Hash_64_cstr.bin (fun t -> t.h_conversion_url) - |+ field Hash_64_cstr.bin (fun t -> t.h_credit_restrictions) - |+ field Hash_64_cstr.bin (fun t -> t.h_debit_restrictions) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_conversion_url) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_credit_restrictions) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_debit_restrictions) |> sealr end @@ -541,7 +541,7 @@ module MasterDrainProfit = struct wtid: WireTransferIdentifierRawP.t; date: TimestampNBO.t; amount: AmountNBO.t; - h_section: Hash_64_cstr.t; + h_section: Hash.Cstring.H64.t; h_payto: FullPaytoHash.t; } @@ -554,7 +554,7 @@ module MasterDrainProfit = struct |+ field WireTransferIdentifierRawP.bin (fun t -> t.wtid) |+ field TimestampNBO.bin (fun t -> t.date) |+ field AmountNBO.bin (fun t -> t.amount) - |+ field Hash_64_cstr.bin (fun t -> t.h_section) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_section) |+ field FullPaytoHash.bin (fun t -> t.h_payto) |> sealr end @@ -569,7 +569,7 @@ module MasterAmlOfficerStatus = struct type r = { change_date: TimestampNBO.t; officer_pub: AmlOfficerPublicKeyP.t; - h_officer_name: Hash_64_cstr.t; + h_officer_name: Hash.Cstring.H64.t; is_active: int32; } @@ -581,7 +581,7 @@ module MasterAmlOfficerStatus = struct |+ Purpose.field _purpose |+ field TimestampNBO.bin (fun t -> t.change_date) |+ field AmlOfficerPublicKeyP.bin (fun t -> t.officer_pub) - |+ field Hash_64_cstr.bin (fun t -> t.h_officer_name) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_officer_name) |+ field beint32 (fun t -> t.is_active) |> sealr end @@ -601,7 +601,7 @@ module PartnerConfiguration = struct end_date: TimestampNBO.t; wad_frequency: TimeRelativeNBO.t; wad_fee: AmountNBO.t; - h_url: Hash_64_cstr.t; + h_url: Hash.Cstring.H64.t; } let bin = @@ -624,7 +624,7 @@ module PartnerConfiguration = struct |+ field TimestampNBO.bin (fun t -> t.end_date) |+ field TimeRelativeNBO.bin (fun t -> t.wad_frequency) |+ field AmountNBO.bin (fun t -> t.wad_fee) - |+ field Hash_64_cstr.bin (fun t -> t.h_url) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_url) |> sealr end @@ -636,7 +636,7 @@ module WadPartnerSignature = struct module R = struct (* purpose.purpose = TALER_SIGNATURE_MASTER_PARTNER_DETAILS *) type r = { - h_partner_base_url: Hash_64_cstr.t; + h_partner_base_url: Hash.Cstring.H64.t; master_public_key: MasterPublicKeyP.t; start_date: TimestampNBO.t; end_date: TimestampNBO.t; @@ -667,7 +667,7 @@ module WadPartnerSignature = struct wad_frequency; }) |+ Purpose.field _purpose - |+ field Hash_64_cstr.bin (fun t -> t.h_partner_base_url) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_partner_base_url) |+ field MasterPublicKeyP.bin (fun t -> t.master_public_key) |+ field TimestampNBO.bin (fun t -> t.start_date) |+ field TimestampNBO.bin (fun t -> t.end_date) @@ -684,7 +684,7 @@ module MasterWireFee = struct module R = struct (* purpose.purpose = TALER_SIGNATURE_MASTER_WIRE_FEES *) type r = { - h_wire_method: Hash_64_cstr.t; + h_wire_method: Hash.Cstring.H64.t; start_date: TimestampNBO.t; end_date: TimestampNBO.t; wire_fee: AmountNBO.t; @@ -698,7 +698,7 @@ module MasterWireFee = struct (fun _purpose h_wire_method start_date end_date wire_fee closing_fee -> { h_wire_method; start_date; end_date; wire_fee; closing_fee }) |+ Purpose.field _purpose - |+ field Hash_64_cstr.bin (fun t -> t.h_wire_method) + |+ field Hash.Cstring.H64.bin (fun t -> t.h_wire_method) |+ field TimestampNBO.bin (fun t -> t.start_date) |+ field TimestampNBO.bin (fun t -> t.end_date) |+ field AmountNBO.bin (fun t -> t.wire_fee) @@ -714,7 +714,7 @@ module ExchangeKeyValidity = struct module R = struct (* purpose.purpose = TALER_SIGNATURE_AUDITOR_EXCHANGE_KEYS *) type r = { - auditor_url_hash: Hash_64_cstr.t; + auditor_url_hash: Hash.Cstring.H64.t; master: MasterPublicKeyP.t; start: TimestampNBO.t; expire_withdraw: TimestampNBO.t; @@ -759,7 +759,7 @@ module ExchangeKeyValidity = struct denom_hash; }) |+ Purpose.field _purpose - |+ field Hash_64_cstr.bin (fun t -> t.auditor_url_hash) + |+ field Hash.Cstring.H64.bin (fun t -> t.auditor_url_hash) |+ field MasterPublicKeyP.bin (fun t -> t.master) |+ field TimestampNBO.bin (fun t -> t.start) |+ field TimestampNBO.bin (fun t -> t.expire_withdraw) @@ -782,7 +782,8 @@ module ExchangeKeySet = struct (* purpose.purpose = TALER_SIGNATURE_EXCHANGE_KEY_SET *) type r = { list_issue_date: TimestampNBO.t; - hc: Hash_64.t; + (* hash over a concatenation of master_sigs *) + hc: H64.t; } let bin = @@ -791,7 +792,7 @@ module ExchangeKeySet = struct record (fun _purpose list_issue_date hc -> { list_issue_date; hc }) |+ Purpose.field _purpose |+ field TimestampNBO.bin (fun t -> t.list_issue_date) - |+ field Hash_64.bin (fun t -> t.hc) + |+ field H64.bin (fun t -> t.hc) |> sealr end @@ -872,7 +873,7 @@ module DepositRequest = struct amount_with_fee: AmountNBO.t; deposit_fee: AmountNBO.t; merchant: MerchantPublicKeyP.t; - wallet_data_hash: Hash_64_cstr.t; + wallet_data_hash: Hash.Cstring.H64.t; } end @@ -935,7 +936,7 @@ module WireDepositData = struct wire_fee: AmountNBO.t; merchant_pub: MerchantPublicKeyP.t; h_wire: MerchantWireHash.t; - h_details: Hash_64_cstr.t; + h_details: Hash.Cstring.H64.t; } end @@ -996,7 +997,7 @@ end module MerchantRefundConfirmation = struct (* purpose.purpose = TALER_SIGNATURE_MERCHANT_REFUND_OK *) (* Hash of the order ID (a string), hashed without the 0-termination. *) - type t = { h_order_id: Hash_64_cstr.t } + type t = { h_order_id: Hash.Cstring.H64.t } end module RecoupRequest = struct @@ -1121,7 +1122,7 @@ module PurseDepositSignature = struct h_denom_pub: DenominationHash.t; h_age_commitment: AgeCommitmentHash.t; purse_pub: PursePublicKey.t; - h_exchange_base_url: Hash_64_cstr.t; + h_exchange_base_url: Hash.Cstring.H64.t; } end @@ -1188,7 +1189,7 @@ module WadDataSignature = struct type t = { wad_execution_time: TimestampNBO.t; total_amount: AmountNBO.t; - h_items: Hash_64_cstr.t; + h_items: Hash.Cstring.H64.t; wad_id: WadId.t; } end @@ -1221,11 +1222,11 @@ end module AmlDecision = struct (* purpose.purpose = TALER_SIGNATURE_AML_DECISION *) type t = { - h_justification: Hash_64_cstr.t; + h_justification: Hash.Cstring.H64.t; decision_time: TimestampNBO.t; new_threshold: AmountNBO.t; h_payto: NormalizedPaytoHash.t; - h_kyc_requirements: Hash_64_cstr.t; + h_kyc_requirements: Hash.Cstring.H64.t; new_state: int; } end @@ -1252,7 +1253,7 @@ module ReserveAttestRequest = struct (* purpose.purpose = TALER_SIGNATURE_WALLET_ATTEST_REQUEST *) type t = { request_timestamp: TimestampNBO.t; - h_details: Hash_64_cstr.t; + h_details: Hash.Cstring.H64.t; } end @@ -1262,6 +1263,6 @@ module ExchangeAttest = struct attest_timestamp: TimestampNBO.t; expiration_time: TimestampNBO.t; reserve_pub: ReservePublicKeyP.t; - h_attributes: Hash_64_cstr.t; + h_attributes: Hash.Cstring.H64.t; } end diff --git a/src/hash.ml b/src/hash.ml index 0fbdd01a..317ae2b1 100644 --- a/src/hash.ml +++ b/src/hash.ml @@ -8,7 +8,19 @@ open Digestif -module Hash_32 = struct +module type S = sig + type t + + val bin : t Bin.t + val caqti : t Caqti_type.t + val jsont : t Jsont.t + val hash : string -> t + val of_octets : string -> t + val to_octets : t -> string + val of_b32 : B32.t -> (t, string) result +end + +module H32 = struct type t = SHA256.t let hash s = SHA256.(digest_string s) @@ -38,7 +50,7 @@ module Hash_32 = struct Jsont.of_of_string ~kind:"Hash 32" of_b32 ~enc end -module Hash_64 = struct +module H64 = struct type t = SHA512.t let hash s = SHA512.(digest_string s) @@ -74,42 +86,32 @@ module Hash_64 = struct end (* Hash over string + '\0' *) -module Hash_32_cstr = struct - include Hash_32 +module Cstring = struct + module H32 = struct + include H32 - let hash s = - let s = s ^ "\x00" in - SHA256.(digest_string s) + let hash s = + let s = s ^ "\x00" in + hash s + end + + module H64 = struct + include H64 + + let hash s = + let s = s ^ "\x00" in + hash s + end end -module Hash_64_cstr = struct - include Hash_64 - - let hash s = - let s = s ^ "\x00" in - SHA512.(digest_string s) -end - -module type Hash_S = sig - type t - - val bin : t Bin.t - val caqti : t Caqti_type.t - val jsont : t Jsont.t - val hash : string -> t - val of_octets : string -> t - val to_octets : t -> string - val of_b32 : B32.t -> (t, string) result -end - -module FullPaytoHash : Hash_S = Hash_32 -module NormalizedPaytoHash : Hash_S = Hash_32 -module DenominationHash : Hash_S = Hash_64 -module PrivateContractHash : Hash_S = Hash_64 -module ExtensionsPolicyHash : Hash_S = Hash_64 -module MerchantWireHash : Hash_S = Hash_64 -module AgeCommitmentHash : Hash_S = Hash_64 -module BlindedCoinHash : Hash_S = Hash_64 -module CoinPubHash : Hash_S = Hash_64 -module OutputCommitmentHash : Hash_S = Hash_64 -module HashPlanchetsP : Hash_S = Hash_64 +module FullPaytoHash : S = H32 +module NormalizedPaytoHash : S = H32 +module DenominationHash : S = H64 +module PrivateContractHash : S = H64 +module ExtensionsPolicyHash : S = H64 +module MerchantWireHash : S = H64 +module AgeCommitmentHash : S = H64 +module BlindedCoinHash : S = H64 +module CoinPubHash : S = H64 +module OutputCommitmentHash : S = H64 +module HashPlanchetsP : S = H64 diff --git a/src/http_keys.ml b/src/http_keys.ml index fb58aefe..c5fdfada 100644 --- a/src/http_keys.ml +++ b/src/http_keys.ml @@ -182,7 +182,7 @@ let mk_keys ~db_conn (module Sm : Secmod.S) ~last_issue_date = |> List.filter_map (fun v -> v.Denom_data.master_sig) |> List.map Bin_sig.DenominationKeyValidity.to_octets |> String.concat "" - |> Hash.Hash_64.hash + |> Hash.H64.hash in let open Bin_sig.ExchangeKeySet in sign_f ~f:(Sm.sign_with_signkey ~pub:exchange_pub) R.{ list_issue_date; hc } diff --git a/src/http_management.ml b/src/http_management.ml index 5067f7ee..8c2da282 100644 --- a/src/http_management.ml +++ b/src/http_management.ml @@ -27,7 +27,7 @@ module Keys_get = struct let denom_secmod_sig = let open Bin_sig.DenominationKeyAnnouncement in let h_denom_pub = h_pub in - let h_section_name = Hash_64_cstr.hash section_name in + let h_section_name = Hash.Cstring.H64.hash section_name in let anchor_time = stamp_start in let duration_withdraw = Timestamp.diff stamp_start stamp_expire_withdraw @@ -294,7 +294,7 @@ module Auditors = struct { start_date= validity_start; auditor_pub; - h_auditor_url= Hash_64_cstr.hash auditor_url; + h_auditor_url= Hash.Cstring.H64.hash auditor_url; } (* TODO timestamps last_change +/- checks *) @@ -390,7 +390,7 @@ module Wire_fee = struct let open Bin_sig.MasterWireFee in verify_f ~f:Sm.verify_with_master_key master_sig_wire { - h_wire_method= Hash_64_cstr.hash wire_method; + h_wire_method= Hash.Cstring.H64.hash wire_method; start_date= fee_start; end_date= fee_end; wire_fee; @@ -533,9 +533,9 @@ module Wire = struct verify_f ~f:Sm.verify_with_master_key master_sig_wire { h_wire_details= FullPaytoHash.hash payto_uri; - h_conversion_url= Hash_64_cstr.hash conversion_url; - h_credit_restrictions= Hash_64_cstr.hash credit_restrictions; - h_debit_restrictions= Hash_64_cstr.hash debit_restrictions; + h_conversion_url= Hash.Cstring.H64.hash conversion_url; + h_credit_restrictions= Hash.Cstring.H64.hash credit_restrictions; + h_debit_restrictions= Hash.Cstring.H64.hash debit_restrictions; } in let* () = @@ -544,9 +544,9 @@ module Wire = struct { start_date= validity_start; h_wire= FullPaytoHash.hash payto_uri; - h_conversion_url= Hash_64_cstr.hash conversion_url; - h_credit_restrictions= Hash_64_cstr.hash credit_restrictions; - h_debit_restrictions= Hash_64_cstr.hash debit_restrictions; + h_conversion_url= Hash.Cstring.H64.hash conversion_url; + h_credit_restrictions= Hash.Cstring.H64.hash credit_restrictions; + h_debit_restrictions= Hash.Cstring.H64.hash debit_restrictions; } in Ok () @@ -643,7 +643,7 @@ module Drain = struct wtid; date; amount; - h_section= Hash_64_cstr.hash debit_account_section; + h_section= Hash.Cstring.H64.hash debit_account_section; h_payto= FullPaytoHash.hash credit_payto_uri; } @@ -683,7 +683,7 @@ module AmlOfficer = struct { change_date; officer_pub; - h_officer_name= Hash_64_cstr.hash officer_name; + h_officer_name= Hash.Cstring.H64.hash officer_name; is_active; } @@ -726,7 +726,7 @@ module Partners = struct end_date; wad_frequency; wad_fee; - h_url= Hash_64_cstr.hash partner_base_url; + h_url= Hash.Cstring.H64.hash partner_base_url; } let do_ ~db_conn v = diff --git a/tools/offline_impl.ml b/tools/offline_impl.ml index c0c90632..e56fdbc1 100644 --- a/tools/offline_impl.ml +++ b/tools/offline_impl.ml @@ -146,7 +146,7 @@ let enable_auditor ~output ~master_key ~auditor_url ~auditor_name ~auditor_pub { start_date= validity_start; auditor_pub; - h_auditor_url= Hash_64_cstr.hash auditor_url; + h_auditor_url= Hash.Cstring.H64.hash auditor_url; } in let v = @@ -177,7 +177,7 @@ let wire_fee ~output ~master_key ~wire_method ~fee_start ~fee_end ~closing_fee let open Bin_sig.MasterWireFee in sign_f ~f:(EddsaSignature.sign ~key) { - h_wire_method= Hash_64_cstr.hash wire_method; + h_wire_method= Hash.Cstring.H64.hash wire_method; start_date= fee_start; end_date= fee_end; closing_fee; @@ -210,7 +210,7 @@ let drain ~output ~master_key ~debit_account_section ~credit_payto_uri ~wtid wtid; date; amount; - h_section= Hash_64_cstr.hash debit_account_section; + h_section= Hash.Cstring.H64.hash debit_account_section; h_payto= FullPaytoHash.hash credit_payto_uri; } in diff --git a/tools/offline_sig.ml b/tools/offline_sig.ml index 452d027f..aca4f735 100644 --- a/tools/offline_sig.ml +++ b/tools/offline_sig.ml @@ -1,5 +1,4 @@ open Crypto -open Hash open Api let verify_future_keys_response = @@ -22,7 +21,7 @@ let verify_future_keys_response = let h_denom_pub = DenominationHash.hash (DenominationKey.to_octets denom_pub) in - let h_section_name = Hash_64_cstr.hash section_name in + let h_section_name = Hash.Cstring.H64.hash section_name in let anchor_time = stamp_start in let duration_withdraw = Timestamp.diff stamp_start stamp_expire_withdraw in let open Bin_sig.DenominationKeyAnnouncement in