Mark the initialize functions as deprecated.

bench/speed.ml

@@ -480,10 +480,12 @@ let benchmarks = [
     throughput_into name (fun dst cs -> DES.ECB.unsafe_encrypt_into ~key cs ~src_off:0 dst ~dst_off:0 (String.length cs))) ;
 
   bm "fortuna" (fun name ->
-    Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna);
-    throughput name (fun buf ->
-        let buf = Bytes.unsafe_of_string buf in
-        Mirage_crypto_rng.generate_into buf ~off:0 (Bytes.length buf))) ;
+    begin[@alert "-deprecated"]
+      Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna);
+      throughput name (fun buf ->
+          let buf = Bytes.unsafe_of_string buf in
+          Mirage_crypto_rng.generate_into buf ~off:0 (Bytes.length buf))
+    end);
 
   bm "getentropy" (fun name ->
     Mirage_crypto_rng_unix.use_getentropy ();

rng/async/mirage_crypto_rng_async.mli

@@ -16,3 +16,4 @@ val initialize
   -> ?sleep:Time_ns.Span.t
   -> 'a Mirage_crypto_rng.generator
   -> unit
+[@@deprecated "Use 'Mirage_crypto_rng_unix.use_default ()' instead."]

rng/eio/mirage_crypto_rng_eio.mli

@@ -39,3 +39,4 @@ val run
   -> 'a Mirage_crypto_rng.generator
   -> _ env
   -> (unit -> 'b) -> 'b
+[@@deprecated "Use 'Mirage_crypto_rng_unix.use_default ()' instead."]

rng/lwt/mirage_crypto_rng_lwt.mli

@@ -9,3 +9,4 @@
     is used to collect entropy.
 *)
 val initialize : ?g:'a -> ?sleep:int64 -> 'a Mirage_crypto_rng.generator -> unit
+[@@deprecated "Use 'Mirage_crypto_rng_unix.use_default ()' instead."]

rng/mirage_crypto_rng.mli

@@ -23,22 +23,15 @@
     Please ensure to call [Mirage_crypto_rng_unix.use_default], or
     [Mirage_crypto_rng_unix.use_dev_urandom] (if you only want to use
     /dev/urandom), or [Mirage_crypto_rng_unix.use_getentropy] (if you only want
-    to use getentropy).
+    to use getrandom/getentropy/BCryptGenRandom).
 
     For fine-grained control (doing entropy harvesting, etc.), please continue
-    reading the documentation below. {b Please be aware that the feeding of Fortuna
-    and producing random numbers is not thread-safe} (it is on Miou_unix via Pfortuna).
-
-    The RNGs here are merely the deterministic part of a full random number
-    generation suite. For proper operation, they need to be seeded with a
-    high-quality entropy source.
+    reading the documentation below. {b Please be aware that the feeding of
+    Fortuna and producing random numbers is not thread-safe} (it is on Miou_unix
+    via Pfortuna).
 
     Suitable entropy feeding of generators are provided by other libraries
-    {{!Mirage_crypto_rng_lwt}mirage-crypto-rng-lwt} (for Lwt),
-    {{!Mirage_crypto_rng_async}mirage-crypto-rng-async} (for Async),
     {{!Mirage_crypto_rng_mirage}mirage-crypto-rng-mirage} (for MirageOS),
-    {{!Mirage_crypto_rng_unix}mirage-crypto-rng.unix},
-    {{!Mirage_crypto_rng_eio}mirage-crypto-rng-eio} (for Eio),
     and {{!Mirage_crypto_rng_miou_unix}mirage-crypto-miou-unix} (for Miou_unix).
 
     The intention is that "initialize" in the respective sub-library is called
@@ -49,9 +42,9 @@
     generator should be used in most setting, and that should be fed a constant
     stream of entropy.
 
-    [mirage-crypto-rng-eio] package differs slightly from other rng packages.
-    Instead of the [initialize] function a [run] function is provided with
-    similar behaviour, i.e. RNG setup, entropy collection and periodic reseeding.
+    The RNGs here are merely the deterministic part of a full random number
+    generation suite. For proper operation, they need to be seeded with a
+    high-quality entropy source.
 
     Although this module exposes a more fine-grained interface, e.g. allowing
     manual seeding of generators, this is intended either for implementing

rng/rng.ml

@@ -16,19 +16,9 @@ let setup_rng =
    \n  If you are using MirageOS, use the random device in config.ml: \
    `let main = Mirage.main \"Unikernel.Main\" (random @-> job)`, \
    and `let () = register \"my_unikernel\" [main $ default_random]`. \
