From 9e404a8c429749250f44133ebe506c43c88af91a Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Wed, 28 Aug 2024 09:35:11 +0200 Subject: [PATCH] update to TLS 1.0 API changes --- http-lwt-client.opam | 4 ++-- src/http_lwt_client.ml | 8 ++++---- src/http_lwt_unix.ml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/http-lwt-client.opam b/http-lwt-client.opam index 339341a..8022e3d 100644 --- a/http-lwt-client.opam +++ b/http-lwt-client.opam @@ -15,8 +15,8 @@ depends: [ "base64" {>= "3.1.0"} "faraday-lwt-unix" "httpaf" {>= "0.7.0"} - "tls" {>= "0.16.0"} - "tls-lwt" {>= "0.16.0"} + "tls" {>= "1.0.0"} + "tls-lwt" {>= "1.0.0"} "ca-certs" "fmt" "bos" diff --git a/src/http_lwt_client.ml b/src/http_lwt_client.ml index cf99138..68d9233 100644 --- a/src/http_lwt_client.ml +++ b/src/http_lwt_client.ml @@ -361,10 +361,10 @@ let request | None -> Lazy.force default_auth | Some a -> Ok a in - Result.map - (fun authenticator -> - `Default (Tls.Config.client ~alpn_protocols ~authenticator ())) - auth) + let ( let* ) = Result.bind in + let* authenticator = auth in + let* cfg = Tls.Config.client ~alpn_protocols ~authenticator () in + Ok (`Default cfg)) in if not follow_redirect then single_request happy_eyeballs ?config tls_config ~meth ~headers ?body uri f f_init diff --git a/src/http_lwt_unix.ml b/src/http_lwt_unix.ml index 97d3283..0ab0152 100644 --- a/src/http_lwt_unix.ml +++ b/src/http_lwt_unix.ml @@ -181,11 +181,11 @@ module Make (Runtime : RUNTIME) = struct fun vs -> let cs = List.map (fun { Faraday.buffer ; off ; len } -> - Cstruct.of_bigarray ~off ~len buffer) vs + Bigstringaf.substring ~off ~len buffer) vs in Lwt.catch (fun () -> Tls_lwt.Unix.writev t cs >|= fun () -> - `Ok (Cstruct.lenv cs)) + `Ok (List.fold_left (+) 0 (List.map String.length cs))) (fun exn -> Log.err (fun m -> m "exception writev: %s" (Printexc.to_string exn)); Tls_lwt.Unix.close t >|= fun () ->