Skip to content

Commit

Permalink
Change the builtin hash algorithms' names to lower case names
Browse files Browse the repository at this point in the history
as promised by hashlib's documentation.
  • Loading branch information
tiran committed Aug 15, 2013
1 parent f0e5210 commit 37d5ceb
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Lib/test/test_hashlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -233,9 +233,9 @@ def check_blocksize_name(self, name, block_size=0, digest_size=0):
self.assertEqual(m.block_size, block_size)
self.assertEqual(m.digest_size, digest_size)
self.assertEqual(len(m.digest()), digest_size)
self.assertEqual(m.name.lower(), name.lower())
self.assertEqual(m.name, name)
# split for sha3_512 / _sha3.sha3 object
self.assertIn(name.split("_")[0], repr(m).lower())
self.assertIn(name.split("_")[0], repr(m))

def test_blocksize_name(self):
self.check_blocksize_name('md5', 64, 16)
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ Core and Builtins
Library
-------

- Issue #18532: Change the builtin hash algorithms' names to lower case names
as promised by hashlib's documentation.

- Issue #18405: Improve the entropy of crypt.mksalt().

- Issue #12015: The tempfile module now uses a suffix of 8 random characters
Expand Down
2 changes: 1 addition & 1 deletion Modules/md5module.c
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ MD5_get_block_size(PyObject *self, void *closure)
static PyObject *
MD5_get_name(PyObject *self, void *closure)
{
return PyUnicode_FromStringAndSize("MD5", 3);
return PyUnicode_FromStringAndSize("md5", 3);
}

static PyObject *
Expand Down
2 changes: 1 addition & 1 deletion Modules/sha1module.c
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ SHA1_get_block_size(PyObject *self, void *closure)
static PyObject *
SHA1_get_name(PyObject *self, void *closure)
{
return PyUnicode_FromStringAndSize("SHA1", 4);
return PyUnicode_FromStringAndSize("sha1", 4);
}

static PyObject *
Expand Down
4 changes: 2 additions & 2 deletions Modules/sha256module.c
Original file line number Diff line number Diff line change
Expand Up @@ -501,9 +501,9 @@ static PyObject *
SHA256_get_name(PyObject *self, void *closure)
{
if (((SHAobject *)self)->digestsize == 32)
return PyUnicode_FromStringAndSize("SHA256", 6);
return PyUnicode_FromStringAndSize("sha256", 6);
else
return PyUnicode_FromStringAndSize("SHA224", 6);
return PyUnicode_FromStringAndSize("sha224", 6);
}

static PyGetSetDef SHA_getseters[] = {
Expand Down
4 changes: 2 additions & 2 deletions Modules/sha512module.c
Original file line number Diff line number Diff line change
Expand Up @@ -567,9 +567,9 @@ static PyObject *
SHA512_get_name(PyObject *self, void *closure)
{
if (((SHAobject *)self)->digestsize == 64)
return PyUnicode_FromStringAndSize("SHA512", 6);
return PyUnicode_FromStringAndSize("sha512", 6);
else
return PyUnicode_FromStringAndSize("SHA384", 6);
return PyUnicode_FromStringAndSize("sha384", 6);
}

static PyGetSetDef SHA_getseters[] = {
Expand Down

0 comments on commit 37d5ceb

Please sign in to comment.