Merge pull request #1084 from art-w/ci-fix

chore: fix CI

Author: rgrinberg

.github/workflows/workflow.yml

@@ -22,7 +22,6 @@ jobs:
           - ubuntu-latest
           - macos-latest
         ocaml-compiler:
-          - "4.14"
           - "5"
         local-packages:
           - |
@@ -66,7 +65,6 @@ jobs:
           - ubuntu-latest
           - macos-latest
         ocaml-compiler:
-          - "4.14"
           - "5"
         local-packages:
           - |

cohttp-async.opam

@@ -36,7 +36,7 @@ depends: [
   "core_unix" {>= "v0.14.0"}
   "conduit-async" {>= "1.2.0"}
   "magic-mime"
-  "mirage-crypto" {with-test}
+  "digestif" {with-test}
   "logs"
   "fmt" {>= "0.8.2"}
   "sexplib0"

cohttp-async/examples/dune

@@ -1,7 +1,7 @@
 (executables
  (names hello_world receive_post)
  (libraries
-  mirage-crypto
+  digestif.c
   http
   cohttp-async
   base

cohttp-async/examples/s3_cp.ml

@@ -171,8 +171,7 @@ module Auth = struct
 
   let digest s =
     (* string -> sha256 as a hex string *)
-    Mirage_crypto.Hash.(digest `SHA256 (Cstruct.of_string s))
-    |> Compat.cstruct_to_hex_string
+    Digestif.SHA256.(digest_string s |> to_hex)
 
   let make_amz_headers ?body time =
     (* Return x-amz-date and x-amz-sha256 headers *)
@@ -239,16 +238,12 @@ module Auth = struct
     Printf.sprintf "AWS4-HMAC-SHA256\n%s\n%s\n%s" time_str scope_str hashed_req
 
   let make_signing_key ?date ~region ~service ~secret_access_key () =
-    let mac k v =
-      Mirage_crypto.Hash.(mac `SHA256 ~key:k (Cstruct.of_string v))
-    in
+    let mac k v = Digestif.SHA256.(hmac_string ~key:k v |> to_raw_string) in
     let date' =
       match date with None -> Date.today ~zone:Time.Zone.utc | Some d -> d
     in
     let date_str = Date.to_string_iso8601_basic date' in
-    let date_key =
-      mac (Cstruct.of_string ("AWS4" ^ secret_access_key)) date_str
-    in
+    let date_key = mac ("AWS4" ^ secret_access_key) date_str in
     let date_region_key = mac date_key (string_of_region region) in
     let date_region_service_key =
       mac date_region_key (string_of_service service)
@@ -278,14 +273,12 @@ module Auth = struct
         (string_of_service service)
     in
     let signature =
-      Mirage_crypto.Hash.(
-        mac `SHA256 ~key:signing_key (Cstruct.of_string string_to_sign))
+      Digestif.SHA256.(hmac_string ~key:signing_key string_to_sign |> to_hex)
     in
     let auth_header =
       Printf.sprintf
         "AWS4-HMAC-SHA256 Credential=%s,SignedHeaders=%s,Signature=%s" creds
-        signed_headers
-        (Compat.cstruct_to_hex_string signature)
+        signed_headers signature
     in
     [ ("Authorization", auth_header) ]
 end

cohttp-curl-async.opam

@@ -21,7 +21,7 @@ doc: "https://mirage.github.io/ocaml-cohttp/"
 bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
 depends: [
   "dune" {>= "3.0"}
-  "ocurl"
+  "ocurl" {>= "0.9.2"}
   "http" {= version}
   "stringext"
   "cohttp-curl" {= version}

cohttp-curl-lwt.opam

@@ -22,7 +22,7 @@ bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
 depends: [
   "dune" {>= "3.0"}
   "ocaml" {>= "4.08"}
-  "ocurl"
+  "ocurl" {>= "0.9.2"}
   "http" {= version}
   "cohttp-curl" {= version}
   "stringext"

cohttp-curl.opam

@@ -20,7 +20,7 @@ bug-reports: "https://github.com/mirage/ocaml-cohttp/issues"
 depends: [
   "dune" {>= "3.0"}
   "ocaml" {>= "4.08"}
-  "ocurl"
+  "ocurl" {>= "0.9.2"}
   "http" {= version}
   "stringext"
   "odoc" {with-doc}

cohttp-eio.opam

@@ -28,7 +28,7 @@ depends: [
   "mdx" {with-test}
   "logs"
   "uri"
-  "tls-eio" {with-test & >= "0.17.2"}
+  "tls-eio" {with-test & >= "1.0.0"}
   "mirage-crypto-rng-eio" {with-test & >= "0.11.2"}
   "fmt"
   "ptime"

cohttp-eio/examples/client_tls.ml

@@ -9,7 +9,11 @@ let null_auth ?ip:_ ~host:_ _ =
   Ok None (* Warning: use a real authenticator in your code! *)
 
 let https ~authenticator =
-  let tls_config = Tls.Config.client ~authenticator () in
+  let tls_config =
+    match Tls.Config.client ~authenticator () with
+    | Error (`Msg msg) -> failwith ("tls configuration problem: " ^ msg)
+    | Ok tls_config -> tls_config
+  in
   fun uri raw ->
     let host =
       Uri.host uri

cohttp-lwt-unix/test/test_parser.ml

@@ -221,7 +221,7 @@ let res_content_parse () =
       Rep_io.read_body_chunk reader >>= fun body ->
       assert_equal
         ~printer:(fun chunk ->
-          Transfer.sexp_of_chunk chunk |> Sexplib.Sexp.to_string_hum)
+          Transfer.sexp_of_chunk chunk |> Sexplib0.Sexp.to_string_hum)
         (Transfer.Final_chunk "home=Cosby&favorite+flavor=flies") body;
       return ()
   | _ -> assert false