From 1d898e16ba6f95fbb2b836d105b1c0da83cb9cb5 Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sat, 17 May 2025 17:35:48 +0200 Subject: [PATCH 1/2] remove now superfluous pin to my ocaml-letsencrypt branch --- .github/workflows/test.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2dc089f4..a941129d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -126,8 +126,6 @@ jobs: with: ocaml-compiler: 4.14.x dune-cache: true - # Needed until https://github.com/robur-coop/ocaml-letsencrypt/pull/34. - - run: opam pin add letsencrypt git+https://github.com/hannesm/ocaml-letsencrypt.git#no-cstruct --no-action - run: opam install --yes --deps-only ./dream-pure.opam ./dream-httpaf.opam ./dream.opam ./dream-mirage.opam - run: opam install --yes mirage mirage-clock-unix mirage-crypto-rng-mirage - run: cd example/w-mirage && mv config.ml config.ml.backup From 0945537e0fc2fc3f7df056b1b738f851bfd3f0bf Mon Sep 17 00:00:00 2001 From: Hannes Mehnert Date: Sat, 17 May 2025 17:45:43 +0200 Subject: [PATCH 2/2] update to newer mirage-crypto-rng API --- dream.opam | 3 +-- src/dream.ml | 3 +-- src/dune | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dream.opam b/dream.opam index fc9c0c12..f4d3c19b 100644 --- a/dream.opam +++ b/dream.opam @@ -70,8 +70,7 @@ depends: [ "markup" {>= "1.0.2"} "mirage-clock" {>= "3.0.0"} # now_d_ps : unit -> int * int64. "mirage-crypto" {>= "1.0.0"} - "mirage-crypto-rng" {>= "1.0.0"} - "mirage-crypto-rng-lwt" + "mirage-crypto-rng" {>= "1.2.0"} "multipart_form" {>= "0.4.0"} "multipart_form-lwt" "ocaml" {>= "4.08.0"} diff --git a/src/dream.ml b/src/dream.ml index 07b9248a..1be6da9b 100644 --- a/src/dream.ml +++ b/src/dream.ml @@ -55,8 +55,7 @@ let now () = Ptime.to_float_s (Ptime.v (Ptime_clock.now_d_ps ())) let () = - Random.initialize (fun () -> - Mirage_crypto_rng_lwt.initialize (module Mirage_crypto_rng.Fortuna)) + Random.initialize (fun () -> Mirage_crypto_rng_unix.use_default ()) module Session = struct diff --git a/src/dune b/src/dune index a82c981c..e40646fc 100644 --- a/src/dune +++ b/src/dune @@ -16,6 +16,6 @@ logs lwt lwt.unix - mirage-crypto-rng-lwt + mirage-crypto-rng.unix ptime.clock.os ))