Reorganization: split out utilities; mapping methods

[catacomb-python] / pubkey.c

diff --git a/pubkey.c b/pubkey.c
index ef44845..9e50806 100644 (file)
--- a/pubkey.c
+++ b/pubkey.c
@@ -211,7 +211,7 @@ static PyMemberDef dsapriv_pymembers[] = {
 };
 
 static PyTypeObject dsapub_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.DSAPub",                   /* @tp_name@ */
   sizeof(dsa_pyobj),                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -242,7 +242,7 @@ static PyTypeObject dsapub_pytype_skel = {
   0,                                   /* @tp_richcompare@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
-  0,                                   /* @tp_iternexr@ */
+  0,                                   /* @tp_iternext@ */
   dsapub_pymethods,                    /* @tp_methods@ */
   dsapub_pymembers,                    /* @tp_members@ */
   0,                                   /* @tp_getset@ */
@@ -259,7 +259,7 @@ static PyTypeObject dsapub_pytype_skel = {
 };
 
 static PyTypeObject dsapriv_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.DSAPriv",                  /* @tp_name@ */
   sizeof(dsa_pyobj),                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -290,7 +290,7 @@ static PyTypeObject dsapriv_pytype_skel = {
   0,                                   /* @tp_richcompare@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
-  0,                                   /* @tp_iternexr@ */
+  0,                                   /* @tp_iternext@ */
   dsapriv_pymethods,                   /* @tp_methods@ */
   dsapriv_pymembers,                   /* @tp_members@ */
   0,                                   /* @tp_getset@ */
@@ -378,7 +378,7 @@ static PyObject *kcdsameth_sign(PyObject *me, PyObject *arg, PyObject *kw)
   if (n != DSA_D(me)->h->hashsz)
     VALERR("bad message length (doesn't match hash size)");
   r = bytestring_pywrap(0, DSA_D(me)->h->hashsz);
-  s.r = PyString_AS_STRING(r);
+  s.r = (octet *)PyString_AS_STRING(r);
   gkcdsa_sign(DSA_D(me), &s, p, k);
   rc = Py_BuildValue("(NN)", r, mp_pywrap(s.s));
 end:
@@ -424,7 +424,7 @@ static PyMethodDef kcdsapriv_pymethods[] = {
 };
 
 static PyTypeObject kcdsapub_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.KCDSAPub",                 /* @tp_name@ */
   sizeof(dsa_pyobj),                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -455,7 +455,7 @@ static PyTypeObject kcdsapub_pytype_skel = {
   0,                                   /* @tp_richcompare@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
-  0,                                   /* @tp_iternexr@ */
+  0,                                   /* @tp_iternext@ */
   kcdsapub_pymethods,                  /* @tp_methods@ */
   dsapub_pymembers,                    /* @tp_members@ */
   0,                                   /* @tp_getset@ */
@@ -472,7 +472,7 @@ static PyTypeObject kcdsapub_pytype_skel = {
 };
 
 static PyTypeObject kcdsapriv_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.KCDSAPriv",                        /* @tp_name@ */
   sizeof(dsa_pyobj),                   /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -503,7 +503,7 @@ static PyTypeObject kcdsapriv_pytype_skel = {
   0,                                   /* @tp_richcompare@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
-  0,                                   /* @tp_iternexr@ */
+  0,                                   /* @tp_iternext@ */
   kcdsapriv_pymethods,                 /* @tp_methods@ */
   dsapriv_pymembers,                   /* @tp_members@ */
   0,                                   /* @tp_getset@ */
@@ -758,7 +758,7 @@ static PyMethodDef rsapriv_pymethods[] = {
 };
 
 static PyTypeObject rsapub_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.RSAPub",                   /* @tp_name@ */
   sizeof(rsapub_pyobj),                        /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -789,7 +789,7 @@ static PyTypeObject rsapub_pytype_skel = {
   0,                                   /* @tp_richcompare@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
-  0,                                   /* @tp_iternexr@ */
+  0,                                   /* @tp_iternext@ */
   rsapub_pymethods,                    /* @tp_methods@ */
   0,                                   /* @tp_members@ */
   rsapub_pygetset,                     /* @tp_getset@ */
@@ -806,7 +806,7 @@ static PyTypeObject rsapub_pytype_skel = {
 };
 
 static PyTypeObject rsapriv_pytype_skel = {
-  PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
+  PyObject_HEAD_INIT(0) 0,             /* Header */
   "catacomb.RSAPriv",                  /* @tp_name@ */
   sizeof(rsapriv_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
@@ -837,7 +837,7 @@ static PyTypeObject rsapriv_pytype_skel = {
   0,                                   /* @tp_richcompare@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
-  0,                                   /* @tp_iternexr@ */
+  0,                                   /* @tp_iternext@ */
   rsapriv_pymethods,                   /* @tp_methods@ */
   0,                                   /* @tp_members@ */
   rsapriv_pygetset,                    /* @tp_getset@ */