swrup/mte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Browse source
This commit is contained in:
swrup 2025-12-15 16:00:52 +01:00
parent c62f91c306
commit 730c2f906b
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/devices.ml
View file

@ -22,7 +22,7 @@ let secmod_signkey =
let finally _key = () in let finally _key = () in
Vif.Device.v ~name:"secmod_signkey" ~finally Vif.Device.v ~name:"secmod_signkey" ~finally
[ Vif.Device.value db_connection ] [ Vif.Device.value db_connection ]
@@ fun conn (_env : env) -> Secmod_signkey.init conn @@ fun conn (_env : env) -> Secmod.init conn
let secmod_denom = let secmod_denom =
let finally _key = () in let finally _key = () in

16
src/management.ml
View file

@ -64,13 +64,13 @@ module Keys_get = struct
FutureSignKey. FutureSignKey.
{ key= pub; stamp_start; stamp_expire; stamp_end; signkey_secmod_sig } { key= pub; stamp_start; stamp_expire; stamp_end; signkey_secmod_sig }
let mk_future_keys_response ~(sm_signkey : Secmod_signkey.t) let mk_future_keys_response ~(sm_signkey : Secmod.t)
~(sm_denom : Secmod_denom.t) = ~(sm_denom : Secmod_denom.t) =
let future_signkeys = let future_signkeys =
Secmod_signkey.get_signkeys sm_signkey Secmod.get_signkeys sm_signkey
|> List.filter (fun k -> Option.is_none k.Signkey.master_sig) |> List.filter (fun k -> Option.is_none k.Signkey.master_sig)
|> List.map (fun signkey -> |> List.map (fun signkey ->
let sm_signkey_priv = Secmod_signkey.get_sm_key_priv sm_signkey in let sm_signkey_priv = Secmod.get_sm_key_priv sm_signkey in
mk_future_signkey ~sm_signkey_priv signkey) mk_future_signkey ~sm_signkey_priv signkey)
in in
let future_denoms = let future_denoms =
@ -82,7 +82,7 @@ module Keys_get = struct
in in
let master_pub = Config.Exchange.master_public_key in let master_pub = Config.Exchange.master_public_key in
let denom_secmod_public_key = Secmod_denom.get_sm_key_pub sm_denom in let denom_secmod_public_key = Secmod_denom.get_sm_key_pub sm_denom in
let signkey_secmod_public_key = Secmod_signkey.get_sm_key_pub sm_signkey in let signkey_secmod_public_key = Secmod.get_sm_key_pub sm_signkey in
FutureKeysResponse. FutureKeysResponse.
{ {
future_denoms; future_denoms;
@ -141,7 +141,7 @@ module Keys_post = struct
let verify_signkey_signature ~sm_signkey SignKeySignature.{ key; master_sig } let verify_signkey_signature ~sm_signkey SignKeySignature.{ key; master_sig }
= =
let* signkey = let* signkey =
Secmod_signkey.get_signkeys sm_signkey Secmod.get_signkeys sm_signkey
|> List.find_opt (fun (signkey : Signkey.t) -> signkey.pub = key) |> List.find_opt (fun (signkey : Signkey.t) -> signkey.pub = key)
|> function |> function
| None -> | None ->
@ -203,7 +203,7 @@ module Keys_post = struct
signkey_sigs signkey_sigs
|> List.map (fun SignKeySignature.{ key; master_sig } -> |> List.map (fun SignKeySignature.{ key; master_sig } ->
(key, master_sig)) (key, master_sig))
|> Secmod_signkey.add_master_signatures db_conn sm_signkey |> Secmod.add_master_signatures db_conn sm_signkey
in in
let* () = let* () =
denom_sigs denom_sigs
@ -271,9 +271,7 @@ module Signkey_revoke = struct
let do_ ~db_conn ~sm_signkey exchange_pub let do_ ~db_conn ~sm_signkey exchange_pub
SignkeyRevocationSignature.{ master_sig } = SignkeyRevocationSignature.{ master_sig } =
let* () = let* () = Secmod.revoke_signkey sm_signkey exchange_pub master_sig in
Secmod_signkey.revoke_signkey sm_signkey exchange_pub master_sig
in
let+ () = let+ () =
Pg.insert_signkey_revocation db_conn exchange_pub master_sig Pg.insert_signkey_revocation db_conn exchange_pub master_sig
|> unwrap_err_caqti |> unwrap_err_caqti