swrup/mte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refacto crypto: add eddsa.ml + rsa.ml

Browse source
This commit is contained in:
swrup 2026-03-20 22:47:58 +01:00 • committed by Swrup
parent 4e707b080a
commit 87f06339c8
16 changed files with 517 additions and 537 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/secmod_eddsa.ml
View file

@ -17,7 +17,6 @@ module Log = (val Logs.src_log src : Logs.LOG)
(* - *)
open Syntax
open Crypto
open Time
module Sfn = Mfat.Sfn
module Spath = Mfat.Spath
@ -31,45 +30,45 @@ module Cfg = struct
end
type key = {
priv: EddsaPrivateKey.t;
pub: EddsaPublicKey.t;
priv: Eddsa.priv;
pub: Eddsa.pub;
t1: TimeAbsolute.t;
t2: TimeAbsolute.t;
}
type t = {
fs: Fat.t;
sm_priv: EddsaPrivateKey.t;
sm_pub: EddsaPublicKey.t;
ht: (EddsaPublicKey.t, key) Hashtbl.t;
sm_priv: Eddsa.priv;
sm_pub: Eddsa.pub;
ht: (Eddsa.pub, key) Hashtbl.t;
}
(* todo: this should be encoded in little-endian *)
let key_bin =
let open Bin in
record (fun t1 t2 priv ->
let pub = EddsaPrivateKey.pub_of_priv priv in
let pub = Eddsa.pub_of_priv priv in
{ t1; t2; priv; pub })
|+ field TimeAbsolute.bin (fun t -> t.t1)
|+ field TimeAbsolute.bin (fun t -> t.t2)
|+ field EddsaPrivateKey.bin (fun t -> t.priv)
|+ field Eddsa.priv_bin (fun t -> t.priv)
|> sealr
(* for sm_key only *)
let read_eddsa fs spath =
Log.debug (fun m -> m "reading key file `%a`" Spath.pp spath);
let* data = Fat.read fs spath |> unwrap_msg in
let* priv = EddsaPrivateKey.of_octets data in
let pub = EddsaPrivateKey.pub_of_priv priv in
let* priv = Eddsa.priv_of_octets data in
let pub = Eddsa.pub_of_priv priv in
Ok (priv, pub)
let write_eddsa fs spath priv =
Log.debug (fun m -> m "writing key file `%a`" Spath.pp spath);
let data = EddsaPrivateKey.to_octets priv in
let data = Eddsa.priv_to_octets priv in
Fat.write fs spath data |> unwrap_msg
let key_spath k =
let sfn_res = String.sub (EddsaPublicKey.to_b32 k.pub) 0 8 |> Sfn.of_string in
let sfn_res = String.sub (Eddsa.pub_to_b32 k.pub) 0 8 |> Sfn.of_string in
match sfn_res with
| Error _ -> failwith "not possible"
| Ok sfn -> Spath.(Cfg.key_dir / sfn)
@ -93,9 +92,9 @@ let delete_file fs spath =
()
let gen_key t1 t2 =
let priv, pub = EddsaPrivateKey.generate () in
let priv, pub = Eddsa.generate () in
let k = { priv; pub; t1; t2 } in
Log.debug (fun m -> m "generated key `%s`" (EddsaPublicKey.to_b32 pub));
Log.debug (fun m -> m "generated key `%s`" (Eddsa.pub_to_b32 pub));
k
let sort_keys l = List.sort (fun a b -> TimeAbsolute.compare a.t2 b.t2) l
@ -151,9 +150,9 @@ let init fs =
match opt with
| Some t -> Ok t
| None ->
let sm_priv, sm_pub = EddsaPrivateKey.generate () in
let sm_priv, sm_pub = Eddsa.generate () in
Log.debug (fun m ->
m "generated secmod key: `%s`" (EddsaPublicKey.to_b32 sm_pub));
m "generated secmod key: `%s`" (Eddsa.pub_to_b32 sm_pub));
let ht = Hashtbl.create 0xff in
let t = { fs; sm_priv; sm_pub; ht } in
let* () = write_eddsa fs Cfg.sm_key t.sm_priv in
@ -196,11 +195,11 @@ module Make (Fs : Fat.FS) = struct
(* ---- *)
let sm_pub = t.sm_pub
let sign_secmod s = EddsaSignature.sign ~key:t.sm_priv s
let sign_secmod s = Eddsa.sign ~key:t.sm_priv s
let sign pub s =
let+ k = find pub in
let data = EddsaSignature.sign ~key:k.priv s in
let data = Eddsa.sign ~key:k.priv s in
data
(* delete and replace *)