From 06a4f61347f04f5bc95b6dea55ec2ab1edf9b555 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Thu, 16 Feb 2023 18:08:16 +0100 Subject: [PATCH 1/2] update to mirage-crypto-rng 0.11 and dns 7.0.0 API changes --- capnp-rpc-mirage.opam | 2 +- capnp-rpc-unix.opam | 2 +- mirage/dune | 2 +- test-mirage/dune | 2 +- test-mirage/test_mirage.ml | 2 +- unix/capnp_rpc_unix.ml | 2 +- unix/dune | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/capnp-rpc-mirage.opam b/capnp-rpc-mirage.opam index 81a95cc0a..3a7bc5ca0 100644 --- a/capnp-rpc-mirage.opam +++ b/capnp-rpc-mirage.opam @@ -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} diff --git a/capnp-rpc-unix.opam b/capnp-rpc-unix.opam index 531d3aefc..4df3a2cf9 100644 --- a/capnp-rpc-unix.opam +++ b/capnp-rpc-unix.opam @@ -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} diff --git a/mirage/dune b/mirage/dune index cd38a5e3d..843fbbb72 100644 --- a/mirage/dune +++ b/mirage/dune @@ -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)) diff --git a/test-mirage/dune b/test-mirage/dune index 0aa5204c1..b39af5a07 100644 --- a/test-mirage/dune +++ b/test-mirage/dune @@ -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)) diff --git a/test-mirage/test_mirage.ml b/test-mirage/test_mirage.ml index 3fb160f1e..d652d53c3 100644 --- a/test-mirage/test_mirage.ml +++ b/test-mirage/test_mirage.ml @@ -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 () diff --git a/unix/capnp_rpc_unix.ml b/unix/capnp_rpc_unix.ml index c930f1e1a..260b34984 100644 --- a/unix/capnp_rpc_unix.ml +++ b/unix/capnp_rpc_unix.ml @@ -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 diff --git a/unix/dune b/unix/dune index 95bba0fb4..5e9a7638b 100644 --- a/unix/dune +++ b/unix/dune @@ -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)) From 3a5884c02cac939acf98c55f77d1ed8b3ff4b35c Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Fri, 17 Feb 2023 11:53:49 +0100 Subject: [PATCH 2/2] capnp-rpc-mirage: require mirage-crypto-rng-lwt --- capnp-rpc-mirage.opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/capnp-rpc-mirage.opam b/capnp-rpc-mirage.opam index 3a7bc5ca0..e82e524f1 100644 --- a/capnp-rpc-mirage.opam +++ b/capnp-rpc-mirage.opam @@ -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: [