Changeset 404 for python

Timestamp:

Mar 22, 2014, 2:49:57 PM (11 years ago)

Author:

dmik

Message:

python: Reuse VMS random routine on OS/2 as well.

OS/2 has always been using openssl random routine just as VMS
does but it was defined in a separate file which is superfluous.

Location:

python/trunk

Files:

• Modules/posixmodule.c (modified) (3 diffs)
• Python/random.c (modified) (4 diffs)

python/trunk/Modules/posixmodule.c

@@ -8706 +8706 @@
 #endif
 
-#ifndef __EMX__
 PyDoc_STRVAR(posix_urandom__doc__,
 "urandom(n) -> str\n\n\
@@ -8736 +8735 @@
     return result;
 }
-#else
-/* Use openssl random routine */
-#include <openssl/rand.h>
-PyDoc_STRVAR(os2_urandom__doc__,
-"urandom(n) -> str\n\n\
-Return a string of n random bytes suitable for cryptographic use.");
-
-static PyObject*
-os2_urandom(PyObject *self, PyObject *args)
-{
-        int howMany;
-        PyObject* result;
-
-        /* Read arguments */
-        if (! PyArg_ParseTuple(args, "i:urandom", &howMany))
-                return NULL;
-        if (howMany < 0)
-                return PyErr_Format(PyExc_ValueError,
-                                    "negative argument not allowed");
-
-        /* Allocate bytes */
-        result = PyString_FromStringAndSize(NULL, howMany);
-        if (result != NULL) {
-                /* Get random data */
-                if (RAND_pseudo_bytes((unsigned char*)
-                                      PyString_AS_STRING(result),
-                                      howMany) < 0) {
-                        Py_DECREF(result);
-                        return PyErr_Format(PyExc_ValueError,
-                                            "RAND_pseudo_bytes");
-                }
-        }
-        return result;
-}
-#endif
 
 #ifdef HAVE_SETRESUID
@@ -9167 +9131 @@
     {"getresgid",       posix_getresgid, METH_NOARGS, posix_getresgid__doc__},
 #endif
-#ifndef __EMX__
     {"urandom",         posix_urandom,   METH_VARARGS, posix_urandom__doc__},
-#else
-    {"urandom",         os2_urandom,     METH_VARARGS, os2_urandom__doc__},
-#endif
     {NULL,              NULL}            /* Sentinel */
 };

python/trunk/Python/random.c

@@ -96 +96 @@
 
 
-#ifdef __VMS
+#if defined(__VMS) || defined(__OS2__)
 /* Use openssl random routine */
 #include <openssl/rand.h>
@@ -117 +117 @@
 
 
-#if !defined(MS_WINDOWS) && !defined(__VMS)
+#if !defined(MS_WINDOWS) && !defined(__VMS) && !defined(__OS2__)
 
 /* Read size bytes from /dev/urandom into buffer.
@@ -244 +244 @@
     return win32_urandom((unsigned char *)buffer, size, 1);
 #else
-# ifdef __VMS
+# if defined(__VMS) || defined(__OS2__)
     return vms_urandom((unsigned char *)buffer, size, 1);
 # else
@@ -303 +303 @@
         (void)win32_urandom((unsigned char *)secret, secret_size, 0);
 #else /* #ifdef MS_WINDOWS */
-# ifdef __VMS
+# if defined(__VMS) || defined(__OS2__)
         vms_urandom((unsigned char *)secret, secret_size, 0);
 # else