mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-19 09:15:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge 3.5 (os.urandom)

Browse source
This commit is contained in:
Victor Stinner 2016-04-12 22:38:22 +02:00
commit 7258176c68
4 changed files with 101 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Python/random.c
View file

@ -131,16 +131,23 @@ py_getrandom(void *buffer, Py_ssize_t size, int raise)
return 0;
while (0 < size) {
errno = 0;
#ifdef sun
/* Issue #26735: On Solaris, getrandom() is limited to returning up
to 1024 bytes */
n = Py_MIN(size, 1024);
#else
n = size;
#endif
errno = 0;
#ifdef HAVE_GETRANDOM
if (raise) {
Py_BEGIN_ALLOW_THREADS
n = getrandom(buffer, size, flags);
n = getrandom(buffer, n, flags);
Py_END_ALLOW_THREADS
}
else {
n = getrandom(buffer, size, flags);
n = getrandom(buffer, n, flags);
}
#else
/* On Linux, use the syscall() function because the GNU libc doesn't
@ -148,11 +155,11 @@ py_getrandom(void *buffer, Py_ssize_t size, int raise)
* https://sourceware.org/bugzilla/show_bug.cgi?id=17252 */
if (raise) {
Py_BEGIN_ALLOW_THREADS
n = syscall(SYS_getrandom, buffer, size, flags);
n = syscall(SYS_getrandom, buffer, n, flags);
Py_END_ALLOW_THREADS
}
else {
n = syscall(SYS_getrandom, buffer, size, flags);
n = syscall(SYS_getrandom, buffer, n, flags);
}
#endif