diff --git a/conduit-lwt-unix.opam b/conduit-lwt-unix.opam index d60cca77..5f177fa0 100644 --- a/conduit-lwt-unix.opam +++ b/conduit-lwt-unix.opam @@ -25,7 +25,7 @@ depends: [ ] depopts: ["tls" "lwt_ssl" "launchd"] conflicts: [ - "tls" {< "0.11.0"} + "tls" {< "0.13.0"} "ssl" {< "0.5.9"} ] build: [ @@ -34,3 +34,7 @@ build: [ ] dev-repo: "git+https://github.com/mirage/ocaml-conduit.git" synopsis: "A network connection establishment library for Lwt_unix" +pin-depends: [ + [ "tls.0.13.0" "git+https://github.com/mirleft/ocaml-tls.git#f9dd61f556d3f2790aa9eedcf2b6b3c8c99cb338" ] + [ "tls-mirage.0.13.0" "git+https://github.com/mirleft/ocaml-tls.git#f9dd61f556d3f2790aa9eedcf2b6b3c8c99cb338" ] +] diff --git a/conduit-mirage.opam b/conduit-mirage.opam index da598a9a..41cf1a32 100644 --- a/conduit-mirage.opam +++ b/conduit-mirage.opam @@ -40,3 +40,7 @@ build: [ ] dev-repo: "git+https://github.com/mirage/ocaml-conduit.git" synopsis: "A network connection establishment library for MirageOS" +pin-depends: [ + [ "tls.0.13.0" "git+https://github.com/mirleft/ocaml-tls.git#f9dd61f556d3f2790aa9eedcf2b6b3c8c99cb338" ] + [ "tls-mirage.0.13.0" "git+https://github.com/mirleft/ocaml-tls.git#f9dd61f556d3f2790aa9eedcf2b6b3c8c99cb338" ] +] diff --git a/src/conduit-lwt-unix/conduit_lwt_tls.real.mli b/src/conduit-lwt-unix/conduit_lwt_tls.real.mli index e29cc8b2..099ff520 100644 --- a/src/conduit-lwt-unix/conduit_lwt_tls.real.mli +++ b/src/conduit-lwt-unix/conduit_lwt_tls.real.mli @@ -18,7 +18,7 @@ (** TLS/SSL connections via OCaml-TLS *) module X509 : sig - val private_of_pems : cert:string -> priv_key:string -> X509_lwt.priv Lwt.t + val private_of_pems : cert:string -> priv_key:string -> Tls.Config.certchain Lwt.t type authenticator = X509.Authenticator.t