Issue #21781: Make the ssl module "ssize_t clean" for parsing parameters.

ssl.RAND_add() now supports strings longer than 2 GB.

diff --git a/Misc/NEWS b/Misc/NEWS
index 9a42c1fd4620580f70ca45c547a63c96d57883df..0efa8150d544b116b1167cece0c546b63ef6459a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -27,6 +27,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #21781: ssl.RAND_add() now supports strings longer than 2 GB.
+
 - Issue #11453: asyncore: emit a ResourceWarning when an unclosed file_wrapper
   object is destroyed. The destructor now closes the file if needed. The
   close() method can now be called twice: the second call does nothing.

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 503147698d88936c772c5a430285340b16a38558..12ffe52c2f0dde4f50ed870aeea4c89dfd3b9aec 100644 (file)
--- 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
@@ -3235,12 +3237,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;
 }