From ae27ce87a8e381cb4015aa4db11a5765303d1be6 Mon Sep 17 00:00:00 2001 From: swrup Date: Sat, 6 Dec 2025 23:25:29 +0100 Subject: [PATCH] --- src/management.ml | 25 ++++++++++++------------- src/secmod_denom.ml | 19 +++++++++++-------- src/secmod_signkey.ml | 24 ++++++++++++++---------- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/src/management.ml b/src/management.ml index dc7e6331..6a701c50 100644 --- a/src/management.ml +++ b/src/management.ml @@ -67,13 +67,13 @@ let mk_future_signkey ~sm_signkey_priv let mk_future_keys_response ~(sm_signkey : Secmod_signkey.t) ~(sm_denom : Secmod_denom.t) = let future_denoms = - sm_denom.keys + sm_denom.denoms |> List.filter (fun k -> Option.is_none k.Denomination.master_sig) |> List.map (fun denom -> mk_future_denom ~sm_denom_priv:sm_denom.sm_key.Signkey.priv denom) in let future_signkeys = - sm_signkey.keys + sm_signkey.signkeys |> List.filter (fun k -> Option.is_none k.Signkey.master_sig) |> List.map (fun signkey -> mk_future_signkey ~sm_signkey_priv:sm_signkey.sm_key.Signkey.priv @@ -93,8 +93,7 @@ let mk_future_keys_response ~(sm_signkey : Secmod_signkey.t) (* - ** - *) -let verify_denom_signature ~sm_denom DenomSignature.{ h_denom_pub; master_sig } - = +let verify_denom_signature ~denoms DenomSignature.{ h_denom_pub; master_sig } = let open Syntax in let denom_hash = Bin_type.DenominationHash.of_octets (HashCode.to_octets h_denom_pub) @@ -103,7 +102,7 @@ let verify_denom_signature ~sm_denom DenomSignature.{ h_denom_pub; master_sig } let opt = List.find_opt (fun (denom : Denomination.t) -> denom.h_pub = denom_hash) - sm_denom.Secmod_denom.keys + denoms in match opt with | None -> @@ -129,13 +128,11 @@ let verify_denom_signature ~sm_denom DenomSignature.{ h_denom_pub; master_sig } in verify ~key:Config.master_public_key master_sig r -let verify_signkey_signature ~sm_signkey SignKeySignature.{ key; master_sig } = +let verify_signkey_signature ~signkeys SignKeySignature.{ key; master_sig } = let open Syntax in let* signkey = let opt = - List.find_opt - (fun (signkey : Signkey.t) -> signkey.pub = key) - sm_signkey.Secmod_signkey.keys + List.find_opt (fun (signkey : Signkey.t) -> signkey.pub = key) signkeys in match opt with | None -> @@ -155,11 +152,11 @@ let verify_signkey_signature ~sm_signkey SignKeySignature.{ key; master_sig } = in verify ~key:Config.master_public_key master_sig r -let verify_master_signatures ~sm_signkey ~sm_denom +let verify_master_signatures ~signkeys ~denoms MasterSignatures.{ denom_sigs; signkey_sigs } = let open Syntax in - let* () = list_iter (verify_denom_signature ~sm_denom) denom_sigs in - let* () = list_iter (verify_signkey_signature ~sm_signkey) signkey_sigs in + let* () = list_iter (verify_denom_signature ~denoms) denom_sigs in + let* () = list_iter (verify_signkey_signature ~signkeys) signkey_sigs in Ok () (* --- *) @@ -215,7 +212,9 @@ let keys_post req server _env = Error msg in let* () = - verify_master_signatures ~sm_signkey ~sm_denom master_signatures + let denoms = sm_denom.denoms in + let signkeys = sm_signkey.signkeys in + verify_master_signatures ~signkeys ~denoms master_signatures in let* () = store_master_signatures () in Ok "" diff --git a/src/secmod_denom.ml b/src/secmod_denom.ml index 504e0755..cb20d39b 100644 --- a/src/secmod_denom.ml +++ b/src/secmod_denom.ml @@ -1,16 +1,16 @@ open Syntax type t = { + lock: Miou.Mutex.t; sm_key: Signkey.t; - (* TODO rename *) - keys: Denomination.t list; + denoms: Denomination.t list; } let dir = Fpath.(v "data" / "secmod_signkey") let store_secmod_data t = let* () = Data_file.write_eddsa Fpath.(dir / "sm_key") t.sm_key.priv in - t.keys + t.denoms |> List.mapi (fun i key -> let fname = Fpath.(dir / string_of_int i) in (fname, key.Denomination.priv)) @@ -21,7 +21,7 @@ let load conn = Fmt.error_msg "secmod_denom load error: invalid store state." in let* sm_key = Data_file.load_signkey conn Fpath.(dir / "sm_key") in - let* keys = + let* denoms = let* l = let open Config.Coin in Syntax.list_map @@ -36,12 +36,15 @@ let load conn = | Error () -> error_invalid_state | Ok opt -> Ok opt in - match (sm_key, keys) with + match (sm_key, denoms) with | None, None -> Ok None - | Some sm_key, Some keys -> Ok (Some { sm_key; keys }) + | Some sm_key, Some denoms -> + let lock = Miou.Mutex.create () in + Ok (Some { lock; sm_key; denoms }) | _, _ -> error_invalid_state let make_new () = + let lock = Miou.Mutex.create () in let sm_key = Signkey.make () in - let keys = List.map Denomination.make Config.Coin.all_coins in - { sm_key; keys } + let denoms = List.map Denomination.make Config.Coin.all_coins in + { lock; sm_key; denoms } diff --git a/src/secmod_signkey.ml b/src/secmod_signkey.ml index 128a38c0..54e3d33e 100644 --- a/src/secmod_signkey.ml +++ b/src/secmod_signkey.ml @@ -1,19 +1,20 @@ (* TODO - - key rotation - - how many signkey to use? - we just use 1 for now *) + - key rotation + - how many signkey to use? + we just use 1 for now *) open Syntax type t = { + lock: Miou.Mutex.t; sm_key: Signkey.t; - keys: Signkey.t list; + signkeys: Signkey.t list; } let dir = Fpath.(v "data" / "secmod_signkey") let store_secmod_data t = let* () = Data_file.write_eddsa Fpath.(dir / "sm_key") t.sm_key.priv in - t.keys + t.signkeys |> List.mapi (fun i key -> let fname = Fpath.(dir / string_of_int i) in (fname, key.Signkey.priv)) @@ -24,7 +25,7 @@ let load conn = Fmt.error_msg "secmod_signkey load error: invalid store state." in let* sm_key = Data_file.load_signkey conn Fpath.(dir / "sm_key") in - let* keys = + let* signkeys = let l = List.init 1 (fun i -> Fpath.(dir / string_of_int i)) in let* l = Syntax.list_map (fun fname -> Data_file.load_signkey conn fname) l @@ -33,12 +34,15 @@ let load conn = | Error () -> error_invalid_state | Ok opt -> Ok opt in - match (sm_key, keys) with + match (sm_key, signkeys) with | None, None -> Ok None - | Some sm_key, Some keys -> Ok (Some { sm_key; keys }) + | Some sm_key, Some signkeys -> + let lock = Miou.Mutex.create () in + Ok (Some { lock; sm_key; signkeys }) | _, _ -> error_invalid_state let make_new () = + let lock = Miou.Mutex.create () in let sm_key = Signkey.make () in - let keys = [ Signkey.make () ] in - { sm_key; keys } + let signkeys = [ Signkey.make () ] in + { lock; sm_key; signkeys }