mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #20025: ssl.RAND_bytes() and ssl.RAND_pseudo_bytes() now raise a

Browse source 
ValueError if num is negative (instead of raising a SystemError).
This commit is contained in:
Victor Stinner 2013-12-19 16:47:04 +01:00
parent cb1f74ec40
commit 1e81a399a2
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Lib/test/test_ssl.py
View file

@ -126,6 +126,10 @@ class BasicSocketTests(unittest.TestCase):
else: else:
self.assertRaises(ssl.SSLError, ssl.RAND_bytes, 16) self.assertRaises(ssl.SSLError, ssl.RAND_bytes, 16)
# negative num is invalid
self.assertRaises(ValueError, ssl.RAND_bytes, -5)
self.assertRaises(ValueError, ssl.RAND_pseudo_bytes, -5)
self.assertRaises(TypeError, ssl.RAND_egd, 1) self.assertRaises(TypeError, ssl.RAND_egd, 1)
self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1) self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1)
ssl.RAND_add("this is a random string", 75.0) ssl.RAND_add("this is a random string", 75.0)

5
Modules/_ssl.c
View file

@ -2486,6 +2486,11 @@ PySSL_RAND(int len, int pseudo)
const char *errstr; const char *errstr;
PyObject *v; PyObject *v;
if (len < 0) {
PyErr_SetString(PyExc_ValueError, "num must be positive");
return NULL;
}
bytes = PyBytes_FromStringAndSize(NULL, len); bytes = PyBytes_FromStringAndSize(NULL, len);
if (bytes == NULL) if (bytes == NULL)
return NULL; return NULL;