bytestring.c, catacomb/__init__.py: Compare for equality in constant time.

[catacomb-python] / catacomb-python.h

diff --git a/catacomb-python.h b/catacomb-python.h
index 5c012ef321206b8572cadae9847fb6a120430ce1..f1e6365cc66d8b613033d56077d5e5cba4212b99 100644 (file)
--- a/catacomb-python.h
+++ b/catacomb-python.h
@@ -33,6 +33,8 @@
 
 /*----- Header files ------------------------------------------------------*/
 
 
 /*----- Header files ------------------------------------------------------*/
 

+#define PY_SSIZE_T_CLEAN
+

 #include <Python.h>
 #include <longintrepr.h>
 #include <structmember.h>
 #include <Python.h>
 #include <longintrepr.h>
 #include <structmember.h>


@@ -44,6 +46,7 @@
 #include <mLib/unihash.h>
 
 #include <catacomb/buf.h>
 #include <mLib/unihash.h>
 
 #include <catacomb/buf.h>

+#include <catacomb/ct.h>

 
 #include <catacomb/grand.h>
 #include <catacomb/rand.h>
 
 #include <catacomb/grand.h>
 #include <catacomb/rand.h>


@@ -62,6 +65,7 @@
 #include <catacomb/gmac.h>
 #include <catacomb/md5.h>
 #include <catacomb/md5-hmac.h>
 #include <catacomb/gmac.h>
 #include <catacomb/md5.h>
 #include <catacomb/md5-hmac.h>

+#include <catacomb/poly1305.h>

 #include <catacomb/sha.h>
 #include <catacomb/sha-mgf.h>
 #include <catacomb/sha-hmac.h>
 #include <catacomb/sha.h>
 #include <catacomb/sha-mgf.h>
 #include <catacomb/sha-hmac.h>


@@ -155,10 +159,11 @@
 
 #define root_pytype 0
 #define type_pytype &PyType_Type
 
 #define root_pytype 0
 #define type_pytype &PyType_Type

-#define INITTYPE(ty, base) do {                                                \
+#define INITTYPE_META(ty, base, meta) do {                             \

   ty##_pytype_skel.tp_base = base##_pytype;                            \
   ty##_pytype_skel.tp_base = base##_pytype;                            \

-  ty##_pytype = inittype(&ty##_pytype_skel);                           \
+  ty##_pytype = inittype(&ty##_pytype_skel, meta##_pytype);            \

 } while (0)
 } while (0)

+#define INITTYPE(ty, base) INITTYPE_META(ty, base, type)

 
 #define INSERT(name, ob) do {                                          \
   PyObject *_o = (PyObject *)(ob);                                     \
 
 #define INSERT(name, ob) do {                                          \
   PyObject *_o = (PyObject *)(ob);                                     \


@@ -246,7 +251,7 @@ extern void *newtype(PyTypeObject *, const PyTypeObject *, const char *);
 
 extern PyObject *mkexc(PyObject *, PyObject *, const char *, PyMethodDef *);
 extern void typeready(PyTypeObject *);
 
 extern PyObject *mkexc(PyObject *, PyObject *, const char *, PyMethodDef *);
 extern void typeready(PyTypeObject *);

-extern PyTypeObject *inittype(PyTypeObject *);
+extern PyTypeObject *inittype(PyTypeObject *, PyTypeObject *);

 extern void addmethods(const PyMethodDef *);
 extern PyMethodDef *donemethods(void);
 
 extern void addmethods(const PyMethodDef *);
 extern PyMethodDef *donemethods(void);