Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Use the new buffer api for input data.

This commit is contained in:
Gregory P. Smith 2007-08-26 02:58:36 +00:00
parent 6777c85cba
commit 9406f5cadb
2 changed files with 80 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lib/hashlib.py
View File

@ -1,6 +1,6 @@
# $Id$ # $Id$
# #
# Copyright (C) 2005 Gregory P. Smith (greg@electricrain.com) # Copyright (C) 2005-2007 Gregory P. Smith (greg@krypto.org)
# Licensed to PSF under a Contributor Agreement. # Licensed to PSF under a Contributor Agreement.
# #

106
Modules/_hashopenssl.c
View File

@ -1,7 +1,7 @@
/* Module that wraps all OpenSSL hash algorithms */ /* Module that wraps all OpenSSL hash algorithms */
/* /*
* Copyright (C) 2005 Gregory P. Smith (greg@electricrain.com) * Copyright (C) 2005-2007 Gregory P. Smith (greg@krypto.org)
* Licensed to PSF under a Contributor Agreement. * Licensed to PSF under a Contributor Agreement.
* *
* Derived from a skeleton of shamodule.c containing work performed by: * Derived from a skeleton of shamodule.c containing work performed by:
@ -28,6 +28,11 @@ typedef struct {
PyObject_HEAD PyObject_HEAD
PyObject *name; /* name of this hash algorithm */ PyObject *name; /* name of this hash algorithm */
EVP_MD_CTX ctx; /* OpenSSL message digest context */ EVP_MD_CTX ctx; /* OpenSSL message digest context */
/*
* TODO investigate performance impact of including a lock for this object
* here and releasing the Python GIL while hash updates are in progress.
* (perhaps only release GIL if input length will take long to process?)
*/
} EVPobject; } EVPobject;
@ -147,20 +152,41 @@ EVP_hexdigest(EVPobject *self, PyObject *unused)
return retval; return retval;
} }
#define MY_GET_BUFFER_VIEW_OR_ERROUT(obj, viewp) do { \
if (!PyObject_CheckBuffer((obj))) { \
PyErr_SetString(PyExc_TypeError, \
"object supporting the buffer API required"); \
return NULL; \
} \
if (PyObject_GetBuffer((obj), (viewp), PyBUF_SIMPLE) == -1) { \
return NULL; \
} \
if ((viewp)->ndim > 1) { \
PyErr_SetString(PyExc_BufferError, \
"Buffer must be single dimension"); \
PyObject_ReleaseBuffer((obj), (viewp)); \
return NULL; \
} \
} while(0);
PyDoc_STRVAR(EVP_update__doc__, PyDoc_STRVAR(EVP_update__doc__,
"Update this hash object's state with the provided string."); "Update this hash object's state with the provided string.");
static PyObject * static PyObject *
EVP_update(EVPobject *self, PyObject *args) EVP_update(EVPobject *self, PyObject *args)
{ {
unsigned char *cp; PyObject *obj;
Py_ssize_t len; PyBuffer view;
if (!PyArg_ParseTuple(args, "s#:update", &cp, &len)) if (!PyArg_ParseTuple(args, "O:update", &obj))
return NULL; return NULL;
EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, MY_GET_BUFFER_VIEW_OR_ERROUT(obj, &view);
unsigned int));
EVP_DigestUpdate(&self->ctx, (unsigned char*)view.buf,
Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int));
PyObject_ReleaseBuffer(obj, &view);
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
@ -225,24 +251,31 @@ EVP_tp_init(EVPobject *self, PyObject *args, PyObject *kwds)
{ {
static char *kwlist[] = {"name", "string", NULL}; static char *kwlist[] = {"name", "string", NULL};
PyObject *name_obj = NULL; PyObject *name_obj = NULL;
PyObject *data_obj = NULL;
PyBuffer view;
char *nameStr; char *nameStr;
unsigned char *cp = NULL;
Py_ssize_t len = 0;
const EVP_MD *digest; const EVP_MD *digest;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|s#:HASH", kwlist, if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:HASH", kwlist,
&name_obj, &cp, &len)) { &name_obj, &data_obj)) {
return -1; return -1;
} }
if (data_obj)
MY_GET_BUFFER_VIEW_OR_ERROUT(data_obj, &view);
if (!PyArg_Parse(name_obj, "s", &nameStr)) { if (!PyArg_Parse(name_obj, "s", &nameStr)) {
PyErr_SetString(PyExc_TypeError, "name must be a string"); PyErr_SetString(PyExc_TypeError, "name must be a string");
if (data_obj)
PyObject_ReleaseBuffer(data_obj, &view);
return -1; return -1;
} }
digest = EVP_get_digestbyname(nameStr); digest = EVP_get_digestbyname(nameStr);
if (!digest) { if (!digest) {
PyErr_SetString(PyExc_ValueError, "unknown hash function"); PyErr_SetString(PyExc_ValueError, "unknown hash function");
if (data_obj)
PyObject_ReleaseBuffer(data_obj, &view);
return -1; return -1;
} }
EVP_DigestInit(&self->ctx, digest); EVP_DigestInit(&self->ctx, digest);
@ -250,9 +283,11 @@ EVP_tp_init(EVPobject *self, PyObject *args, PyObject *kwds)
self->name = name_obj; self->name = name_obj;
Py_INCREF(self->name); Py_INCREF(self->name);
if (cp && len) if (data_obj) {
EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, EVP_DigestUpdate(&self->ctx, (unsigned char*)view.buf,
unsigned int)); Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int));
PyObject_ReleaseBuffer(data_obj, &view);
}
return 0; return 0;
} }
@ -361,13 +396,14 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
{ {
static char *kwlist[] = {"name", "string", NULL}; static char *kwlist[] = {"name", "string", NULL};
PyObject *name_obj = NULL; PyObject *name_obj = NULL;
PyObject *data_obj = NULL;
PyBuffer view = { 0 };
PyObject *ret_obj;
char *name; char *name;
const EVP_MD *digest; const EVP_MD *digest;
unsigned char *cp = NULL;
Py_ssize_t len = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "O|s#:new", kwlist, if (!PyArg_ParseTupleAndKeywords(args, kwdict, "O|O:new", kwlist,
&name_obj, &cp, &len)) { &name_obj, &data_obj)) {
return NULL; return NULL;
} }
@ -376,10 +412,17 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
return NULL; return NULL;
} }
if (data_obj)
MY_GET_BUFFER_VIEW_OR_ERROUT(data_obj, &view);
digest = EVP_get_digestbyname(name); digest = EVP_get_digestbyname(name);
return EVPnew(name_obj, digest, NULL, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, ret_obj = EVPnew(name_obj, digest, NULL, (unsigned char*)view.buf,
unsigned int)); Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int));
if (data_obj)
PyObject_ReleaseBuffer(data_obj, &view);
return ret_obj;
} }
/* /*
@ -393,18 +436,27 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
static PyObject * \ static PyObject * \
EVP_new_ ## NAME (PyObject *self, PyObject *args) \ EVP_new_ ## NAME (PyObject *self, PyObject *args) \
{ \ { \
unsigned char *cp = NULL; \ PyObject *data_obj = NULL; \
Py_ssize_t len = 0; \ PyBuffer view = { 0 }; \
PyObject *ret_obj; \
\ \
if (!PyArg_ParseTuple(args, "|s#:" #NAME , &cp, &len)) { \ if (!PyArg_ParseTuple(args, "|O:" #NAME , &data_obj)) { \
return NULL; \ return NULL; \
} \ } \
\ \
return EVPnew( \ if (data_obj) \
CONST_ ## NAME ## _name_obj, \ MY_GET_BUFFER_VIEW_OR_ERROUT(data_obj, &view); \
NULL, \ \
CONST_new_ ## NAME ## _ctx_p, \ ret_obj = EVPnew( \
cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, unsigned int)); \ CONST_ ## NAME ## _name_obj, \
NULL, \
CONST_new_ ## NAME ## _ctx_p, \
(unsigned char*)view.buf, \
Py_SAFE_DOWNCAST(view.len, Py_ssize_t, unsigned int)); \
\
if (data_obj) \
PyObject_ReleaseBuffer(data_obj, &view); \
return ret_obj; \
} }
/* a PyMethodDef structure for the constructor */ /* a PyMethodDef structure for the constructor */