changeset: 78983:827bb0554f1f branch: 3.2 parent: 78980:56a2e862561c user: Jesus Cea date: Tue Sep 11 02:00:58 2012 +0200 files: Lib/test/test_ssl.py Misc/NEWS Modules/_ssl.c description: Closes #15793: Stack corruption in ssl.RAND_egd() diff -r 56a2e862561c -r 827bb0554f1f Lib/test/test_ssl.py --- a/Lib/test/test_ssl.py Mon Sep 10 22:58:07 2012 +0200 +++ b/Lib/test/test_ssl.py Tue Sep 11 02:00:58 2012 +0200 @@ -103,12 +103,8 @@ sys.stdout.write("\n RAND_status is %d (%s)\n" % (v, (v and "sufficient randomness") or "insufficient randomness")) - try: - ssl.RAND_egd(1) - except TypeError: - pass - else: - print("didn't raise TypeError") + self.assertRaises(TypeError, ssl.RAND_egd, 1) + self.assertRaises(TypeError, ssl.RAND_egd, 'foo', 1) ssl.RAND_add("this is a random string", 75.0) def test_parse_cert(self): diff -r 56a2e862561c -r 827bb0554f1f Misc/NEWS --- a/Misc/NEWS Mon Sep 10 22:58:07 2012 +0200 +++ b/Misc/NEWS Tue Sep 11 02:00:58 2012 +0200 @@ -154,6 +154,9 @@ - Issue #13579: string.Formatter now understands the 'a' conversion specifier. +- Issue #15793: Stack corruption in ssl.RAND_egd(). + Patch by Serhiy Storchaka. + - Issue #15595: Fix subprocess.Popen(universal_newlines=True) for certain locales (utf-16 and utf-32 family). Patch by Chris Jerdonek. diff -r 56a2e862561c -r 827bb0554f1f Modules/_ssl.c --- a/Modules/_ssl.c Mon Sep 10 22:58:07 2012 +0200 +++ b/Modules/_ssl.c Tue Sep 11 02:00:58 2012 +0200 @@ -1917,7 +1917,7 @@ PyObject *path; int bytes; - if (!PyArg_ParseTuple(args, "O&|i:RAND_egd", + if (!PyArg_ParseTuple(args, "O&:RAND_egd", PyUnicode_FSConverter, &path)) return NULL;