48 lines
1.6 KiB
Text
48 lines
1.6 KiB
Text
|
$OpenBSD: patch-Modules__ssl_c,v 1.1 2014/04/20 09:48:03 sthen Exp $
|
||
|
|
--- Modules/_ssl.c.orig Mon Mar 17 02:31:31 2014
|
||
|
|
+++ Modules/_ssl.c Sat Apr 19 19:29:29 2014
|
||
|
|
@@ -3317,34 +3317,6 @@ Returns 1 if the OpenSSL PRNG has been seeded with eno
|
||
|
|
It is necessary to seed the PRNG with RAND_add() on some platforms before\n\
|
||
|
|
using the ssl() function.");
|
||
|
|
|
||
|
|
-static PyObject *
|
||
|
|
-PySSL_RAND_egd(PyObject *self, PyObject *args)
|
||
|
|
-{
|
||
|
|
- PyObject *path;
|
||
|
|
- int bytes;
|
||
|
|
-
|
||
|
|
- if (!PyArg_ParseTuple(args, "O&:RAND_egd",
|
||
|
|
- PyUnicode_FSConverter, &path))
|
||
|
|
- return NULL;
|
||
|
|
-
|
||
|
|
- bytes = RAND_egd(PyBytes_AsString(path));
|
||
|
|
- Py_DECREF(path);
|
||
|
|
- if (bytes == -1) {
|
||
|
|
- PyErr_SetString(PySSLErrorObject,
|
||
|
|
- "EGD connection failed or EGD did not return "
|
||
|
|
- "enough data to seed the PRNG");
|
||
|
|
- return NULL;
|
||
|
|
- }
|
||
|
|
- return PyLong_FromLong(bytes);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
-PyDoc_STRVAR(PySSL_RAND_egd_doc,
|
||
|
|
-"RAND_egd(path) -> bytes\n\
|
||
|
|
-\n\
|
||
|
|
-Queries the entropy gather daemon (EGD) on the socket named by 'path'.\n\
|
||
|
|
-Returns number of bytes read. Raises SSLError if connection to EGD\n\
|
||
|
|
-fails or if it does not provide enough data to seed PRNG.");
|
||
|
|
-
|
||
|
|
#endif /* HAVE_OPENSSL_RAND */
|
||
|
|
|
||
|
|
|
||
|
|
@@ -3739,8 +3711,6 @@ static PyMethodDef PySSL_methods[] = {
|
||
|
|
PySSL_RAND_bytes_doc},
|
||
|
|
{"RAND_pseudo_bytes", PySSL_RAND_pseudo_bytes, METH_VARARGS,
|
||
|
|
PySSL_RAND_pseudo_bytes_doc},
|
||
|
|
- {"RAND_egd", PySSL_RAND_egd, METH_VARARGS,
|
||
|
|
- PySSL_RAND_egd_doc},
|
||
|
|
{"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
|
||
|
|
PySSL_RAND_status_doc},
|
||
|
|
#endif
|