JJ: Description from the destination commit:
rename mte_*.ml JJ: Description from source commit: ~
This commit is contained in:
parent
4d39d2ff39
commit
47b256689b
19 changed files with 91 additions and 111 deletions
|
|
@ -80,22 +80,22 @@ let key_fpath k =
|
|||
|
||||
let read_eddsa fpath =
|
||||
Log.debug (fun m -> m "reading key file `%a`" Fpath.pp fpath);
|
||||
let* data = Bos.OS.File.read fpath |> unwrap_err_msg in
|
||||
let* data = Bos.OS.File.read fpath |> unwrap_msg in
|
||||
EddsaPrivateKey.of_octets data
|
||||
|
||||
let read_rsa fpath =
|
||||
Log.debug (fun m -> m "reading key file `%a`" Fpath.pp fpath);
|
||||
let* data = Bos.OS.File.read fpath |> unwrap_err_msg in
|
||||
let* data = Bos.OS.File.read fpath |> unwrap_msg in
|
||||
RsaPrivateKey.of_octets data
|
||||
|
||||
let write_eddsa fpath priv =
|
||||
Log.debug (fun m -> m "writing key file `%a`" Fpath.pp fpath);
|
||||
let data = EddsaPrivateKey.to_octets priv in
|
||||
Bos.OS.File.write fpath data |> unwrap_err_msg
|
||||
Bos.OS.File.write fpath data |> unwrap_msg
|
||||
|
||||
let write_rsa fpath priv =
|
||||
let data = RsaPrivateKey.to_octets priv in
|
||||
Bos.OS.File.write fpath data |> unwrap_err_msg
|
||||
Bos.OS.File.write fpath data |> unwrap_msg
|
||||
|
||||
let write_key k = write_rsa (key_fpath k) k.priv
|
||||
|
||||
|
|
@ -109,14 +109,14 @@ let delete_file fpath =
|
|||
Fpath.pp fpath
|
||||
in
|
||||
Log.debug (fun m -> m "delete key file `%a`" Fpath.pp fpath);
|
||||
let+ () = Bos.OS.File.delete ~must_exist:true fpath |> unwrap_err_msg in
|
||||
let+ () = Bos.OS.File.delete ~must_exist:true fpath |> unwrap_msg in
|
||||
()
|
||||
|
||||
let get_key_dir_contents dir_fpath =
|
||||
let* b = Bos.OS.Dir.create ~mode:0o700 dir_fpath |> unwrap_err_msg in
|
||||
let* b = Bos.OS.Dir.create ~mode:0o700 dir_fpath |> unwrap_msg in
|
||||
if b then Log.info (fun m -> m "created directory `%a`" Fpath.pp dir_fpath);
|
||||
let+ l =
|
||||
Bos.OS.Dir.contents ~dotfiles:false ~rel:false dir_fpath |> unwrap_err_msg
|
||||
Bos.OS.Dir.contents ~dotfiles:false ~rel:false dir_fpath |> unwrap_msg
|
||||
in
|
||||
List.map Fpath.normalize l
|
||||
|
||||
|
|
@ -168,7 +168,7 @@ let gen_additional_keys_until_lookahead ~now ~section_name l =
|
|||
let sm_key_fpath =
|
||||
Result.get_ok
|
||||
@@
|
||||
let+ fpath = Fpath.of_string Cfg.sm_priv_key |> unwrap_err_msg in
|
||||
let+ fpath = Fpath.of_string Cfg.sm_priv_key |> unwrap_msg in
|
||||
Fpath.normalize fpath
|
||||
|
||||
(* we load sm_key separately
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue