mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #8477: ssl.RAND_egd() supports str with surrogates and bytes for the path

Browse source
This commit is contained in:
Victor Stinner 2010-05-16 21:36:37 +00:00
parent 3800e1e961
commit f9faaad801
2 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Modules/_ssl.c
View file

@ -1730,15 +1730,17 @@ 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 *arg)
PySSL_RAND_egd(PyObject *self, PyObject *args)
{
PyObject *path;
int bytes;
if (!PyUnicode_Check(arg))
return PyErr_Format(PyExc_TypeError,
"RAND_egd() expected string, found %s",
Py_TYPE(arg)->tp_name);
bytes = RAND_egd(_PyUnicode_AsString(arg));
if (!PyArg_ParseTuple(args, "O&|i: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 "
@ -1767,7 +1769,7 @@ static PyMethodDef PySSL_methods[] = {
#ifdef HAVE_OPENSSL_RAND
{"RAND_add", PySSL_RAND_add, METH_VARARGS,
PySSL_RAND_add_doc},
{"RAND_egd", PySSL_RAND_egd, METH_O,
{"RAND_egd", PySSL_RAND_egd, METH_VARARGS,
PySSL_RAND_egd_doc},
{"RAND_status", (PyCFunction)PySSL_RAND_status, METH_NOARGS,
PySSL_RAND_status_doc},