commit 9bc844e7be40b6d947d0f8fa4b2b7d17cb17a091
author Thomas Wouters <thomas@python.org> Wed Mar 01 21:50:07 2006 +0000
committer Thomas Wouters <thomas@python.org> Wed Mar 01 21:50:07 2006 +0000
tree e41c5df71202cf87850490cb42ae909357998c76
parent f98db65e52015dc446d20e8cbe9c0fd522f81ee5

Make Py_ssize_t-clean.

Modules/_hashopenssl.c

diff --git a/Modules/_hashopenssl.c b/Modules/_hashopenssl.c
index 117cc4d..8f460e2 100644
--- a/Modules/_hashopenssl.c
+++ b/Modules/_hashopenssl.c
@@ -11,6 +11,8 @@
  *
  */
 
+#define PY_SSIZE_T_CLEAN
+
 #include "Python.h"
 #include "structmember.h"
 
@@ -166,12 +168,13 @@
 EVP_update(EVPobject *self, PyObject *args)
 {
     unsigned char *cp;
-    int len;
+    Py_ssize_t len;
 
     if (!PyArg_ParseTuple(args, "s#:update", &cp, &len))
         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);
     return Py_None;
@@ -238,7 +241,7 @@
     PyObject *name_obj = NULL;
     char *nameStr;
     unsigned char *cp = NULL;
-    unsigned int len;
+    Py_ssize_t len;
     const EVP_MD *digest;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|s#:HASH", kwlist,
@@ -262,7 +265,8 @@
     Py_INCREF(self->name);
 
     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;
 }
@@ -375,7 +379,7 @@
     char *name;
     const EVP_MD *digest;
     unsigned char *cp = NULL;
-    unsigned int len;
+    Py_ssize_t len;
 
     if (!PyArg_ParseTupleAndKeywords(args, kwdict, "O|s#:new", kwlist,
                                      &name_obj, &cp, &len)) {
@@ -389,7 +393,8 @@
 
     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_ ## NAME (PyObject *self, PyObject *args) \
     { \
         unsigned char *cp = NULL; \
-        unsigned int len; \
+        Py_ssize_t len; \
      \
         if (!PyArg_ParseTuple(args, "|s#:" #NAME , &cp, &len)) { \
             return NULL; \
@@ -414,7 +419,7 @@
                 CONST_ ## NAME ## _name_obj, \
                 NULL, \
                 CONST_new_ ## NAME ## _ctx_p, \
-                cp, len); \
+                cp, Py_SAFE_DOWNCAST(len, Py_ssize_t, unsigned int)); \
     }
 
 /* a PyMethodDef structure for the constructor */