src/api.ml

@@ -22,7 +22,7 @@
      - number is "float", but we probably want int everywhere instead
      - numeric values capped at 2^53 -1 inclusive because json *)
 open Crypto
-open Bin_signature
+open Api_sig
 open Jsont.Object
 
 let encode_exn jsont v = Jsont_bytesrw.encode_string jsont v |> Result.get_ok

src/management.ml

@@ -24,7 +24,7 @@ let mk_future_denom ~key
     DenominationKey.of_rsa RsaDenominationKey.{ age_mask; rsa_pub= pub }
   in
   let denom_secmod_sig =
-    let open Bin_signature.DenominationKeyAnnouncementPS in
+    let open Api_sig.DenominationKeyAnnouncementPS in
     let h_denom_pub = h_pub in
     let h_section_name = Bin_type.Hash_64_cstr.hash section_name in
     let anchor_time = stamp_start in
@@ -53,7 +53,7 @@ let mk_future_signkey ~key
     ({ pub; priv= _; stamp_start; stamp_expire; stamp_end; master_sig= _ } :
       Signkey.t) =
   let signkey_secmod_sig =
-    let open Bin_signature.SigningKeyAnnouncementPS in
+    let open Api_sig.SigningKeyAnnouncementPS in
     let exchange_pub = pub in
     let anchor_time = stamp_start in
     let duration =

tools/dune

@@ -1,7 +1,7 @@
 (executable
  (public_name offline)
  (name offline)
- (modules offline offline_impl offline_bin)
+ (modules offline offline_impl offline_sig)
  (libraries cmdliner bos fmt mirage-crypto ptime mte vif))
 
 ; todo depends on curl

tools/offline_impl.ml

@@ -46,9 +46,9 @@ let sign ~master_key ~input ~output =
   let* master_key = read_file master_key in
   let master_key = EddsaPrivateKey.of_octets master_key in
   let* future_key_response = Api.decode Api.FutureKeysResponse.jsont input in
-  let* () = Offline_bin.verify_future_key_response future_key_response in
+  let* () = Offline_sig.verify_future_key_response future_key_response in
   let master_signatures =
-    Offline_bin.make_master_signatures ~master_key future_key_response
+    Offline_sig.make_master_signatures ~master_key future_key_response
   in
   let* s = Api.encode Api.MasterSignatures.jsont master_signatures in
   let* () = write_file output s in

tools/offline_sig.ml

@@ -22,7 +22,7 @@ let denom_signature ~master_key
   let octets = DenominationKey.to_octets denom_pub in
   let h_denom_pub = HashCode.hash octets in
   let master_sig =
-    let open Bin_signature.DenominationKeyValidityPS in
+    let open Api_sig.DenominationKeyValidityPS in
     let master = EddsaPrivateKey.(pub_of_priv master_key) in
     let denom_hash = DenominationHash.hash octets in
     sign ~key:master_key
@@ -52,7 +52,7 @@ let signkey_signature ~master_key
         signkey_secmod_sig= _;
       } =
   let master_sig =
-    let open Bin_signature.ExchangeSigningKeyValidityPS in
+    let open Api_sig.ExchangeSigningKeyValidityPS in
     sign ~key:master_key
       {
         start= stamp_start;