* devices.in (dev_storage): Map /dev/random and /dev/urandom to

	\Device\Null.
	* devices.cc: Regenerate.
	* fhandler.h (fhandler_dev_random::open): Drop declaration.
	(fhandler_dev_random::close): Ditto.
	(fhandler_dev_random::crypt_gen_random): Convert to static method.
	* fhandler_random.cc (fhandler_dev_random::open): Remove so that default
	fhandler_base::open is used to open \Device\Null.
	(fhandler_dev_random::close): Ditto.
	* fhandler_socket.cc (entropy_source): Delete.
	(fhandler_socket::af_local_set_secret): Remove entropy_source code and
	call fhandler_dev_random::crypt_gen_random directly instead.

1 files changed, 3 insertions, 21 deletions

diff --git a/winsup/cygwin/fhandler_socket.cc b/winsup/cygwin/fhandler_socket.cc
index b2a7f5c82..f79e89950 100644
--- a/winsup/cygwin/fhandler_socket.cc
+++ b/winsup/cygwin/fhandler_socket.cc
@@ -48,8 +48,6 @@ extern "C" {
 int sscanf (const char *, const char *, ...);
 } /* End of "C" section */
 
-fhandler_dev_random* entropy_source;
-
 static inline mode_t
 adjust_socket_file_mode (mode_t mode)
 {
@@ -445,25 +443,9 @@ fhandler_socket::af_local_copy (fhandler_socket *sock)
 void
 fhandler_socket::af_local_set_secret (char *buf)
 {
-  if (!entropy_source)
-    {
-      void *buf = malloc (sizeof (fhandler_dev_random));
-      entropy_source = new (buf) fhandler_dev_random ();
-      entropy_source->dev () = *urandom_dev;
-    }
-  if (entropy_source &&
-      !entropy_source->open (O_RDONLY))
-    {
-      delete entropy_source;
-      entropy_source = NULL;
-    }
-  if (entropy_source)
-    {
-      size_t len = sizeof (connect_secret);
-      entropy_source->read (connect_secret, len);
-      if (len != sizeof (connect_secret))
-	bzero ((char*) connect_secret, sizeof (connect_secret));
-    }
+  if (!fhandler_dev_random::crypt_gen_random (connect_secret,
+					      sizeof (connect_secret)))
+    bzero ((char*) connect_secret, sizeof (connect_secret));
   __small_sprintf (buf, "%08x-%08x-%08x-%08x",
 		   connect_secret [0], connect_secret [1],
 		   connect_secret [2], connect_secret [3]);