diff options
Diffstat (limited to 'Modules/sha256module.c')
| -rw-r--r-- | Modules/sha256module.c | 103 |
1 files changed, 63 insertions, 40 deletions
diff --git a/Modules/sha256module.c b/Modules/sha256module.c index 2ce8d92ca9a..86172109174 100644 --- a/Modules/sha256module.c +++ b/Modules/sha256module.c @@ -9,7 +9,7 @@ Greg Stein (gstein@lyra.org) Trevor Perrin (trevp@trevp.net) - Copyright (C) 2005 Gregory P. Smith (greg@krypto.org) + Copyright (C) 2005-2007 Gregory P. Smith (greg@krypto.org) Licensed to PSF under a Contributor Agreement. */ @@ -18,6 +18,7 @@ #include "Python.h" #include "structmember.h" +#include "hashlib.h" /* Endianness testing and definitions */ @@ -103,7 +104,7 @@ static void SHAcopy(SHAobject *src, SHAobject *dest) * The library is free for all purposes without any express * gurantee it works. * - * Tom St Denis, tomstdenis@iahu.ca, http://libtomcrypt.org + * Tom St Denis, tomstdenis@iahu.ca, http://libtom.org */ @@ -264,9 +265,9 @@ sha224_init(SHAobject *sha_info) /* update the SHA digest */ static void -sha_update(SHAobject *sha_info, SHA_BYTE *buffer, int count) +sha_update(SHAobject *sha_info, SHA_BYTE *buffer, Py_ssize_t count) { - int i; + Py_ssize_t i; SHA_INT32 clo; clo = sha_info->count_lo + ((SHA_INT32) count << 3); @@ -432,7 +433,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__, @@ -444,7 +445,7 @@ SHA256_hexdigest(SHAobject *self, PyObject *unused) unsigned char digest[SHA_DIGESTSIZE]; SHAobject temp; PyObject *retval; - char *hex_digest; + Py_UNICODE *hex_digest; int i, j; /* Get the raw (binary) digest value */ @@ -452,10 +453,10 @@ SHA256_hexdigest(SHAobject *self, PyObject *unused) sha_final(digest, &temp); /* Create a new string */ - retval = PyString_FromStringAndSize(NULL, self->digestsize * 2); + retval = PyUnicode_FromStringAndSize(NULL, self->digestsize * 2); if (!retval) return NULL; - hex_digest = PyString_AsString(retval); + hex_digest = PyUnicode_AS_UNICODE(retval); if (!hex_digest) { Py_DECREF(retval); return NULL; @@ -480,15 +481,19 @@ PyDoc_STRVAR(SHA256_update__doc__, static PyObject * SHA256_update(SHAobject *self, PyObject *args) { + PyObject *obj; Py_buffer buf; - if (!PyArg_ParseTuple(args, "s*:update", &buf)) + if (!PyArg_ParseTuple(args, "O:update", &obj)) return NULL; + GET_BUFFER_VIEW_OR_ERROUT(obj, &buf); + sha_update(self, buf.buf, buf.len); PyBuffer_Release(&buf); - Py_RETURN_NONE; + Py_INCREF(Py_None); + return Py_None; } static PyMethodDef SHA_methods[] = { @@ -502,16 +507,16 @@ static PyMethodDef SHA_methods[] = { static PyObject * SHA256_get_block_size(PyObject *self, void *closure) { - return PyInt_FromLong(SHA_BLOCKSIZE); + return PyLong_FromLong(SHA_BLOCKSIZE); } 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[] = { @@ -528,9 +533,6 @@ static PyGetSetDef SHA_getseters[] = { static PyMemberDef SHA_members[] = { {"digest_size", T_INT, offsetof(SHAobject, digestsize), READONLY, NULL}, - /* the old md5 and sha modules support 'digest_size' as in PEP 247. - * the old sha module also supported 'digestsize'. ugh. */ - {"digestsize", T_INT, offsetof(SHAobject, digestsize), READONLY, NULL}, {NULL} /* Sentinel */ }; @@ -544,7 +546,7 @@ static PyTypeObject SHA224type = { 0, /*tp_print*/ 0, /*tp_getattr*/ 0, /*tp_setattr*/ - 0, /*tp_compare*/ + 0, /*tp_reserved*/ 0, /*tp_repr*/ 0, /*tp_as_number*/ 0, /*tp_as_sequence*/ @@ -578,7 +580,7 @@ static PyTypeObject SHA256type = { 0, /*tp_print*/ 0, /*tp_getattr*/ 0, /*tp_setattr*/ - 0, /*tp_compare*/ + 0, /*tp_reserved*/ 0, /*tp_repr*/ 0, /*tp_as_number*/ 0, /*tp_as_sequence*/ @@ -613,15 +615,20 @@ SHA256_new(PyObject *self, PyObject *args, PyObject *kwdict) { static char *kwlist[] = {"string", NULL}; SHAobject *new; - Py_buffer buf = { 0 }; + PyObject *data_obj = NULL; + Py_buffer buf; - if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s*:new", kwlist, - &buf)) { + if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|O:new", kwlist, + &data_obj)) { return NULL; } + if (data_obj) + GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf); + if ((new = newSHA256object()) == NULL) { - PyBuffer_Release(&buf); + if (data_obj) + PyBuffer_Release(&buf); return NULL; } @@ -629,13 +636,14 @@ SHA256_new(PyObject *self, PyObject *args, PyObject *kwdict) if (PyErr_Occurred()) { Py_DECREF(new); - PyBuffer_Release(&buf); + if (data_obj) + PyBuffer_Release(&buf); return NULL; } - if (buf.len > 0) { + if (data_obj) { sha_update(new, buf.buf, buf.len); + PyBuffer_Release(&buf); } - PyBuffer_Release(&buf); return (PyObject *)new; } @@ -648,15 +656,20 @@ SHA224_new(PyObject *self, PyObject *args, PyObject *kwdict) { static char *kwlist[] = {"string", NULL}; SHAobject *new; - Py_buffer buf = { 0 }; + PyObject *data_obj = NULL; + Py_buffer buf; - if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|s*:new", kwlist, - &buf)) { + if (!PyArg_ParseTupleAndKeywords(args, kwdict, "|O:new", kwlist, + &data_obj)) { return NULL; } + if (data_obj) + GET_BUFFER_VIEW_OR_ERROUT(data_obj, &buf); + if ((new = newSHA224object()) == NULL) { - PyBuffer_Release(&buf); + if (data_obj) + PyBuffer_Release(&buf); return NULL; } @@ -664,13 +677,14 @@ SHA224_new(PyObject *self, PyObject *args, PyObject *kwdict) if (PyErr_Occurred()) { Py_DECREF(new); - PyBuffer_Release(&buf); + if (data_obj) + PyBuffer_Release(&buf); return NULL; } - if (buf.len > 0) { + if (data_obj) { sha_update(new, buf.buf, buf.len); + PyBuffer_Release(&buf); } - PyBuffer_Release(&buf); return (PyObject *)new; } @@ -689,18 +703,27 @@ static struct PyMethodDef SHA_functions[] = { #define insint(n,v) { PyModule_AddIntConstant(m,n,v); } + +static struct PyModuleDef _sha256module = { + PyModuleDef_HEAD_INIT, + "_sha256", + NULL, + -1, + SHA_functions, + NULL, + NULL, + NULL, + NULL +}; + PyMODINIT_FUNC -init_sha256(void) +PyInit__sha256(void) { - PyObject *m; - Py_TYPE(&SHA224type) = &PyType_Type; if (PyType_Ready(&SHA224type) < 0) - return; + return NULL; Py_TYPE(&SHA256type) = &PyType_Type; if (PyType_Ready(&SHA256type) < 0) - return; - m = Py_InitModule("_sha256", SHA_functions); - if (m == NULL) - return; + return NULL; + return PyModule_Create(&_sha256module); } |