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

clean up

Browse source
This commit is contained in:
swrup 2026-03-03 10:09:03 +01:00
parent d0ddee257e
commit bcc940100a
20 changed files with 112 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/keys.ml
View file

@ -1,7 +1,6 @@
open Syntax
open Crypto
(* TODO better error type *)
type 'a result = ('a, string) Result.t
module type S = sig
@ -33,8 +32,8 @@ module Make (Conn : Pg.CONN) : S = struct
let conn = (module Conn : Pg.CONN)
(* TODO
error "key not found", either:
(* TODO better error
can only be "key not found", either:
- we tried to sign with a key that is not ours
- key was revoked
- bad keyring state *)
@ -49,8 +48,8 @@ module Make (Conn : Pg.CONN) : S = struct
| Ok v -> v
(* - *)
let find_signkey pub = Pg.find_signkey conn pub |> unwrap_err_caqti
let find_denomination h_pub = Pg.find_denom conn h_pub |> unwrap_err_caqti
let find_signkey pub = Pg.find_signkey conn pub |> unwrap_caqti
let find_denomination h_pub = Pg.find_denom conn h_pub |> unwrap_caqti
let warn_key_state =
let first = ref true in
@ -65,7 +64,7 @@ module Make (Conn : Pg.CONN) : S = struct
let signkeys () : Signkey.t list result =
let now = Timestamp.of_ptime @@ Ptime_clock.now () in
let+ l = Pg.get_signkeys conn ~now |> unwrap_err_caqti in
let+ l = Pg.get_signkeys conn ~now |> unwrap_caqti in
let missing_l, l =
List.partition
(fun sk -> Option.is_none @@ Sm_eddsa.find_key sk.Signkey.pub)
@ -79,7 +78,7 @@ module Make (Conn : Pg.CONN) : S = struct
l
let denominations () =
let+ l = Pg.get_denominations conn () |> unwrap_err_caqti in
let+ l = Pg.get_denominations conn () |> unwrap_caqti in
let missing_l, l =
List.partition
(fun dn -> Option.is_none @@ Sm_rsa.find_key dn.Denomination.h_pub)
@ -201,7 +200,7 @@ module Make (Conn : Pg.CONN) : S = struct
let make_future_keys_response () =
let now = Timestamp.of_ptime @@ Ptime_clock.now () in
(* get keys from database to filter out keys already certified *)
let* sk_db_l = Pg.get_signkeys conn ~now |> unwrap_err_caqti in
let* sk_db_l = Pg.get_signkeys conn ~now |> unwrap_caqti in
let sk_ht = Hashtbl.create 0xff in
List.iter (fun sk -> Hashtbl.replace sk_ht sk.Signkey.pub ()) sk_db_l;
let future_signkeys =
@ -209,7 +208,7 @@ module Make (Conn : Pg.CONN) : S = struct
|> List.filter (fun (pub, _) -> not @@ Hashtbl.mem sk_ht pub)
|> List.map make_future_sk
in
let* dn_db_l = Pg.get_denominations conn () |> unwrap_err_caqti in
let* dn_db_l = Pg.get_denominations conn () |> unwrap_caqti in
let dn_ht = Hashtbl.create 0xff in
List.iter (fun dn -> Hashtbl.replace dn_ht dn.Denomination.h_pub ()) dn_db_l;
let future_denoms =
@ -303,7 +302,7 @@ module Make (Conn : Pg.CONN) : S = struct
(* rebuild it *)
let future_sk = make_future_sk (pub, (t1, t2)) in
let sk = sk_of_future_sk future_sk master_sig in
let+ () = Pg.insert_signkey conn sk |> unwrap_err_caqti in
let+ () = Pg.insert_signkey conn sk |> unwrap_caqti in
Logs.info (fun m ->
m "certified signkey `%s`" (EddsaPublicKey.to_b32 sk.pub));
())
@ -321,7 +320,7 @@ module Make (Conn : Pg.CONN) : S = struct
| None ->
let future_dn = make_future_dn (h_pub, (section_name, pub, t1)) in
let dn = dn_of_future_dn future_dn h_pub master_sig in
let+ () = Pg.insert_denom conn dn |> unwrap_err_caqti in
let+ () = Pg.insert_denom conn dn |> unwrap_caqti in
Logs.info (fun m ->
m "certified denomination `%s`"
(DenominationHash.to_b32 dn.h_pub));
@ -332,7 +331,7 @@ module Make (Conn : Pg.CONN) : S = struct
let* _sk = Option.to_result ~none:"signkey not found" opt in
let* () = Sm_eddsa.revoke pub in
let+ () =
Pg.insert_signkey_revocation conn pub revoked_sig |> unwrap_err_caqti
Pg.insert_signkey_revocation conn pub revoked_sig |> unwrap_caqti
in
Logs.info (fun m -> m "revoked signkey `%s`" (EddsaPublicKey.to_b32 pub));
()
@ -343,7 +342,7 @@ module Make (Conn : Pg.CONN) : S = struct
let* () = Sm_rsa.revoke dn.h_pub in
let+ () =
Pg.insert_denomination_revocation conn dn.h_pub revoked_sig
|> unwrap_err_caqti
|> unwrap_caqti
in
Logs.info (fun m ->
m "revoked denomination `%s`" (DenominationHash.to_b32 h_pub));