switch to digestif

OCamlPro · Feb 2, 2024 · e2fbee1 · e2fbee1
1 parent a9f445f
commit e2fbee1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/dune-project b/dune-project
@@ -66,7 +66,7 @@
   (graphics :dev)
   (tiny_httpd :dev)
   (ocamlformat :dev)
-  sha
+  digestif
   xmlm
   pyml
   re2

diff --git a/owi.opam b/owi.opam
@@ -34,7 +34,7 @@ depends: [
   "graphics" {dev}
   "tiny_httpd" {dev}
   "ocamlformat" {dev}
-  "sha"
+  "digestif"
   "xmlm"
   "pyml"
   "re2"

diff --git a/src/cmd_c.ml b/src/cmd_c.ml
@@ -183,9 +183,13 @@ let metadata ~workspace arch property files =
     let file = String.concat " " (List.map Fpath.to_string files) in
     let hash =
       List.fold_left
-        (fun _ f -> Sha256.file (Fpath.to_string f))
-        Sha256.zero files
+        (fun context file ->
+          match Bos.OS.File.read file with
+          | Error (`Msg msg) -> failwith msg
+          | Ok str -> Digestif.SHA256.feed_string context str )
+        Digestif.SHA256.empty files
     in
+    let hash = Digestif.SHA256.to_hex (Digestif.SHA256.get hash) in
     let time = Unix.time () |> Unix.localtime in
     let test_metadata =
       `El
@@ -194,7 +198,7 @@ let metadata ~workspace arch property files =
           ; el "producer" "owic"
           ; el "specification" (String.trim spec)
           ; el "programfile" file
-          ; el "programhash" (Sha256.to_hex hash)
+          ; el "programhash" hash
           ; el "entryfunction" "main"
           ; el "architecture" (Format.sprintf "%dbit" arch)
           ; el "creationtime" (Format.asprintf "%a" pp_tm time)

diff --git a/src/dune b/src/dune
@@ -71,6 +71,7 @@
  (private_modules convert lexer menhir_parser spectest wutf8 tracing)
  (libraries
   bos
+  digestif
   dune-site
   encoding
   hc
@@ -80,7 +81,6 @@
   ppxlib
   pyml
   re2
-  sha
   sedlex
   uutf
   runtime_events