mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fixes Issue #3745: Fix hashlib to always reject unicode and non

Browse source 
buffer-api supporting objects as input no matter how it was compiled
(built in implementations or external openssl library).
This commit is contained in:
Gregory P. Smith 2009-02-12 07:35:29 +00:00
parent 3072921d0e
commit 365a1864fd
8 changed files with 133 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Modules/md5module.c
View file

@ -17,6 +17,7 @@
/* MD5 objects */
#include "Python.h"
#include "hashlib.h"
/* Some useful types */
@ -411,11 +412,14 @@ PyDoc_STRVAR(MD5_update__doc__,
static PyObject *
MD5_update(MD5object *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);
md5_process(&self->hash_state, buf.buf, buf.len);
PyBuffer_Release(&buf);
@ -511,14 +515,17 @@ MD5_new(PyObject *self, PyObject *args, PyObject *kwdict)
{
static char *kwlist[] = {"string", NULL};
MD5object *new;
PyObject *data_obj = NULL;
Py_buffer buf;
buf.buf = NULL;
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 = newMD5object()) == NULL)
return NULL;
@ -528,7 +535,7 @@ MD5_new(PyObject *self, PyObject *args, PyObject *kwdict)
Py_DECREF(new);
return NULL;
}
if (buf.buf) {
if (data_obj) {
md5_process(&new->hash_state, buf.buf, buf.len);
PyBuffer_Release(&buf);
}