src/secmod_eddsa.ml

@@ -1,6 +1,4 @@
-let src = Logs.Src.create "mte.secmod_eddsa"
-
-module Log = (val Logs.src_log src : Logs.LOG)
+module Log = (val Logs.src_log (Logs.Src.create "mte.secmod_eddsa") : Logs.LOG)
 open Syntax
 open Crypto
 open Time

src/secmod_rsa.ml

@@ -1,4 +1,5 @@
 (* TODO refacto common parts with secmod_eddsa *)
+module Log = (val Logs.src_log (Logs.Src.create "mte.secmod_rsa") : Logs.LOG)
 open Syntax
 open Crypto
 open Time
@@ -67,11 +68,12 @@ let write_rsa fpath priv =
 
 let write_key k = write_rsa (key_fpath k) k.priv
 
-let delete_key_file k =
-  let+ () =
-    Bos.OS.File.delete ~must_exist:true (key_fpath k) |> unwrap_err_msg
-  in
-  ()
+let delete_file fpath =
+  Log.debug (fun m -> m "(disabled) delete key file `%a`" Fpath.pp fpath);
+  (* TODO just to be safe~~
+  let+ () = Bos.OS.File.delete ~must_exist:true fpath |> unwrap_err_msg in
+*)
+  Ok ()
 
 let get_key_dir_contents dir_fpath =
   let* b = Bos.OS.Dir.create ~mode:0o700 dir_fpath |> unwrap_err_msg in
@@ -202,7 +204,8 @@ module Make () = struct
 
   let delete pub =
     let* k = find pub in
-    Hashtbl.remove t.ht k.pub; delete_key_file k
+    Hashtbl.remove t.ht k.pub;
+    delete_file (key_fpath k)
 
   let _delete_outdated ~now =
     Hashtbl.to_seq_values t.ht