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:48:04 +01:00
parent c26b4ce0a9
commit 6ab770bf1e
2 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/management.ml
View file

@ -20,7 +20,7 @@ module Keys_get = struct
h_pub; h_pub;
master_sig= _; master_sig= _;
} : } :
Denomination.t) = Denom_data.t) =
let denom_pub = let denom_pub =
DenominationKey.of_rsa RsaDenominationKey.{ age_mask; rsa_pub= pub } DenominationKey.of_rsa RsaDenominationKey.{ age_mask; rsa_pub= pub }
in in
@ -53,7 +53,7 @@ module Keys_get = struct
let mk_future_signkey ~sm_signkey_priv let mk_future_signkey ~sm_signkey_priv
({ pub; priv= _; stamp_start; stamp_expire; stamp_end; master_sig= _ } : ({ pub; priv= _; stamp_start; stamp_expire; stamp_end; master_sig= _ } :
Signkey.t) = Signkey_data.t) =
let signkey_secmod_sig = let signkey_secmod_sig =
let open Bin_sig.SigningKeyAnnouncement in let open Bin_sig.SigningKeyAnnouncement in
let exchange_pub = pub in let exchange_pub = pub in
@ -67,14 +67,14 @@ module Keys_get = struct
let mk_future_keys_response ~sm = let mk_future_keys_response ~sm =
let future_signkeys = let future_signkeys =
Secmod.get_signkeys sm Secmod.get_signkeys sm
|> List.filter (fun k -> Option.is_none k.Signkey.master_sig) |> List.filter (fun k -> Option.is_none k.Signkey_data.master_sig)
|> List.map (fun signkey -> |> List.map (fun signkey ->
let sm_signkey_priv = Secmod.get_sm_key_priv sm in let sm_signkey_priv = Secmod.get_sm_key_priv sm in
mk_future_signkey ~sm_signkey_priv signkey) mk_future_signkey ~sm_signkey_priv signkey)
in in
let future_denoms = let future_denoms =
Secmod.get_denoms sm Secmod.get_denoms sm
|> List.filter (fun k -> Option.is_none k.Denomination.master_sig) |> List.filter (fun k -> Option.is_none k.Denom_data.master_sig)
|> List.map (fun denom -> |> List.map (fun denom ->
let sm_key_priv = Secmod.get_sm_key_priv sm in let sm_key_priv = Secmod.get_sm_key_priv sm in
mk_future_denom ~sm_key_priv denom) mk_future_denom ~sm_key_priv denom)
@ -109,8 +109,7 @@ module Keys_post = struct
let denom_hash = HashCode.to_denomination_hash h_denom_pub in let denom_hash = HashCode.to_denomination_hash h_denom_pub in
let* denom = let* denom =
Secmod.get_denoms sm Secmod.get_denoms sm
|> List.find_opt (fun (denom : Denomination.t) -> |> List.find_opt (fun (denom : Denom_data.t) -> denom.h_pub = denom_hash)
denom.h_pub = denom_hash)
|> function |> function
| None -> | None ->
Fmt.error Fmt.error
@ -138,7 +137,7 @@ module Keys_post = struct
let verify_signkey_signature ~sm SignKeySignature.{ key; master_sig } = let verify_signkey_signature ~sm SignKeySignature.{ key; master_sig } =
let* signkey = let* signkey =
Secmod.get_signkeys sm Secmod.get_signkeys sm
|> List.find_opt (fun (signkey : Signkey.t) -> signkey.pub = key) |> List.find_opt (fun (signkey : Signkey_data.t) -> signkey.pub = key)
|> function |> function
| None -> | None ->
Fmt.error Fmt.error
@ -168,7 +167,7 @@ module Keys_post = struct
|> list_iter (fun denom -> |> list_iter (fun denom ->
let error = Error "update_master_signatures sanity check failure" in let error = Error "update_master_signatures sanity check failure" in
let* opt = let* opt =
Pg.lookup_denomination_key db_conn denom.Denomination.h_pub Pg.lookup_denomination_key db_conn denom.Denom_data.h_pub
|> unwrap_err_caqti |> unwrap_err_caqti
in in
let* ( valid_from, let* ( valid_from,

4
src/secmod.ml
View file

@ -13,9 +13,9 @@ type t = {
sk_ht: (eddsa_pub, Signkey_data.t) Hashtbl.t; sk_ht: (eddsa_pub, Signkey_data.t) Hashtbl.t;
sk_revoked_ht: sk_revoked_ht:
(eddsa_pub, Signkey_data.t * Bin_sig.MasterSigningKeyRevocation.t) Hashtbl.t; (eddsa_pub, Signkey_data.t * Bin_sig.MasterSigningKeyRevocation.t) Hashtbl.t;
dn_ht: (h_denom_pub, Denom_data.t) Hashtbl.t; dn_ht: (denomination_hash, Denom_data.t) Hashtbl.t;
dn_revoked_ht: dn_revoked_ht:
( h_denom_pub, ( denomination_hash,
Denom_data.t * Bin_sig.MasterDenominationKeyRevocation.t ) Denom_data.t * Bin_sig.MasterDenominationKeyRevocation.t )
Hashtbl.t; Hashtbl.t;
} }