Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace the alias X509_lwt.priv by Tls.Config.certchain #381

Merged
merged 1 commit into from
Apr 15, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion conduit-lwt-unix.opam
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ depends: [
]
depopts: ["tls" "lwt_ssl" "launchd"]
conflicts: [
"tls" {< "0.11.0"}
"tls" {< "0.13.0"}
"ssl" {< "0.5.9"}
]
build: [
Expand All @@ -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" ]
]
4 changes: 4 additions & 0 deletions conduit-mirage.opam
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
]
2 changes: 1 addition & 1 deletion src/conduit-lwt-unix/conduit_lwt_tls.real.mli
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down