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.

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

Jump to bottom

update to mirage-crypto-rng 0.11 and dns 7.0.0 API changes #261

Merged
merged 2 commits into from
Feb 17, 2023
Merged

update to mirage-crypto-rng 0.11 and dns 7.0.0 API changes #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06a4f61
update to mirage-crypto-rng 0.11 and dns 7.0.0 API changes
hannesm Feb 16, 2023
3a5884c
capnp-rpc-mirage: require mirage-crypto-rng-lwt
hannesm Feb 17, 2023
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
4 changes: 2 additions & 2 deletions capnp-rpc-mirage.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ depends: [
"capnp-rpc-net" {= version}
"fmt" {>= "0.8.7"}
"logs"
"dns-client" {>= "6.0.0"}
"dns-client-mirage" {>= "7.0.0"}
"tls-mirage"
"tcpip" {>= "7.0.0"}
"alcotest" {>= "1.0.1" & with-test}
Expand All @@ -26,7 +26,7 @@ depends: [
"ethernet" {>= "3.0.0" & with-test}
"io-page-unix" {with-test}
"mirage-vnetif" {with-test}
"mirage-crypto-rng" {>= "0.7.0" & with-test}
"mirage-crypto-rng-lwt" {>= "0.11.0" & with-test}
"dune" {>= "3.0"}
]
build: [
Expand Down
2 changes: 1 addition & 1 deletion capnp-rpc-unix.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ depends: [
"dune" {>= "3.0"}
"alcotest" {>= "1.0.1" & with-test}
"alcotest-lwt" { >= "1.0.1" & with-test}
"mirage-crypto-rng" {>= "0.7.0"}
"mirage-crypto-rng-lwt" {>= "0.11.0"}
"mdx" {with-test}
"lwt"
"asetmap" {with-test}
Expand Down
2 changes: 1 addition & 1 deletion mirage/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(library
(name capnp_rpc_mirage)
(public_name capnp-rpc-mirage)
(libraries capnp-rpc-lwt capnp-rpc-net capnp-rpc fmt logs dns-client.mirage tcpip))
(libraries capnp-rpc-lwt capnp-rpc-net capnp-rpc fmt logs dns-client-mirage tcpip))
2 changes: 1 addition & 1 deletion test-mirage/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
(package capnp-rpc-mirage)
(libraries io-page-unix capnp-rpc-lwt capnp-rpc-mirage alcotest-lwt testlib
logs.fmt testbed tcpip.ipv4 tcpip.ipv6 tcpip.stack-direct mirage-vnetif ethernet
arp.mirage tcpip.tcp tcpip.icmpv4 mirage-crypto-rng.lwt))
arp.mirage tcpip.tcp tcpip.icmpv4 mirage-crypto-rng-lwt))
2 changes: 1 addition & 1 deletion test-mirage/test_mirage.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ let create_iface network cidr =
let dns = Mirage.Network.Dns.create stack in
Mirage.network ~dns stack

let () = Mirage_crypto_rng_lwt.initialize ()
let () = Mirage_crypto_rng_lwt.initialize (module Mirage_crypto_rng.Fortuna)
let server_key = Auth.Secret_key.generate ()
let client_key = Auth.Secret_key.generate ()

Expand Down
2 changes: 1 addition & 1 deletion unix/capnp_rpc_unix.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ open Lwt.Infix
module Log = Capnp_rpc.Debug.Log
module Unix_flow = Unix_flow

let () = Mirage_crypto_rng_lwt.initialize ()
let () = Mirage_crypto_rng_lwt.initialize (module Mirage_crypto_rng.Fortuna)

type flow = Unix_flow.flow

Expand Down
2 changes: 1 addition & 1 deletion unix/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
(name capnp_rpc_unix)
(public_name capnp-rpc-unix)
(libraries lwt.unix astring capnp-rpc-lwt capnp-rpc-net capnp-rpc fmt logs
mirage-crypto-rng.lwt cmdliner cstruct-lwt extunix))
mirage-crypto-rng-lwt cmdliner cstruct-lwt extunix))