diff options
| -rw-r--r-- | Misc/NEWS | 2 | ||||
| -rw-r--r-- | Modules/_ssl.c | 11 |
2 files changed, 11 insertions, 2 deletions
@@ -103,6 +103,8 @@ Core and Builtins Library ------- +- Issue #21781: ssl.RAND_add() now supports strings longer than 2 GB. + - Issue #21679: Prevent extraneous fstat() calls during open(). Patch by Bohuslav Kabrda. diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 3b7226d..27b3519 100644 --- a/Modules/_ssl.c +++ b/Modules/_ssl.c @@ -14,6 +14,8 @@ http://bugs.python.org/issue8108#msg102867 ? */ +#define PY_SSIZE_T_CLEAN + #include "Python.h" #ifdef WITH_THREAD @@ -3233,12 +3235,17 @@ static PyObject * PySSL_RAND_add(PyObject *self, PyObject *args) { char *buf; - int len; + Py_ssize_t len, written; double entropy; if (!PyArg_ParseTuple(args, "s#d:RAND_add", &buf, &len, &entropy)) return NULL; - RAND_add(buf, len, entropy); + do { + written = Py_MIN(len, INT_MAX); + RAND_add(buf, (int)written, entropy); + buf += written; + len -= written; + } while (len); Py_INCREF(Py_None); return Py_None; } |
