[Python-checkins] cpython (3.4): Issue #25003: os.urandom() doesn't use getentropy() on Solaris because

Thu Oct 1 04:02:01 EDT 2015

https://hg.python.org/cpython/rev/83dc79eeaf7f
changeset: 98455:83dc79eeaf7f
branch: 3.4
parent: 98449:60c4fd84ef92
user: Victor Stinner <victor.stinner at gmail.com>
date: Thu Oct 01 09:59:32 2015 +0200
summary:
 Issue #25003: os.urandom() doesn't use getentropy() on Solaris because
getentropy() is blocking, whereas os.urandom() should not block. getentropy()
is supported since Solaris 11.3.
files:
 Misc/NEWS | 4 ++++
 Python/random.c | 12 ++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,10 @@
 Core and Builtins
 -----------------
 
+- Issue #25003: os.urandom() doesn't use getentropy() on Solaris because
+ getentropy() is blocking, whereas os.urandom() should not block. getentropy()
+ is supported since Solaris 11.3.
+
 - Issue #25182: The stdprinter (used as sys.stderr before the io module is
 imported at startup) now uses the backslashreplace error handler.
 
diff --git a/Python/random.c b/Python/random.c
--- a/Python/random.c
+++ b/Python/random.c
@@ -67,7 +67,11 @@
 return 0;
 }
 
-#elif HAVE_GETENTROPY
+/* Issue #25003: Don' use getentropy() on Solaris (available since
+ * Solaris 11.3), it is blocking whereas os.urandom() should not block. */
+#elif defined(HAVE_GETENTROPY) && !defined(sun)
+#define PY_GETENTROPY 1
+
 /* Fill buffer with size pseudo-random bytes generated by getentropy().
 Return 0 on success, or raise an exception and return -1 on error.
 
@@ -275,7 +279,7 @@
 
 #ifdef MS_WINDOWS
 return win32_urandom((unsigned char *)buffer, size, 1);
-#elif HAVE_GETENTROPY
+#elif defined(PY_GETENTROPY)
 return py_getentropy(buffer, size, 0);
 #else
 return dev_urandom_python((char*)buffer, size);
@@ -322,7 +326,7 @@
 else {
 #ifdef MS_WINDOWS
 (void)win32_urandom(secret, secret_size, 0);
-#elif HAVE_GETENTROPY
+#elif defined(PY_GETENTROPY)
 (void)py_getentropy(secret, secret_size, 1);
 #else
 dev_urandom_noraise(secret, secret_size);
@@ -338,7 +342,7 @@
 CryptReleaseContext(hCryptProv, 0);
 hCryptProv = 0;
 }
-#elif HAVE_GETENTROPY
+#elif defined(PY_GETENTROPY)
 /* nothing to clean */
 #else
 dev_urandom_close();
-- 
Repository URL: https://hg.python.org/cpython
