Commit 9bc844e7 authored by Thomas Wouters's avatar Thomas Wouters

Make Py_ssize_t-clean.

parent f98db65e
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
* *
*/ */
#define PY_SSIZE_T_CLEAN
#include "Python.h" #include "Python.h"
#include "structmember.h" #include "structmember.h"
...@@ -166,12 +168,13 @@ static PyObject * ...@@ -166,12 +168,13 @@ static PyObject *
EVP_update(EVPobject *self, PyObject *args) EVP_update(EVPobject *self, PyObject *args)
{ {
unsigned char *cp; unsigned char *cp;
int len; Py_ssize_t len;
if (!PyArg_ParseTuple(args, "s#:update", &cp, &len)) if (!PyArg_ParseTuple(args, "s#:update", &cp, &len))
return NULL; return NULL;
EVP_DigestUpdate(&self->ctx, cp, len); EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
unsigned int));
Py_INCREF(Py_None); Py_INCREF(Py_None);
return Py_None; return Py_None;
...@@ -238,7 +241,7 @@ EVP_tp_init(EVPobject *self, PyObject *args, PyObject *kwds) ...@@ -238,7 +241,7 @@ EVP_tp_init(EVPobject *self, PyObject *args, PyObject *kwds)
PyObject *name_obj = NULL; PyObject *name_obj = NULL;
char *nameStr; char *nameStr;
unsigned char *cp = NULL; unsigned char *cp = NULL;
unsigned int len; Py_ssize_t len;
const EVP_MD *digest; const EVP_MD *digest;
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|s#:HASH", kwlist, if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|s#:HASH", kwlist,
...@@ -262,7 +265,8 @@ EVP_tp_init(EVPobject *self, PyObject *args, PyObject *kwds) ...@@ -262,7 +265,8 @@ EVP_tp_init(EVPobject *self, PyObject *args, PyObject *kwds)
Py_INCREF(self->name); Py_INCREF(self->name);
if (cp && len) if (cp && len)
EVP_DigestUpdate(&self->ctx, cp, len); EVP_DigestUpdate(&self->ctx, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
unsigned int));
return 0; return 0;
} }
...@@ -375,7 +379,7 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict) ...@@ -375,7 +379,7 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
char *name; char *name;
const EVP_MD *digest; const EVP_MD *digest;
unsigned char *cp = NULL; unsigned char *cp = NULL;
unsigned int len; Py_ssize_t len;
if (!PyArg_ParseTupleAndKeywords(args, kwdict, "O|s#:new", kwlist, if (!PyArg_ParseTupleAndKeywords(args, kwdict, "O|s#:new", kwlist,
&name_obj, &cp, &len)) { &name_obj, &cp, &len)) {
...@@ -389,7 +393,8 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict) ...@@ -389,7 +393,8 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
digest = EVP_get_digestbyname(name); digest = EVP_get_digestbyname(name);
return EVPnew(name_obj, digest, NULL, cp, len); return EVPnew(name_obj, digest, NULL, cp, Py_SAFE_DOWNCAST(len, Py_ssize_t,
unsigned int));
} }
/* /*
...@@ -404,7 +409,7 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict) ...@@ -404,7 +409,7 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
EVP_new_ ## NAME (PyObject *self, PyObject *args) \ EVP_new_ ## NAME (PyObject *self, PyObject *args) \
{ \ { \
unsigned char *cp = NULL; \ unsigned char *cp = NULL; \
unsigned int len; \ Py_ssize_t len; \
\ \
if (!PyArg_ParseTuple(args, "|s#:" #NAME , &cp, &len)) { \ if (!PyArg_ParseTuple(args, "|s#:" #NAME , &cp, &len)) { \
return NULL; \ return NULL; \
...@@ -414,7 +419,7 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict) ...@@ -414,7 +419,7 @@ EVP_new(PyObject *self, PyObject *args, PyObject *kwdict)
CONST_ ## NAME ## _name_obj, \ CONST_ ## NAME ## _name_obj, \
NULL, \ NULL, \
CONST_new_ ## NAME ## _ctx_p, \ CONST_new_ ## NAME ## _ctx_p, \
cp, len); \ cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, unsigned int)); \
} }
/* a PyMethodDef structure for the constructor */ /* a PyMethodDef structure for the constructor */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment