X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/b6457c8a8723f6b45e6191e52a91ea2155e8ccf1..2a448f86048c26a24288d310b3bb70e8ae7e7528:/share.c

diff --git a/share.c b/share.c
index 77da423..8c58d23 100644
--- a/share.c
+++ b/share.c
@@ -53,7 +53,7 @@ static PyObject *gfsget_threshold(PyObject *me, void *hunoz)
 static PyObject *gfsget_size(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(GFSHARE_S(me)->sz)); }
 
-static PyGetSetDef gfshare_pygetset[]= {
+static const PyGetSetDef gfshare_pygetset[]= {
 #define GETSETNAME(op, name) gfs##op##_##name
   GET	(threshold,	"S.threshold -> THRESHOLD")
   GET	(size,		"S.size -> SECRETSZ")
@@ -61,7 +61,7 @@ static PyGetSetDef gfshare_pygetset[]= {
   { 0 }
 };
 
-static PyTypeObject gfshare_pytype_skel = {
+static const PyTypeObject gfshare_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
   "GFShare",				/* @tp_name@ */
   sizeof(gfshare_pyobj),		/* @tp_basicsize@ */
@@ -86,7 +86,7 @@ static PyTypeObject gfshare_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Binary-field secret sharing base class.",
+  "Binary-field secret sharing base class.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -96,7 +96,7 @@ static PyTypeObject gfshare_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gfshare_pygetset,			/* @tp_getset@ */
+  PYGETSET(gfshare),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -142,14 +142,14 @@ end:
   return (rc);
 }
 
-static PyMethodDef gfsharesplit_pymethods[] = {
+static const PyMethodDef gfsharesplit_pymethods[] = {
 #define METHNAME(name) gfsmeth_##name
   METH	(get,		"S.get(I) -> SHARE")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject gfsharesplit_pytype_skel = {
+static const PyTypeObject gfsharesplit_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
   "GFShareSplit",			/* @tp_name@ */
   sizeof(gfshare_pyobj),		/* @tp_basicsize@ */
@@ -174,8 +174,8 @@ static PyTypeObject gfsharesplit_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"GFShareSplit(THRESHOLD, SECRET, [rng = rand]): binary-field sharing:\n\
-   split secret into shares.",
+  "GFShareSplit(THRESHOLD, SECRET, [rng = rand]): binary-field sharing:\n"
+  "   split secret into shares.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -183,7 +183,7 @@ static PyTypeObject gfsharesplit_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gfsharesplit_pymethods,		/* @tp_methods@ */
+  PYMETHODS(gfsharesplit),		/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -241,10 +241,9 @@ end:
   return (0);
 }
 
-static PyObject *gfsmeth_combine(PyObject *me, PyObject *arg)
+static PyObject *gfsmeth_combine(PyObject *me)
 {
   PyObject *rc = 0;
-  if (!PyArg_ParseTuple(arg, ":combine")) goto end;
   if (GFSHARE_S(me)->i < GFSHARE_S(me)->t) VALERR("not enough shares yet");
   rc = bytestring_pywrap(0, GFSHARE_S(me)->sz);
   gfshare_combine(GFSHARE_S(me), PyString_AS_STRING(rc));
@@ -252,11 +251,11 @@ end:
   return (rc);
 }
 
-static PyMethodDef gfsharejoin_pymethods[] = {
+static const PyMethodDef gfsharejoin_pymethods[] = {
 #define METHNAME(name) gfsmeth_##name
   METH	(addedp,	"S.addedp(I) -> BOOL")
   METH	(add,		"S.add(I, SHARE) -> REMAIN")
-  METH	(combine,	"S.combine() -> SECRET")
+  NAMETH(combine,	"S.combine() -> SECRET")
 #undef METHNAME
   { 0 }
 };
@@ -264,14 +263,14 @@ static PyMethodDef gfsharejoin_pymethods[] = {
 static PyObject *gfsget_remain(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(GFSHARE_S(me)->t - GFSHARE_S(me)->i)); }
 
-static PyGetSetDef gfsharejoin_pygetset[]= {
+static const PyGetSetDef gfsharejoin_pygetset[]= {
 #define GETSETNAME(op, name) gfs##op##_##name
   GET	(remain,	"S.remain -> REMAIN")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyTypeObject gfsharejoin_pytype_skel = {
+static const PyTypeObject gfsharejoin_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
   "GFShareJoin",			/* @tp_name@ */
   sizeof(gfshare_pyobj),		/* @tp_basicsize@ */
@@ -296,8 +295,8 @@ static PyTypeObject gfsharejoin_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"GFShareJoin(THRESHOLD, SIZE): binary field sharing:\n\
-  join shares to recover secret.",
+  "GFShareJoin(THRESHOLD, SIZE): binary field sharing:\n"
+  "  join shares to recover secret.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -305,9 +304,9 @@ static PyTypeObject gfsharejoin_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gfsharejoin_pymethods,		/* @tp_methods@ */
+  PYMETHODS(gfsharejoin),		/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gfsharejoin_pygetset,			/* @tp_getset@ */
+  PYGETSET(gfsharejoin),		/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -345,7 +344,7 @@ static PyObject *sget_threshold(PyObject *me, void *hunoz)
 static PyObject *sget_modulus(PyObject *me, void *hunoz)
   { return (mp_pywrap(SHARE_S(me)->p)); }
 
-static PyGetSetDef share_pygetset[]= {
+static const PyGetSetDef share_pygetset[]= {
 #define GETSETNAME(op, name) s##op##_##name
   GET	(threshold,	"S.threshold -> THRESHOLD")
   GET	(modulus,	"S.modulus -> MODULUS")
@@ -353,7 +352,7 @@ static PyGetSetDef share_pygetset[]= {
   { 0 }
 };
 
-static PyTypeObject share_pytype_skel = {
+static const PyTypeObject share_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
   "Share",				/* @tp_name@ */
   sizeof(share_pyobj),			/* @tp_basicsize@ */
@@ -378,7 +377,7 @@ static PyTypeObject share_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Prime-field secret sharing base class.",
+  "Prime-field secret sharing base class.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -388,7 +387,7 @@ static PyTypeObject share_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  share_pygetset,			/* @tp_getset@ */
+  PYGETSET(share),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -439,14 +438,14 @@ end:
   return (rc);
 }
 
-static PyMethodDef sharesplit_pymethods[] = {
+static const PyMethodDef sharesplit_pymethods[] = {
 #define METHNAME(name) smeth_##name
   METH	(get,		"S.get(I) -> SHARE")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject sharesplit_pytype_skel = {
+static const PyTypeObject sharesplit_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
   "ShareSplit",				/* @tp_name@ */
   sizeof(share_pyobj),			/* @tp_basicsize@ */
@@ -471,8 +470,8 @@ static PyTypeObject sharesplit_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"ShareSplit(THRESHOLD, SECRET, [modulus = ?], [rng = rand]):\n\
-  prime field secret sharing: split secret into shares.",
+  "ShareSplit(THRESHOLD, SECRET, [modulus = ?], [rng = rand]):\n"
+  "  prime field secret sharing: split secret into shares.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -480,7 +479,7 @@ static PyTypeObject sharesplit_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  sharesplit_pymethods,			/* @tp_methods@ */
+  PYMETHODS(sharesplit),		/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -541,21 +540,20 @@ end:
   return (rc);
 }
 
-static PyObject *smeth_combine(PyObject *me, PyObject *arg)
+static PyObject *smeth_combine(PyObject *me)
 {
   PyObject *rc = 0;
-  if (!PyArg_ParseTuple(arg, ":combine")) goto end;
   if (SHARE_S(me)->i < SHARE_S(me)->t) VALERR("not enough shares yet");
   rc = mp_pywrap(share_combine(SHARE_S(me)));
 end:
   return (rc);
 }
 
-static PyMethodDef sharejoin_pymethods[] = {
+static const PyMethodDef sharejoin_pymethods[] = {
 #define METHNAME(name) smeth_##name
   METH	(addedp,	"S.addedp(I) -> BOOL")
   METH	(add,		"S.add(I, SHARE) -> REMAIN")
-  METH	(combine,	"S.combine() -> SECRET")
+  NAMETH(combine,	"S.combine() -> SECRET")
 #undef METHNAME
   { 0 }
 };
@@ -563,14 +561,14 @@ static PyMethodDef sharejoin_pymethods[] = {
 static PyObject *sget_remain(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(SHARE_S(me)->t - SHARE_S(me)->i)); }
 
-static PyGetSetDef sharejoin_pygetset[]= {
+static const PyGetSetDef sharejoin_pygetset[]= {
 #define GETSETNAME(op, name) s##op##_##name
   GET	(remain,	"S.remain -> REMAIN")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyTypeObject sharejoin_pytype_skel = {
+static const PyTypeObject sharejoin_pytype_skel = {
   PyObject_HEAD_INIT(&PyType_Type) 0,	/* Header */
   "ShareJoin",				/* @tp_name@ */
   sizeof(share_pyobj),			/* @tp_basicsize@ */
@@ -595,8 +593,8 @@ static PyTypeObject sharejoin_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"ShareJoin(THRESHOLD, MODULUS): prime field secret sharing:\n\
-  join shares to recover secret.",
+  "ShareJoin(THRESHOLD, MODULUS): prime field secret sharing:\n"
+  "  join shares to recover secret.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -604,9 +602,9 @@ static PyTypeObject sharejoin_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  sharejoin_pymethods,			/* @tp_methods@ */
+  PYMETHODS(sharejoin),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  sharejoin_pygetset,			/* @tp_getset@ */
+  PYGETSET(sharejoin),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */