src/secmod_signkey.ml

@@ -7,14 +7,27 @@ open Syntax
 type t = {
   lock: Miou.Mutex.t;
   sm_key: Signkey.t;
-  mutable signkeys: Signkey.t list;
+  signkey_ht: (Crypto.EddsaPublicKey.t, Signkey.t) Hashtbl.t;
 }
 
+let get_sm_key t = t.sm_key
+
+let get_signkeys t =
+  Miou.Mutex.protect t.lock @@ fun () ->
+  Hashtbl.to_seq_values t.signkey_ht |> List.of_seq
+
+(* TODO *)
+let update_signkeys _conn t signkeys =
+  Miou.Mutex.protect t.lock @@ fun () ->
+  List.iter
+    (fun signkey -> Hashtbl.replace t.signkey_ht signkey.Signkey.pub signkey)
+    signkeys
+
 let dir = Fpath.(v "data" / "secmod_signkey")
 
-let store_secmod_data t =
+let _store_secmod_data t =
   let* () = Data_file.write_eddsa Fpath.(dir / "sm_key") t.sm_key.priv in
-  t.signkeys
+  get_signkeys t
   |> List.mapi (fun i key ->
       let fname = Fpath.(dir / string_of_int i) in
       (fname, key.Signkey.priv))
@@ -38,14 +51,26 @@ let load conn =
   | None, None -> Ok None
   | Some sm_key, Some signkeys ->
       let lock = Miou.Mutex.create () in
-      Ok (Some { lock; sm_key; signkeys })
+      let signkey_ht =
+        signkeys
+        |> List.map (fun v -> (v.Signkey.pub, v))
+        |> List.to_seq
+        |> Hashtbl.of_seq
+      in
+      Ok (Some { lock; sm_key; signkey_ht })
   | _, _ -> error_invalid_state
 
 let make_new () =
   let lock = Miou.Mutex.create () in
   let sm_key = Signkey.make () in
   let signkeys = [ Signkey.make () ] in
-  { lock; sm_key; signkeys }
+  let signkey_ht =
+    signkeys
+    |> List.map (fun v -> (v.Signkey.pub, v))
+    |> List.to_seq
+    |> Hashtbl.of_seq
+  in
+  { lock; sm_key; signkey_ht }
 
 let init conn =
   match load conn with