diff options
| author | Victor Stinner <victor.stinner@gmail.com> | 2015-10-01 08:00:23 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2015-10-01 08:00:23 (GMT) |
| commit | 861f0672014067dc1cd5bf239ae188140f79b07d (patch) | |
| tree | 30ad121ed293bdb547eeebc985a81c1cad536549 /Python | |
| parent | bae2d6203fca3ecaaf9fbc7cee84ad83ddf52dc5 (diff) | |
| parent | 78cc2e89687f3f2b7fd404831a6ea19baccf8c81 (diff) | |
| download | cpython-861f0672014067dc1cd5bf239ae188140f79b07d.zip cpython-861f0672014067dc1cd5bf239ae188140f79b07d.tar.gz cpython-861f0672014067dc1cd5bf239ae188140f79b07d.tar.bz2 | |
Merge 3.4 (os.urandom)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/random.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Python/random.c b/Python/random.c index 1d57b1b..772bfef 100644 --- a/Python/random.c +++ b/Python/random.c @@ -111,6 +111,8 @@ py_getentropy(unsigned char *buffer, Py_ssize_t size, int fatal) #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 |