mirage · Sep 28, 2016 · Sep 30, 2016 · Sep 30, 2016 · Oct 2, 2016
Showing with 32 additions and 20 deletions.

+20 −5 lib/mirage.ml

+4 −1 lib/mirage.mli

+5 −14 types/V1.mli

+3 −0 types/V1_LWT.mli
diff --git a/lib/mirage.ml b/lib/mirage.ml
@@ -100,14 +100,29 @@ let default_monotonic_clock = impl monotonic_clock_conf
 type random = RANDOM
 let random = Type RANDOM
 
-let random_conf = object
+let stdlib_random_conf = object
   inherit base_configurable
   method ty = random
   method name = "random"
-  method module_name = "Random"
+  method module_name = "Stdlibrandom"
+  method packages = Key.pure ["mirage-stdlib-random"]
+  method libraries = Key.pure ["mirage-stdlib-random"]
+  method connect _ modname _args =
+    Printf.sprintf "Lwt.return (`Ok (%s.initialize ()))" modname
+end
+
+let stdlib_random = impl stdlib_random_conf
+
+let nocrypto_random_conf = object
+  inherit base_configurable
+  method ty = random
+  method name = "random"
+  method module_name = "Nocrypto.Rng"
+  method packages = Key.pure ["nocrypto"]
+  method libraries = Key.pure ["nocrypto"]
 end
 
-let default_random = impl random_conf
+let nocrypto_random = impl nocrypto_random_conf
 
 type console = CONSOLE
 let console = Type CONSOLE
@@ -655,7 +670,7 @@ end
 let tcp_direct_func () = impl (tcp_direct_conf ())
 
 let direct_tcp
-    ?(clock=default_monotonic_clock) ?(random=default_random) ?(time=default_time) ip =
+    ?(clock=default_monotonic_clock) ?(random=stdlib_random) ?(time=default_time) ip =
   tcp_direct_func () $ ip $ time $ clock $ random
 
 let tcpv4_socket_conf ipv4_key = object
@@ -729,7 +744,7 @@ let stackv4_direct_conf ?(group="") config = impl @@ object
 
 let direct_stackv4_with_config
     ?(clock=default_monotonic_clock)
-    ?(random=default_random)
+    ?(random=stdlib_random)
     ?(time=default_time)
     ?group
     network config =

diff --git a/lib/mirage.mli b/lib/mirage.mli
@@ -109,9 +109,12 @@ type random
 val random: random typ
 (** Implementations of the [V1.RANDOM] signature. *)
 
-val default_random: random impl
+val stdlib_random: random impl
 (** Passthrough to the OCaml Random generator. *)
 
+val nocrypto_random: random impl
+(** Passthrough to the Fortuna PRNG implemented in nocrypto. *)
+
 
 (** {2 Consoles} *)
 

diff --git a/types/V1.mli b/types/V1.mli
@@ -80,23 +80,14 @@ end
 
 (** {1 Random}
 
-    Operations to generate randomness. This is currently a passthrough
-    to the OCaml Random generator, and will be deprecated and
-    turned into a proper DEVICE with blocking modes. *)
+    Operations to generate random numbers. *)
 module type RANDOM = sig
 
-  val self_init: unit -> unit
-  (** Initialize the generator with a random seed chosen in a
-      system-dependent way. *)
-
-  val int: int -> int
-  (** [int bound] returns a random integer between 0 (inclusive) and
-      [bound] (exclusive). [bound] must be greater than 0 and less
-      than 2{^30}. *)
+  type buffer
+  (** The type for memory buffer. *)
 
-  val int32: int32 -> int32
-  (** [int32 bound] returns a random integer between 0 (inclusive) and
-      [bound] (exclusive). [bound] must be greater than 0. *)
+  val generate: int -> buffer
+  (** [generate n] is a buffer of length [n] filled with random. *)
 end
 
 (** {1 POSIX clock}

diff --git a/types/V1_LWT.mli b/types/V1_LWT.mli
@@ -21,6 +21,9 @@ open V1
 module type TIME = TIME
   with type 'a io = 'a Lwt.t
 
+module type RANDOM = RANDOM
+  with type buffer = Cstruct.t
+
 module type FLOW = FLOW
   with type 'a io = 'a Lwt.t
    and type buffer = Cstruct.t