changeset: 78974:a13bfc238f27 branch: 2.7 parent: 78971:9ed2e8307e60 user: Jesus Cea date: Mon Sep 10 21:04:42 2012 +0200 files: Lib/test/test_hashlib.py Misc/NEWS Modules/shamodule.c description: Closes #15908: SHA1 crashes in 64 bits when the string to hash is bigger than 2**32 bytes diff -r 9ed2e8307e60 -r a13bfc238f27 Lib/test/test_hashlib.py --- a/Lib/test/test_hashlib.py Mon Sep 10 20:18:43 2012 +0200 +++ b/Lib/test/test_hashlib.py Mon Sep 10 21:04:42 2012 +0200 @@ -228,6 +228,14 @@ self.check('sha1', "a" * 1000000, "34aa973cd4c4daa4f61eeb2bdbad27316534016f") + @precisionbigmemtest(size=_4G + 5, memuse=1) + def test_case_sha1_huge(self, size): + if size == _4G + 5: + try: + self.check('sha1', 'A'*size, + '87d745c50e6b2879ffa0fb2c930e9fbfe0dc9a5b') + except OverflowError: + pass # 32-bit arch # use the examples from Federal Information Processing Standards # Publication 180-2, Secure Hash Standard, 2002 August 1 diff -r 9ed2e8307e60 -r a13bfc238f27 Misc/NEWS --- a/Misc/NEWS Mon Sep 10 20:18:43 2012 +0200 +++ b/Misc/NEWS Mon Sep 10 21:04:42 2012 +0200 @@ -244,6 +244,9 @@ - Issue #14888: Fix misbehaviour of the _md5 module when called on data larger than 2**32 bytes. +- Issue #15908: Fix misbehaviour of the sha1 module when called on data + larger than 2**32 bytes. + - Issue #14875: Use float('inf') instead of float('1e66666') in the json module. - Issue #14572: Prevent build failures with pre-3.5.0 versions of diff -r 9ed2e8307e60 -r a13bfc238f27 Modules/shamodule.c --- a/Modules/shamodule.c Mon Sep 10 20:18:43 2012 +0200 +++ b/Modules/shamodule.c Mon Sep 10 21:04:42 2012 +0200 @@ -536,6 +536,8 @@ static char *kwlist[] = {"string", NULL}; SHAobject *new; Py_buffer view = { 0 }; + Py_ssize_t n; + unsigned char *buf; if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s*:new", kwlist, &view)) { @@ -554,10 +556,21 @@ PyBuffer_Release(&view); return NULL; } - if (view.len> 0) { - sha_update(new, (unsigned char*)view.buf, - Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int)); + + n = view.len; + buf = (unsigned char *) view.buf; + while (n> 0) { + Py_ssize_t nbytes; + if (n> INT_MAX) + nbytes = INT_MAX; + else + nbytes = n; + sha_update(new, buf, + Py_SAFE_DOWNCAST(nbytes, Py_ssize_t, unsigned int)); + buf += nbytes; + n -= nbytes; } + PyBuffer_Release(&view); return (PyObject *)new;