src/binary_formats.ml

@@ -85,12 +85,12 @@ module UTIL = struct
   module MK_HASH_32 () : sig
     type t = private { hash: string }
 
-    val of_string : string -> t
+    val of_octets : string -> t
     val bin : t Bin.t
   end = struct
     type t = { hash: string }
 
-    let of_string s =
+    let of_octets s =
       match String.length s = 32 with
       | false -> Fmt.failwith "SHA256 failure: data is not 32 bytes"
       | true ->
@@ -125,6 +125,35 @@ module UTIL = struct
       |+ field (bytes 64) (fun t -> t.hash)
       |> sealr
   end
+  (*
+      let to_null_terminated s =
+        let len = String.length s in
+        let b = Bytes.create (len + 1) in
+        Bytes.blit_string s 0 b 0 len;
+        Bytes.set b len '\x00';
+        Bytes.unsafe_to_string b
+      *)
+
+  module HASH_64 : sig
+    type t
+
+    val hash : string -> t
+    val bin : t Bin.t
+  end = struct
+    type t = { hash: Digestif.SHA512.t }
+
+    let hash s =
+      let hash = Digestif.SHA512.(digest_string s) in
+      { hash }
+
+    let hash_bin =
+      let open Bin in
+      map (bytes 64) Digestif.SHA512.of_raw_string Digestif.SHA512.to_raw_string
+
+    let bin =
+      let open Bin in
+      record (fun hash -> { hash }) |+ field hash_bin (fun t -> t.hash) |> sealr
+  end
 end
 
 open UTIL
@@ -141,6 +170,78 @@ module TimestampNBO = MK_TIME_NBO ()
 
 (* -- Cryptographic primitives -- *)
 
+(* GNUNET_CRYPTO format *)
+module GNUNET_RsaPublicKey = struct
+  (* libgnuutil format:
+     https://docs.gnunet.org/doxygen/d9/dbe/structGNUNET__CRYPTO__RsaPublicKeyHeaderP.html
+     https://docs.gnunet.org/doxygen/d6/d70/group__libgnunetutil.html#ga9c99a81e8cd649c1c925d23211a0738f
+     https://www.gnupg.org/documentation/manuals/gcrypt/MPI-formats.html
+
+    format:
+     - rsa header
+     - modulus
+     - public_exponent
+
+    integer in big-endian format (MSB first).
+    Leading zeroes are stripped unless they are required to keep a value positive.
+  *)
+  type header = {
+    n_len: int;
+    e_len: int;
+  }
+
+  type t = {
+    header: header;
+    n: Z.t;
+    e: Z.t;
+  }
+
+  (* need to strip leading zeros or something? *)
+  let z_to_bigendian_bits v =
+    let s = Z.to_bits v in
+    let len = String.length s in
+    let s = String.init len (fun i -> s.[len - 1 - i]) in
+    s
+
+  let header_bin =
+    let open Bin in
+    record (fun n_len e_len -> { n_len; e_len })
+    |+ field beint16 (fun t -> t.n_len)
+    |+ field beint16 (fun t -> t.e_len)
+    |> sealr
+
+  (* note: this one has a dynamic sizeof *)
+  let bin =
+    let open Bin in
+    record (fun header n e ->
+        let n = Z.of_bits n in
+        let e = Z.of_bits e in
+        { header; n; e })
+    |+ field header_bin (fun t -> t.header)
+    (* TODO
+         Z.to_bits is in little endian but we need it in big endian *)
+    (* TODO
+       here it should not be [cstring] but [bytes t.header.n_len] *)
+    |+ field cstring (fun t -> z_to_bigendian_bits t.n)
+    |+ field cstring (fun t -> z_to_bigendian_bits t.e)
+    |> sealr
+
+  let of_pub ({ n; e } : Mirage_crypto_pk.Rsa.pub) =
+    let header = { n_len= Z.size n; e_len= Z.size e } in
+    let t = { header; n; e } in
+    t
+end
+
+module DenominationHash = struct
+  include HASH_64
+
+  let mk (pub : Mirage_crypto_pk.Rsa.pub) =
+    pub
+    |> GNUNET_RsaPublicKey.of_pub
+    |> Bin.to_string GNUNET_RsaPublicKey.bin
+    |> hash
+end
+
 (* --- Hashes --- *)
 
 module ShortHashCode = MK_HASH_32 ()
@@ -153,7 +254,6 @@ module FullPaytoHash = MK_HASH_32 ()
 (* Hash over a normalized payto://-URI, including all optional
    fields and also with account-part canonicalized (so no BIC). *)
 module NormalizedPaytoHash = MK_HASH_32 ()
-module DenominationHash = MK_HASH_64 ()
 module PrivateContractHash = MK_HASH_64 ()
 module ExtensionsPolicyHash = MK_HASH_64 ()
 module MerchantWireHash = MK_HASH_64 ()
@@ -217,61 +317,6 @@ module EncryptedLinkSecretP = MK_64 ()
    type DenominationBlindingKeyP = string; *)
 module DenominationBlindingKeyP = MK_32 ()
 
-(* GNUNET_CRYPTO format *)
-module GNUNET_RsaPublicKey = struct
-  (* libgnuutil format:
-     https://docs.gnunet.org/doxygen/d9/dbe/structGNUNET__CRYPTO__RsaPublicKeyHeaderP.html
-     https://docs.gnunet.org/doxygen/d6/d70/group__libgnunetutil.html#ga9c99a81e8cd649c1c925d23211a0738f
-     https://www.gnupg.org/documentation/manuals/gcrypt/MPI-formats.html
-
-    format:
-     - rsa header
-     - modulus
-     - public_exponent
-
-    integer in big-endian format (MSB first).
-    Leading zeroes are stripped unless they are required to keep a value positive.
-  *)
-  type header = {
-    n_len: int;
-    e_len: int;
-  }
-
-  type t = {
-    header: header;
-    n: Z.t;
-    e: Z.t;
-  }
-
-  (* need to strip leading zeros or something? *)
-  let z_to_bigendian_bits v =
-    let s = Z.to_bits v in
-    let len = String.length s in
-    let s = String.init len (fun i -> s.[len - 1 - i]) in
-    s
-
-  let header_bin =
-    let open Bin in
-    record (fun n_len e_len -> { n_len; e_len })
-    |+ field beint16 (fun t -> t.n_len)
-    |+ field beint16 (fun t -> t.e_len)
-    |> sealr
-
-  (* note: this one has a dynamic sizeof *)
-  let bin =
-    let open Bin in
-    record (fun header n e ->
-        let n = Z.of_bits n in
-        let e = Z.of_bits e in
-        { header; n; e })
-    |+ field header_bin (fun t -> t.header)
-    (* TODO
-         Z.to_bits is in little endian but we need it in big endian *)
-    |+ field cstring (fun t -> z_to_bigendian_bits t.n)
-    |+ field cstring (fun t -> z_to_bigendian_bits t.e)
-    |> sealr
-end
-
 (* --- Various --- *)
 
 module RefreshCommitmentP = MK_64 ()

src/management.ml

@@ -28,7 +28,7 @@ let mk_future_denom denom_secmod_sign_f
   in
   let denom_secmod_sig =
     let open Binary_formats in
-    let h_denom_pub = DenominationHash.of_string (RsaPublicKey.to_octets pub) in
+    let h_denom_pub = DenominationHash.mk pub in
     let h_section_name = HashCode.of_string section_name in
     let anchor_time =
       TimeAbsoluteNBO.{ v= Util.ptime_to_int64_us stamp_start }