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

Browse source
This commit is contained in:
swrup 2025-11-23 15:50:55 +01:00
parent 92a4f9a469
commit 26c2b58473
3 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/denomination.ml
View file

@ -15,7 +15,7 @@ type t = {
age_mask: int; age_mask: int;
h_pub: Bin_type.DenominationHash.t; h_pub: Bin_type.DenominationHash.t;
sign: string -> RsaSignature.t; sign: string -> RsaSignature.t;
master_sig: EddsaSignature.t option; master_sig: EddsaSignature.t;
} }
let make let make
@ -50,7 +50,7 @@ let make
let pub = pub_of_priv priv in let pub = pub_of_priv priv in
let h_pub = Bin_type.DenominationHash.hash (RsaPublicKey.to_octets pub) in let h_pub = Bin_type.DenominationHash.hash (RsaPublicKey.to_octets pub) in
let sign = RsaSignature.sign ~key:priv in let sign = RsaSignature.sign ~key:priv in
let master_sig = None in let master_sig = EddsaSignature.of_octets (String.make 64 'x') in
{ {
pub; pub;
section_name; section_name;

6
src/pg.ml
View file

@ -97,12 +97,9 @@ let activate_signing_key =
in in
fun (module Conn : CONN) exchange_signkey -> fun (module Conn : CONN) exchange_signkey ->
let Signkey. let Signkey.
{ pub; stamp_start; stamp_expire; stamp_end; master_sig= _; sign= _ } { pub; stamp_start; stamp_expire; stamp_end; master_sig; sign= _ } =
=
exchange_signkey exchange_signkey
in in
(*let master_sig = master_sig |> Option.get in*)
let master_sig = EddsaSignature.of_octets (String.make 64 'x') in
Conn.exec insert_signkey Conn.exec insert_signkey
(pub, stamp_start, stamp_expire, stamp_end, master_sig) (pub, stamp_start, stamp_expire, stamp_end, master_sig)
@ -151,7 +148,6 @@ let add_denomination_key =
} = } =
denom denom
in in
let master_sig = master_sig |> Option.get in
Conn.exec denomination_insert Conn.exec denomination_insert
( h_pub, ( h_pub,
pub, pub,

6
src/signkey.ml
View file

@ -1,5 +1,6 @@
open Crypto open Crypto
(* TODO master_sig: use option? *)
type t = { type t = {
pub: EddsaPublicKey.t; pub: EddsaPublicKey.t;
stamp_start: Ptime.t; stamp_start: Ptime.t;
@ -7,7 +8,7 @@ type t = {
stamp_end: Ptime.t; stamp_end: Ptime.t;
sign: string -> EddsaSignature.t; sign: string -> EddsaSignature.t;
(* signature of this key by offline master key *) (* signature of this key by offline master key *)
master_sig: EddsaSignature.t option; master_sig: EddsaSignature.t;
} }
let generate () = let generate () =
@ -24,5 +25,6 @@ let generate () =
let stamp_end = stamp_expire in let stamp_end = stamp_expire in
let priv, pub = Mirage_crypto_ec.Ed25519.generate () in let priv, pub = Mirage_crypto_ec.Ed25519.generate () in
let sign s = EddsaSignature.sign ~key:priv s in let sign s = EddsaSignature.sign ~key:priv s in
let master_sig = None in (* dummy master_sig *)
let master_sig = EddsaSignature.of_octets (String.make 64 'x') in
{ pub; stamp_start; stamp_expire; stamp_end; master_sig; sign } { pub; stamp_start; stamp_expire; stamp_end; master_sig; sign }