Skip to content

Update to tls.0.14.0 #529

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.

Sign up for GitHub

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

Merged
dinosaure merged 1 commit into from
Aug 8, 2021
Merged

Update to tls.0.14.0 #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion git-paf.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ depends: [
"mirage-time"
"result"
"rresult"
"tls" {>= "0.13.0"}
"tls" {>= "0.14.0"}
"uri"
"bigarray-compat"
"bigstringaf"
Expand Down
4 changes: 2 additions & 2 deletions git-unix.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ depends: [
"ptime"
"mimic"
"ca-certs-nss" {>= "3.60"}
"tls" {>= "0.12.8"}
"tls-mirage" {>= "0.12.8"}
"tls" {>= "0.14.0"}
"tls-mirage" {>= "0.14.0"}
"cohttp-lwt-unix" {with-test}
]
build: [
Expand Down
7 changes: 2 additions & 5 deletions src/git-paf/git_paf.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,14 +245,11 @@ struct
* Ipaddr.t
* int

let connect (domain_name, cfg, stack, ipaddr, port) =
let connect (host, cfg, stack, ipaddr, port) =
let t = Stack.tcp stack in
Stack.TCP.create_connection t (ipaddr, port) >>= function
| Error err -> Lwt.return_error (`Read err)
| Ok flow ->
client_of_flow cfg
?host:(Option.map Domain_name.to_string domain_name)
flow
| Ok flow -> client_of_flow cfg ?host flow
end

let tls_edn, _tls_protocol = Mimic.register ~name:"tls" (module TLS)
Expand Down
6 changes: 2 additions & 4 deletions src/git-unix/git_unix_mimic.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,9 @@ module TLS = struct
type endpoint =
Tls.Config.client * [ `host ] Domain_name.t option * Unix.sockaddr

let connect (tls, domain_name, sockaddr) =
let connect (tls, host, sockaddr) =
TCP.connect sockaddr >|= R.reword_error (fun err -> `Read err)
>>? fun flow ->
let host = Option.map Domain_name.to_string domain_name in
client_of_flow tls ?host flow
>>? fun flow -> client_of_flow tls ?host flow
end

module Nss = Ca_certs_nss.Make (Ptime_clock)
Expand Down