This commit is contained in:
parent
50a6137967
commit
dec2ce9163
6 changed files with 78 additions and 66 deletions
|
|
@ -3,11 +3,14 @@
|
|||
(missing master_sig for fresh denom) *)
|
||||
open Syntax
|
||||
|
||||
type eddsa_priv = Crypto.EddsaPrivateKey.t
|
||||
type eddsa_pub = Crypto.EddsaPublicKey.t
|
||||
type h_denom_pub = Bin_type.DenominationHash.t
|
||||
|
||||
type t = {
|
||||
lock: Miou.Mutex.t;
|
||||
sm_key: Signkey.t;
|
||||
sm_key_priv: eddsa_priv;
|
||||
sm_key_pub: eddsa_pub;
|
||||
denom_ht: (h_denom_pub, Denomination.t) Hashtbl.t;
|
||||
revoked_ht:
|
||||
( h_denom_pub,
|
||||
|
|
@ -15,7 +18,8 @@ type t = {
|
|||
Hashtbl.t;
|
||||
}
|
||||
|
||||
let get_sm_key t = t.sm_key
|
||||
let get_sm_key_pub t = t.sm_key_pub
|
||||
let get_sm_key_priv t = t.sm_key_priv
|
||||
|
||||
let get_denoms t =
|
||||
Miou.Mutex.protect t.lock @@ fun () ->
|
||||
|
|
@ -49,7 +53,7 @@ let dir = Fpath.(v "data" / "secmod_signkey")
|
|||
|
||||
(* TODO secmod store *)
|
||||
let _store_secmod_data t =
|
||||
let* () = Data_file.write_eddsa Fpath.(dir / "sm_key") t.sm_key.priv in
|
||||
let* () = Data_file.write_eddsa Fpath.(dir / "sm_key") t.sm_key_priv in
|
||||
get_denoms t
|
||||
|> List.mapi (fun i key ->
|
||||
let fname = Fpath.(dir / string_of_int i) in
|
||||
|
|
@ -106,7 +110,7 @@ let load conn =
|
|||
let error_invalid_state =
|
||||
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* sm_key_priv = Data_file.read_eddsa Fpath.(dir / "sm_key") in
|
||||
let* denoms =
|
||||
let* l =
|
||||
let open Config.Coin in
|
||||
|
|
@ -127,9 +131,10 @@ let load conn =
|
|||
| Error () -> error_invalid_state
|
||||
| Ok opt -> Ok opt
|
||||
in
|
||||
match (sm_key, denoms) with
|
||||
match (sm_key_priv, denoms) with
|
||||
| None, None -> Ok None
|
||||
| Some sm_key, Some denoms ->
|
||||
| Some sm_key_priv, Some denoms ->
|
||||
let sm_key_pub = Crypto.EddsaPrivateKey.pub_of_priv sm_key_priv in
|
||||
let lock = Miou.Mutex.create () in
|
||||
let denom_ht =
|
||||
denoms
|
||||
|
|
@ -138,12 +143,12 @@ let load conn =
|
|||
|> Hashtbl.of_seq
|
||||
in
|
||||
let revoked_ht = Hashtbl.create 0xff in
|
||||
Ok (Some { lock; sm_key; denom_ht; revoked_ht })
|
||||
Ok (Some { lock; sm_key_priv; sm_key_pub; denom_ht; revoked_ht })
|
||||
| _, _ -> error_invalid_state
|
||||
|
||||
let make_new () =
|
||||
let lock = Miou.Mutex.create () in
|
||||
let sm_key = Signkey.make () in
|
||||
let sm_key_priv, sm_key_pub = Mirage_crypto_ec.Ed25519.generate () in
|
||||
let denoms = List.map Denomination.make Config.Coin.all_coins in
|
||||
let denom_ht =
|
||||
denoms
|
||||
|
|
@ -152,7 +157,7 @@ let make_new () =
|
|||
|> Hashtbl.of_seq
|
||||
in
|
||||
let revoked_ht = Hashtbl.create 0xff in
|
||||
{ lock; sm_key; denom_ht; revoked_ht }
|
||||
{ lock; sm_key_priv; sm_key_pub; denom_ht; revoked_ht }
|
||||
|
||||
let init conn =
|
||||
match load conn with
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue