src/binary_formats.ml

@@ -246,9 +246,8 @@ include UTIL
 (* -- Cryptographic primitives -- *)
 
 module DenominationHash = MK_SRC_HASH_32 (struct
-  type src = Mirage_crypto_pk.Rsa.pub
+  type src = Types.RsaPublicKey.t
 
-  (* function to convert src type to a string for hashing *)
   let to_octets = Types.RsaPublicKey.to_octets
 end)
 

src/denomination.ml

@@ -1,6 +1,7 @@
 open Types
 
 type t = {
+  pub: RsaPublicKey.t;
   section_name: string;
   value: Amount.t;
   stamp_start: Ptime.t;
@@ -11,8 +12,9 @@ type t = {
   fee_deposit: Amount.t;
   fee_refresh: Amount.t;
   fee_refund: Amount.t;
-  pub: RsaPublicKey.t;
+  h_pub: Binary_formats.DenominationHash.t;
   sign: string -> RsaSignature.t;
+  master_sig: EddsaSignature.t option;
 }
 
 let hash_pub _pub =
@@ -49,8 +51,11 @@ let make
   let open Mirage_crypto_pk.Rsa in
   let priv = generate ~bits:rsa_keysize () in
   let pub = pub_of_priv priv in
+  let h_pub = Binary_formats.DenominationHash.hash pub in
   let sign = RsaSignature.sign ~key:priv in
+  let master_sig = None in
   {
+    pub;
     section_name;
     value;
     stamp_start;
@@ -61,6 +66,7 @@ let make
     fee_deposit;
     fee_refresh;
     fee_refund;
-    pub;
+    h_pub;
     sign;
+    master_sig;
   }

src/devices.ml

@@ -1,6 +1,16 @@
-(* TODO
-   better types to not mixup keys maybe
-   .. *)
+module Secmod_signkey = struct
+  type t = {
+    secmod_public_key: Signkey.t;
+    signkeys: Signkey.t list;
+  }
+end
+
+module Secmod_denom = struct
+  type t = {
+    secmod_signkey: Signkey.t;
+    denom_keys: Denomination.t list;
+  }
+end
 
 let signkey = Signkey.make ~name:"signkey"
 let online_key = Signkey.make ~name:"online_key"

src/management.ml

@@ -3,6 +3,7 @@ open Api_types
 
 let mk_future_denom denom_key_signf
     ({
+       pub;
        section_name;
        value;
        stamp_start;
@@ -13,8 +14,9 @@ let mk_future_denom denom_key_signf
        fee_deposit;
        fee_refresh;
        fee_refund;
-       pub;
+       h_pub;
        sign= _;
+       master_sig= _;
      } :
       Denomination.t) =
   let denom_pub =
@@ -22,7 +24,7 @@ let mk_future_denom denom_key_signf
   in
   let denom_secmod_sig =
     let open Binary_formats in
-    let h_denom_pub = DenominationHash.hash pub in
+    let h_denom_pub = h_pub in
     let h_section_name = Cstring_hash_64.hash section_name in
     let anchor_time =
       TimeAbsoluteNBO.{ v= Util.ptime_to_int64_us stamp_start }
@@ -58,7 +60,8 @@ let mk_future_denom denom_key_signf
     }
 
 let mk_future_signkey signkey_signf
-    ({ pub; sign= _; stamp_start; stamp_expire; stamp_end } : Signkey.t) =
+    ({ pub; stamp_start; stamp_expire; stamp_end; sign= _; master_sig= _ } :
+      Signkey.t) =
   let signkey_secmod_sig =
     let open Binary_formats in
     let exchange_pub = pub in

src/signkey.ml

@@ -1,11 +1,12 @@
 open Types
 
 type t = {
+  pub: EddsaPublicKey.t;
   stamp_start: Ptime.t;
   stamp_expire: Ptime.t;
   stamp_end: Ptime.t;
-  pub: EddsaPublicKey.t;
   sign: string -> EddsaSignature.t;
+  master_sig: EddsaSignature.t option;
 }
 
 let make ~name =
@@ -27,4 +28,5 @@ let make ~name =
   let stamp_end = stamp_expire in
   let priv, pub = Mirage_crypto_ec.Ed25519.generate () in
   let sign s = EddsaSignature.sign ~key:priv s in
-  { stamp_start; stamp_expire; stamp_end; pub; sign }
+  let master_sig = None in
+  { pub; stamp_start; stamp_expire; stamp_end; master_sig; sign }