merge secmod

src/data_file.ml

@@ -30,29 +30,3 @@ let read_rsa fname =
       RsaPrivateKey.of_octets data |> function
       | Error e -> Error (`Msg e)
       | Ok v -> Ok (Some v))
-
-(* todo: move this *)
-let db_lookup_signkey_data conn fname priv =
-  let pub = Crypto.EddsaPrivateKey.pub_of_priv priv in
-  let* opt = Pg.lookup_signing_key conn pub in
-  match opt with
-  | None ->
-      Fmt.error_msg
-        "load_signkey error no associated metadata found in database for \
-         signkey `%s`."
-        (Fpath.to_string fname)
-  | Some (stamp_start, stamp_expire, stamp_end) ->
-      (* TODO master_sig *)
-      let master_sig = None in
-      let v =
-        Signkey.{ pub; priv; stamp_start; stamp_expire; stamp_end; master_sig }
-      in
-      Ok v
-
-let load_signkey conn fname =
-  let* opt = read_eddsa fname in
-  match opt with
-  | None -> Ok None
-  | Some priv ->
-      let* signkey_data = db_lookup_signkey_data conn fname priv in
-      Ok (Some signkey_data)