catacomb/__init__.py: Settle on SHAKE256 for X448 box-key generation.

[catacomb-python] / share.c

diff --git a/share.c b/share.c
index 011de17978adda8729598f21856a318620debb05..2caa718bb23290ec613a0f378ada8052964ffabe 100644 (file)
--- a/share.c
+++ b/share.c
@@ -1,6 +1,4 @@
 /* -*-c-*-
- *
- * $Id$
  *
  * Secret sharing
  *
@@ -65,7 +63,7 @@ static PyGetSetDef gfshare_pygetset[]= {
 
 static PyTypeObject gfshare_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
-  "catacomb.GFShare",                  /* @tp_name@ */
+  "GFShare",                           /* @tp_name@ */
   sizeof(gfshare_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
 
@@ -115,7 +113,7 @@ static PyObject *gfsharesplit_pynew(PyTypeObject *ty,
                                    PyObject *arg, PyObject *kw)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   unsigned t;
   grand *r = &rand_global;
   gfshare_pyobj *s;
@@ -153,7 +151,7 @@ static PyMethodDef gfsharesplit_pymethods[] = {
 
 static PyTypeObject gfsharesplit_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
-  "catacomb.GFShareSplit",             /* @tp_name@ */
+  "GFShareSplit",                      /* @tp_name@ */
   sizeof(gfshare_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
 
@@ -230,7 +228,7 @@ static PyObject *gfsmeth_add(PyObject *me, PyObject *arg)
 {
   unsigned i;
   char *p;
-  int n;
+  Py_ssize_t n;
   if (!PyArg_ParseTuple(arg, "O&s#:add", convuint, &i, &p, &n)) goto end;
   if (i > 254) VALERR("index must be < 255");
   if (n != GFSHARE_S(me)->sz) VALERR("bad share size");
@@ -274,7 +272,7 @@ static PyGetSetDef gfsharejoin_pygetset[]= {
 
 static PyTypeObject gfsharejoin_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
-  "catacomb.GFShareJoin",              /* @tp_name@ */
+  "GFShareJoin",                       /* @tp_name@ */
   sizeof(gfshare_pyobj),               /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
 
@@ -355,7 +353,7 @@ static PyGetSetDef share_pygetset[]= {
 
 static PyTypeObject share_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
-  "catacomb.Share",                    /* @tp_name@ */
+  "Share",                             /* @tp_name@ */
   sizeof(share_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
 
@@ -410,7 +408,7 @@ static PyObject *sharesplit_pynew(PyTypeObject *ty,
   mp *m = 0;
   share_pyobj *s;
   char *kwlist[] = { "threshold", "secret", "modulus", "rng", 0 };
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&)&|O&O&:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&|O&O&:new", kwlist,
                                   convuint, &t, convmp, &sec,
                                   convmp, &m, convgrand, &r))
     goto end;
@@ -446,7 +444,7 @@ static PyMethodDef sharesplit_pymethods[] = {
 
 static PyTypeObject sharesplit_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
-  "catacomb.ShareSplit",               /* @tp_name@ */
+  "ShareSplit",                                /* @tp_name@ */
   sizeof(share_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */
 
@@ -569,7 +567,7 @@ static PyGetSetDef sharejoin_pygetset[]= {
 
 static PyTypeObject sharejoin_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,  /* Header */
-  "catacomb.ShareJoin",                        /* @tp_name@ */
+  "ShareJoin",                         /* @tp_name@ */
   sizeof(share_pyobj),                 /* @tp_basicsize@ */
   0,                                   /* @tp_itemsize@ */