[Python-checkins] cpython (merge 3.4 -> 3.5): Merge 3.4 (os.urandom)

Thu Oct 1 04:02:01 EDT 2015

https://hg.python.org/cpython/rev/8165c7460596
changeset: 98456:8165c7460596
branch: 3.5
parent: 98452:835085cc28cd
parent: 98455:83dc79eeaf7f
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Oct 01 10:00:23 2015 +0200
summary:
 Merge 3.4 (os.urandom)
files:
 Python/random.c | 2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -111,6 +111,8 @@
 
 #else
 
+/* Issue #25003: Don' use getentropy() on Solaris (available since
+ * Solaris 11.3), it is blocking whereas os.urandom() should not block. */
 #if defined(HAVE_GETRANDOM) || defined(HAVE_GETRANDOM_SYSCALL)
 #define PY_GETRANDOM 1
 
-- 
Repository URL: https://hg.python.org/cpython