-   \n  If you are using Lwt, execute \
-   `Mirage_crypto_rng_lwt.initialize (module Mirage_crypto_rng.Fortuna)` \
-   at startup. \
-   \n  If you are using Async, execute \
-   `Mirage_crypto_rng_async.initialize (module Mirage_crypto_rng.Fortuna)` \
-   at startup. \
-   \n  If you are using Eio, execute in one of the fibers \
-   `Mirage_crypto_rng_eio.run (module Fortuna) env` (`env` from `Eio_main.run`).
-   \n  Otherwise, there is no periodic reseeding. For an initial seed from \
-   getrandom(), execute \
-   `Mirage_crypto_rng_unix.initialize (module Mirage_crypto_rng.Fortuna)`. \
-   You can use `Mirage_crypto_rng.accumulate` and `Mirage_crypto_rng.reseed` \
-   to reseed the RNG manually."
+   \n  If you are using miou, execute \
+   `Mirage_crypto_rng_miou_unix.initialize (module Mirage_crypto_rng.Fortuna)` \
+   at startup."
 
 let () = Printexc.register_printer (function
     | Unseeded_generator ->

rng/unix/mirage_crypto_rng_unix.mli

@@ -8,6 +8,7 @@
 
 (** [initialize ~g rng] will bring the RNG into a working state. *)
 val initialize : ?g:'a -> 'a Mirage_crypto_rng.generator -> unit
+[@@deprecated "Use 'Mirage_crypto_rng_unix.use_default ()' instead."]
 
 (** [getrandom size] returns a buffer of [size] filled with random bytes. *)
 val getrandom : int -> string

tests/test_eio_entropy_collection.ml

@@ -20,17 +20,19 @@ end
 
 let () =
   Eio_main.run @@ fun env ->
-  Mirage_crypto_rng_eio.run (module Printing_rng) env @@ fun () ->
-  Eio.Fiber.both
-    begin fun () ->
-       let sleep = Duration.(of_sec 2 |> to_f) in
-       Eio.Time.sleep env#clock sleep
-    end
-    begin fun () ->
-      Format.printf "entropy sources: %a@,%!"
-        (fun ppf -> List.iter (fun x ->
-             Mirage_crypto_rng.Entropy.pp_source ppf x;
-             Format.pp_print_space ppf ()))
-        (Mirage_crypto_rng.Entropy.sources ())
-    end
+  begin[@alert "-deprecated"]
+    Mirage_crypto_rng_eio.run (module Printing_rng) env @@ fun () ->
+    Eio.Fiber.both
+      begin fun () ->
+        let sleep = Duration.(of_sec 2 |> to_f) in
+        Eio.Time.sleep env#clock sleep
+      end
+      begin fun () ->
+        Format.printf "entropy sources: %a@,%!"
+          (fun ppf -> List.iter (fun x ->
+               Mirage_crypto_rng.Entropy.pp_source ppf x;
+               Format.pp_print_space ppf ()))
+          (Mirage_crypto_rng.Entropy.sources ())
+      end
+  end
 

tests/test_eio_rng.ml

@@ -2,10 +2,12 @@ open Mirage_crypto_rng
 
 let () =
   Eio_main.run @@ fun env ->
-  Mirage_crypto_rng_eio.run (module Fortuna) env @@ fun () ->
-  let random_num = Mirage_crypto_rng.generate 32 in
-  assert (String.length random_num = 32);
-  Printf.printf "32 bit random number: %S\n%!" random_num;
-  let random_num = Mirage_crypto_rng.generate 16 in
-  assert (String.length random_num = 16);
-  Printf.printf "16 bit random number: %S\n%!" random_num;
+  begin[@alert "-deprecated"]
+    Mirage_crypto_rng_eio.run (module Fortuna) env @@ fun () ->
+    let random_num = Mirage_crypto_rng.generate 32 in
+    assert (String.length random_num = 32);
+    Printf.printf "32 bit random number: %S\n%!" random_num;
+    let random_num = Mirage_crypto_rng.generate 16 in
+    assert (String.length random_num = 16);
+    Printf.printf "16 bit random number: %S\n%!" random_num;
+  end

tests/test_entropy_collection_async.ml

@@ -28,7 +28,9 @@ module E = Mirage_crypto_rng_async
 
 
 let main () =
-  E.initialize (module Printing_rng);
+  begin[@alert "-deprecated"]
+    E.initialize (module Printing_rng);
+  end;
   Format.printf "entropy sources: %a@,%!"
     (fun ppf -> List.iter ~f:(fun x ->
          Mirage_crypto_rng.Entropy.pp_source ppf x;