From db06e68f37f6c605c7e44534dbc1a47ec99880d1 Mon Sep 17 00:00:00 2001 From: Thomas Gazagnaire Date: Mon, 27 Apr 2015 19:25:53 +0100 Subject: [PATCH] Support the new entropy mechanism for mirage/tls --- build.sh | 2 +- lib/conduit_lwt_tls.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index d2be4b03..e3f76f19 100755 --- a/build.sh +++ b/build.sh @@ -22,7 +22,7 @@ HAVE_LWT=`ocamlfind query lwt 2>/dev/null || true` HAVE_LWT_SSL=`ocamlfind query lwt.ssl 2>/dev/null || true` HAVE_LWT_TLS=`ocamlfind query tls.lwt 2>/dev/null || true` HAVE_MIRAGE=`ocamlfind query mirage-types dns.mirage tcpip vchan 2>/dev/null || true` -HAVE_MIRAGE_TLS="" # activate manually for now +HAVE_MIRAGE_TLS=`ocamlfind query tls.mirage 2>/dev/null || true` HAVE_VCHAN=`ocamlfind query vchan 2>/dev/null || true` HAVE_VCHAN_LWT=`ocamlfind query vchan.lwt xen-evtchn.unix 2>/dev/null || true` HAVE_XEN=`ocamlfind query mirage-xen xenstore_transport 2>/dev/null || true` diff --git a/lib/conduit_lwt_tls.ml b/lib/conduit_lwt_tls.ml index 1389d035..f4a2bdcb 100644 --- a/lib/conduit_lwt_tls.ml +++ b/lib/conduit_lwt_tls.ml @@ -17,7 +17,7 @@ open Lwt -let _ = Tls_lwt.rng_init () +let _ = Nocrypto_entropy_lwt.initialize () let with_socket sockaddr f = let fd = Lwt_unix.socket (Unix.domain_of_sockaddr sockaddr) Unix.SOCK_STREAM 0 in