secmod: use lock + ht + .mli

This commit is contained in:
swrup 2025-12-06 23:25:29 +01:00
parent 846122b49c
commit 0d17d2a675
7 changed files with 141 additions and 71 deletions

View file

@ -66,22 +66,25 @@ 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
|> 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
Secmod_signkey.get_signkeys sm_signkey
|> 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
signkey)
let sm_signkey_priv =
(Secmod_signkey.get_sm_key sm_signkey).Signkey.priv
in
mk_future_signkey ~sm_signkey_priv signkey)
in
let future_denoms =
Secmod_denom.get_denoms sm_denom
|> List.filter (fun k -> Option.is_none k.Denomination.master_sig)
|> List.map (fun denom ->
let sm_denom_priv = (Secmod_denom.get_sm_key sm_denom).Signkey.priv in
mk_future_denom ~sm_denom_priv denom)
in
let master_pub = Config.Exchange.master_public_key in
let denom_secmod_public_key = sm_denom.sm_key.pub in
let signkey_secmod_public_key = sm_signkey.sm_key.pub in
let denom_secmod_public_key = (Secmod_denom.get_sm_key sm_denom).pub in
let signkey_secmod_public_key = (Secmod_signkey.get_sm_key sm_signkey).pub in
FutureKeysResponse.
{
future_denoms;
@ -93,7 +96,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 ~sm_denoms DenomSignature.{ h_denom_pub; master_sig }
=
let open Syntax in
let denom_hash =
@ -103,7 +106,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
sm_denoms
in
match opt with
| None ->
@ -129,13 +132,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 ~sm_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) sm_signkeys
in
match opt with
| None ->
@ -155,17 +156,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 ~sm_signkeys ~sm_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
Ok ()
(* --- *)
let store_master_signatures _ =
(* TODO *)
let* () = list_iter (verify_denom_signature ~sm_denoms) denom_sigs in
let* () = list_iter (verify_signkey_signature ~sm_signkeys) signkey_sigs in
Ok ()
(* --- *)
@ -215,9 +210,11 @@ let keys_post req server _env =
Error msg
in
let* () =
verify_master_signatures ~sm_signkey ~sm_denom master_signatures
let sm_denoms = Secmod_denom.get_denoms sm_denom in
let sm_signkeys = Secmod_signkey.get_signkeys sm_signkey in
verify_master_signatures ~sm_signkeys ~sm_denoms master_signatures
in
let* () = store_master_signatures () in
(* TODO let* () = update_master_signatures () in*)
Ok ""
in
respond_with_res res req