rename
This commit is contained in:
parent
15c132829e
commit
f0254c6f5d
9 changed files with 140 additions and 137 deletions
|
|
@ -20,7 +20,7 @@ module Keys_get = struct
|
|||
h_pub;
|
||||
master_sig= _;
|
||||
} :
|
||||
Denomination.t) =
|
||||
Denom_data.t) =
|
||||
let denom_pub =
|
||||
DenominationKey.of_rsa RsaDenominationKey.{ age_mask; rsa_pub= pub }
|
||||
in
|
||||
|
|
@ -53,7 +53,7 @@ module Keys_get = struct
|
|||
|
||||
let mk_future_signkey ~sm_signkey_priv
|
||||
({ pub; priv= _; stamp_start; stamp_expire; stamp_end; master_sig= _ } :
|
||||
Signkey.t) =
|
||||
Signkey_data.t) =
|
||||
let signkey_secmod_sig =
|
||||
let open Bin_sig.SigningKeyAnnouncement in
|
||||
let exchange_pub = pub in
|
||||
|
|
@ -67,14 +67,14 @@ module Keys_get = struct
|
|||
let mk_future_keys_response ~sm =
|
||||
let future_signkeys =
|
||||
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 ->
|
||||
let sm_signkey_priv = Secmod.get_sm_key_priv sm in
|
||||
mk_future_signkey ~sm_signkey_priv signkey)
|
||||
in
|
||||
let future_denoms =
|
||||
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 ->
|
||||
let sm_key_priv = Secmod.get_sm_key_priv sm in
|
||||
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 =
|
||||
Secmod.get_denoms sm
|
||||
|> List.find_opt (fun (denom : Denomination.t) ->
|
||||
denom.h_pub = denom_hash)
|
||||
|> List.find_opt (fun (denom : Denom_data.t) -> denom.h_pub = denom_hash)
|
||||
|> function
|
||||
| None ->
|
||||
Fmt.error
|
||||
|
|
@ -138,7 +137,7 @@ module Keys_post = struct
|
|||
let verify_signkey_signature ~sm SignKeySignature.{ key; master_sig } =
|
||||
let* signkey =
|
||||
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
|
||||
| None ->
|
||||
Fmt.error
|
||||
|
|
@ -168,7 +167,7 @@ module Keys_post = struct
|
|||
|> list_iter (fun denom ->
|
||||
let error = Error "update_master_signatures sanity check failure" in
|
||||
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
|
||||
in
|
||||
let* ( valid_from,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue