From fb123f93f9f5ce42c8e5785d2f8e0edaf951740e Mon Sep 17 00:00:00 2001
From: Lorry Tar Creator <lorry-tar-importer@baserock.org>
Date: Wed, 26 Mar 2014 19:21:20 +0000
Subject: Imported from
 /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.

---
 src/VBox/Runtime/r3/posix/rand-posix.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'src/VBox/Runtime/r3/posix/rand-posix.cpp')

diff --git a/src/VBox/Runtime/r3/posix/rand-posix.cpp b/src/VBox/Runtime/r3/posix/rand-posix.cpp
index f394d149..1d1725f1 100644
--- a/src/VBox/Runtime/r3/posix/rand-posix.cpp
+++ b/src/VBox/Runtime/r3/posix/rand-posix.cpp
@@ -4,7 +4,7 @@
  */
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
  * available from http://www.virtualbox.org. This file is free software;
@@ -32,7 +32,6 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/ioctl.h>
-#include <sys/fcntl.h>
 #include <fcntl.h>
 #ifdef _MSC_VER
 # include <io.h>
@@ -57,7 +56,10 @@ static DECLCALLBACK(void) rtRandAdvPosixGetBytes(PRTRANDINT pThis, uint8_t *pb,
     ssize_t cbRead = read(pThis->u.File.hFile, pb, cb);
     if ((size_t)cbRead != cb)
     {
-        ssize_t cTries = RT_MIN(cb, 256);
+        /* S10 has been observed returning 1040 bytes at the time from /dev/urandom.
+           Which means we need to do than 256 rounds to reach 668171 bytes if
+           that's what demanded by the caller (like tstRTMemWipe.cpp). */
+        ssize_t cTries = RT_MAX(256, cb / 64);
         do
         {
             if (cbRead > 0)
-- 
cgit v1.2.1