diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-06-10 08:38:56 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-06-10 08:38:56 (GMT) |
| commit | 596357de2381fc23c554d146c0edfc9af10e66b7 (patch) | |
| tree | 0277e51dbf83bc377993b06ecc6314d97ff24b61 /Python | |
| parent | b18ffb4dd8904e5080224b83309227f95a50c757 (diff) | |
| parent | 39b102535640effc4a5f09e0221f2dac00f862d7 (diff) | |
| download | cpython-596357de2381fc23c554d146c0edfc9af10e66b7.zip cpython-596357de2381fc23c554d146c0edfc9af10e66b7.tar.gz cpython-596357de2381fc23c554d146c0edfc9af10e66b7.tar.bz2 | |
Merge comment fix from 3.5
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/random.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/random.c b/Python/random.c index cd8d945..e4f1e7a 100644 --- a/Python/random.c +++ b/Python/random.c @@ -75,6 +75,8 @@ win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise) return 0; } +/* Issue #25003: Don't 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 @@ -114,8 +116,6 @@ 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 |