changeset:   93969:f11f84902713
branch:      3.4
parent:      93967:3d19f419cc44
user:        Victor Stinner <victor.stinner@gmail.com>
date:        Sun Dec 21 01:16:38 2014 +0100
files:       Lib/test/test_os.py Misc/NEWS Python/random.c configure configure.ac pyconfig.h.in
description:
Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(),
instead of reading /dev/urandom, to get pseudo-random bytes.


diff -r 3d19f419cc44 -r f11f84902713 Lib/test/test_os.py
--- a/Lib/test/test_os.py	Fri Dec 26 10:53:43 2014 -0600
+++ b/Lib/test/test_os.py	Sun Dec 21 01:16:38 2014 +0100
@@ -27,6 +27,7 @@
 import decimal
 import fractions
 import pickle
+import sysconfig
 try:
     import threading
 except ImportError:
@@ -1053,6 +1054,12 @@
         data2 = self.get_urandom_subprocess(16)
         self.assertNotEqual(data1, data2)
 
+
+HAVE_GETENTROPY = (sysconfig.get_config_var('HAVE_GETENTROPY') == 1)
+
+@unittest.skipIf(HAVE_GETENTROPY,
+                 "getentropy() does not use a file descriptor")
+class URandomFDTests(unittest.TestCase):
     @unittest.skipUnless(resource, "test requires the resource module")
     def test_urandom_failure(self):
         # Check urandom() failing when it is not able to open /dev/random.
diff -r 3d19f419cc44 -r f11f84902713 Misc/NEWS
--- a/Misc/NEWS	Fri Dec 26 10:53:43 2014 -0600
+++ b/Misc/NEWS	Sun Dec 21 01:16:38 2014 +0100
@@ -41,6 +41,9 @@
 Library
 -------
 
+- Issue #22585: On OpenBSD 5.6 and newer, os.urandom() now calls getentropy(),
+  instead of reading /dev/urandom, to get pseudo-random bytes.
+
 - Issue #23112: Fix SimpleHTTPServer to correctly carry the query string and
   fragment when it redirects to add a trailing slash.
 
diff -r 3d19f419cc44 -r f11f84902713 Python/random.c
--- a/Python/random.c	Fri Dec 26 10:53:43 2014 -0600
+++ b/Python/random.c	Sun Dec 21 01:16:38 2014 +0100
@@ -15,8 +15,6 @@
 #endif
 
 #ifdef MS_WINDOWS
-/* This handle is never explicitly released. Instead, the operating
-   system will release it when the process terminates. */
 static HCRYPTPROV hCryptProv = 0;
 
 static int
@@ -38,7 +36,7 @@
 }
 
 /* Fill buffer with size pseudo-random bytes generated by the Windows CryptoGen
-   API. Return 0 on success, or -1 on error. */
+   API. Return 0 on success, or raise an exception and return -1 on error. */
 static int
 win32_urandom(unsigned char *buffer, Py_ssize_t size, int raise)
 {
@@ -68,10 +66,35 @@
     }
     return 0;
 }
-#endif /* MS_WINDOWS */
+
+#elif HAVE_GETENTROPY
+/* Fill buffer with size pseudo-random bytes generated by getentropy().
+   Return 0 on success, or raise an exception and return -1 on error.
 
+   If fatal is nonzero, call Py_FatalError() instead of raising an exception
+   on error. */
+static int
+py_getentropy(unsigned char *buffer, Py_ssize_t size, int fatal)
+{
+    while (size > 0) {
+        Py_ssize_t len = Py_MIN(size, 256);
+        int res = getentropy(buffer, len);
+        if (res < 0) {
+            if (fatal) {
+                Py_FatalError("getentropy() failed");
+            }
+            else {
+                PyErr_SetFromErrno(PyExc_OSError);
+                return -1;
+            }
+        }
+        buffer += len;
+        size -= len;
+    }
+    return 0;
+}
 
-#ifndef MS_WINDOWS
+#else
 static struct {
     int fd;
     dev_t st_dev;
@@ -203,7 +226,7 @@
     }
 }
 
-#endif /* MS_WINDOWS */
+#endif /* HAVE_GETENTROPY */
 
 /* Fill buffer with pseudo-random bytes generated by a linear congruent
    generator (LCG):
@@ -244,6 +267,8 @@
 
 #ifdef MS_WINDOWS
     return win32_urandom((unsigned char *)buffer, size, 1);
+#elif HAVE_GETENTROPY
+    return py_getentropy(buffer, size, 0);
 #else
     return dev_urandom_python((char*)buffer, size);
 #endif
@@ -289,6 +314,8 @@
     else {
 #ifdef MS_WINDOWS
         (void)win32_urandom(secret, secret_size, 0);
+#elif HAVE_GETENTROPY
+        (void)py_getentropy(secret, secret_size, 1);
 #else
         dev_urandom_noraise(secret, secret_size);
 #endif
@@ -298,7 +325,14 @@
 void
 _PyRandom_Fini(void)
 {
-#ifndef MS_WINDOWS
+#ifdef MS_WINDOWS
+    if (hCryptProv) {
+        CryptReleaseContext(hCryptProv, 0);
+        hCryptProv = 0;
+    }
+#elif HAVE_GETENTROPY
+    /* nothing to clean */
+#else
     dev_urandom_close();
 #endif
 }
diff -r 3d19f419cc44 -r f11f84902713 configure
--- a/configure	Fri Dec 26 10:53:43 2014 -0600
+++ b/configure	Sun Dec 21 01:16:38 2014 +0100
@@ -10495,7 +10495,7 @@
 for ac_func in alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
  clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \
  fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
- futimens futimes gai_strerror \
+ futimens futimes gai_strerror getentropy \
  getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
  getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
  if_nameindex \
diff -r 3d19f419cc44 -r f11f84902713 configure.ac
--- a/configure.ac	Fri Dec 26 10:53:43 2014 -0600
+++ b/configure.ac	Sun Dec 21 01:16:38 2014 +0100
@@ -2935,7 +2935,7 @@
 AC_CHECK_FUNCS(alarm accept4 setitimer getitimer bind_textdomain_codeset chown \
  clock confstr ctermid dup3 execv faccessat fchmod fchmodat fchown fchownat \
  fexecve fdopendir fork fpathconf fstatat ftime ftruncate futimesat \
- futimens futimes gai_strerror \
+ futimens futimes gai_strerror getentropy \
  getgrouplist getgroups getlogin getloadavg getpeername getpgid getpid \
  getpriority getresuid getresgid getpwent getspnam getspent getsid getwd \
  if_nameindex \
diff -r 3d19f419cc44 -r f11f84902713 pyconfig.h.in
--- a/pyconfig.h.in	Fri Dec 26 10:53:43 2014 -0600
+++ b/pyconfig.h.in	Sun Dec 21 01:16:38 2014 +0100
@@ -329,6 +329,9 @@
 /* Define this if you have flockfile(), getc_unlocked(), and funlockfile() */
 #undef HAVE_GETC_UNLOCKED
 
+/* Define to 1 if you have the `getentropy' function. */
+#undef HAVE_GETENTROPY
+
 /* Define to 1 if you have the `getgrouplist' function. */
 #undef HAVE_GETGROUPLIST