Change hashlib to return bytes from digest() instead of str8.

This commit is contained in:
Guido van Rossum 2007-07-09 14:29:40 +00:00
parent 867bcbcd6d
commit 5ed033b5a2
5 changed files with 32 additions and 29 deletions

View file

@ -432,7 +432,7 @@ SHA256_digest(SHAobject *self, PyObject *unused)
SHAcopy(self, &temp);
sha_final(digest, &temp);
return PyString_FromStringAndSize((const char *)digest, self->digestsize);
return PyBytes_FromStringAndSize((const char *)digest, self->digestsize);
}
PyDoc_STRVAR(SHA256_hexdigest__doc__,
@ -510,9 +510,9 @@ static PyObject *
SHA256_get_name(PyObject *self, void *closure)
{
if (((SHAobject *)self)->digestsize == 32)
return PyString_FromStringAndSize("SHA256", 6);
return PyUnicode_FromStringAndSize("SHA256", 6);
else
return PyString_FromStringAndSize("SHA224", 6);
return PyUnicode_FromStringAndSize("SHA224", 6);
}
static PyGetSetDef SHA_getseters[] = {