X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/d96c882ed6f1852a266fd1a2b61bbc906cc805bb..810542b01716cfd7017315c25a165ebfbe45afe5:/algorithms.c

diff --git a/algorithms.c b/algorithms.c
index d190a08..f792087 100644
--- a/algorithms.c
+++ b/algorithms.c
@@ -213,16 +213,56 @@ static PyObject *ksget_max(PyObject *me, void *hunoz)
   return (PyInt_FromLong(x));
 }
 
-static PyMemberDef keysz_pymembers[] = {
+static const PyMemberDef keysz_pymembers[] = {
 #define MEMBERSTRUCT keysz_pyobj
-#define default dfl /* ugh! */
-  MEMBER(default, T_INT,  READONLY, "KSZ.default -> default key size")
-#undef default
+  MEMRNM(default, T_INT, dfl, READONLY, "KSZ.default -> default key size")
 #undef MEMBERSTRUCT
   { 0 }
 };
 
-static PyGetSetDef keyszany_pygetset[] = {
+#define KSZCONVOP(op)							\
+  static PyObject *kszmeth_##op(PyObject *me, PyObject *arg)		\
+  {									\
+    double x, y;							\
+    if (!PyArg_ParseTuple(arg, "d:" #op, &x)) return (0);		\
+    y = keysz_##op(x);							\
+    return (PyFloat_FromDouble(y));					\
+  }
+KSZCONVOP(fromdl)
+KSZCONVOP(fromschnorr)
+KSZCONVOP(fromif)
+KSZCONVOP(fromec)
+KSZCONVOP(todl)
+KSZCONVOP(toschnorr)
+KSZCONVOP(toif)
+KSZCONVOP(toec)
+#undef KSZCONVOP
+
+static const PyMethodDef keysz_pymethods[] = {
+#define METHNAME(name) kszmeth_##name
+  SMTH	(fromdl,	"fromdl(N) -> M: "
+		    "convert integer discrete log field size to work factor")
+  SMTH	(fromschnorr, "fromschnorr(N) -> M: "
+				"convert Schnorr group order to work factor")
+  SMTH	(fromif,	"fromif(N) -> M: "
+		 "convert integer factorization problem size to work factor")
+  SMTH	(fromec,	"fromec(N) -> M: "
+			 "convert elliptic curve group order to work factor")
+  SMTH	(todl,		"todl(N) -> M: "
+		    "convert work factor to integer discrete log field size")
+  SMTH	(toschnorr,	"toschnorr(N) -> M: "
+				"convert work factor to Schnorr group order")
+  SMTH	(toif,		"toif(N) -> M: "
+		 "convert work factor to integer factorization problem size")
+  SMTH	(toec,		"toec(N) -> M: "
+			 "convert work factor to elliptic curve group order")
+  SMTH	(toec,		"toec(N) -> M: "
+			 "convert work factor to elliptic curve group order")
+#undef METHNAME
+  { 0 }
+};
+
+static const PyGetSetDef keyszany_pygetset[] = {
 #define GETSETNAME(op, name) ka##op##_##name
   GET	(min,		"KSZ.min -> smallest allowed key size")
   GET	(max,		"KSZ.max -> largest allowed key size")
@@ -230,7 +270,7 @@ static PyGetSetDef keyszany_pygetset[] = {
   { 0 }
 };
 
-static PyMemberDef keyszrange_pymembers[] = {
+static const PyMemberDef keyszrange_pymembers[] = {
 #define MEMBERSTRUCT keyszrange_pyobj
   MEMBER(min,	T_INT,    READONLY, "KSZ.min -> smallest allowed key size")
   MEMBER(max,	T_INT,	  READONLY, "KSZ.max -> largest allowed key size")
@@ -240,7 +280,7 @@ static PyMemberDef keyszrange_pymembers[] = {
   { 0 }
 };
 
-static PyGetSetDef keyszset_pygetset[] = {
+static const PyGetSetDef keyszset_pygetset[] = {
 #define GETSETNAME(op, name) ks##op##_##name
   GET	(min,		"KSZ.min -> smallest allowed key size")
   GET	(max,		"KSZ.max -> largest allowed key size")
@@ -248,14 +288,14 @@ static PyGetSetDef keyszset_pygetset[] = {
   { 0 }
 };
 
-static PyMemberDef keyszset_pymembers[] = {
+static const PyMemberDef keyszset_pymembers[] = {
 #define MEMBERSTRUCT keyszset_pyobj
   MEMBER(set,	T_OBJECT, READONLY, "KSZ.set -> allowed key sizes")
 #undef MEMBERSTRUCT
   { 0 }
 };
 
-static PyTypeObject keysz_pytype_skel = {
+static const PyTypeObject keysz_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "KeySZ",				/* @tp_name@ */
   sizeof(keysz_pyobj),			/* @tp_basicsize@ */
@@ -288,8 +328,8 @@ static PyTypeObject keysz_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  0,					/* @tp_methods@ */
-  keysz_pymembers,			/* @tp_members@ */
+  PYMETHODS(keysz),			/* @tp_methods@ */
+  PYMEMBERS(keysz),			/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
@@ -303,7 +343,7 @@ static PyTypeObject keysz_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject keyszany_pytype_skel = {
+static const PyTypeObject keyszany_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "KeySZAny",				/* @tp_name@ */
   sizeof(keysz_pyobj),			/* @tp_basicsize@ */
@@ -339,7 +379,7 @@ static PyTypeObject keyszany_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  keyszany_pygetset,			/* @tp_getset@ */
+  PYGETSET(keyszany),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -352,7 +392,7 @@ static PyTypeObject keyszany_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject keyszrange_pytype_skel = {
+static const PyTypeObject keyszrange_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "KeySZRange",				/* @tp_name@ */
   sizeof(keyszrange_pyobj),		/* @tp_basicsize@ */
@@ -388,7 +428,7 @@ static PyTypeObject keyszrange_pytype_skel = {
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
-  keyszrange_pymembers,			/* @tp_members@ */
+  PYMEMBERS(keyszrange),		/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
@@ -402,7 +442,7 @@ static PyTypeObject keyszrange_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject keyszset_pytype_skel = {
+static const PyTypeObject keyszset_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "KeySZSet",				/* @tp_name@ */
   sizeof(keyszset_pyobj),		/* @tp_basicsize@ */
@@ -437,8 +477,8 @@ static PyTypeObject keyszset_pytype_skel = {
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
-  keyszset_pymembers,			/* @tp_members@ */
-  keyszset_pygetset,			/* @tp_getset@ */
+  PYMEMBERS(keyszset),			/* @tp_members@ */
+  PYGETSET(keyszset),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -451,24 +491,6 @@ static PyTypeObject keyszset_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-#define KSZCONVOP(op)							\
-  static PyObject *meth__KeySZ_##op(PyObject *me, PyObject *arg)	\
-  {									\
-    double x, y;							\
-    if (!PyArg_ParseTuple(arg, "Od:" #op, &me, &x)) return (0);		\
-    y = keysz_##op(x);							\
-    return (PyFloat_FromDouble(y));					\
-  }
-KSZCONVOP(fromdl)
-KSZCONVOP(fromschnorr)
-KSZCONVOP(fromif)
-KSZCONVOP(fromec)
-KSZCONVOP(todl)
-KSZCONVOP(toschnorr)
-KSZCONVOP(toif)
-KSZCONVOP(toec)
-#undef KSZCONVOP
-
 /*----- Symmetric encryption ----------------------------------------------*/
 
 static PyTypeObject *gccipher_pytype, *gcipher_pytype;
@@ -616,9 +638,8 @@ end:
   return (0);
 }
 
-static PyObject *gcmeth_bdry(PyObject *me, PyObject *arg)
+static PyObject *gcmeth_bdry(PyObject *me)
 {
-  if (!PyArg_ParseTuple(arg, ":bdry")) goto end;
   if (!GCIPHER_C(me)->ops->bdry) VALERR("`bdry' not supported");
   if (!GC_CLASS(GCIPHER_C(me))->blksz) VALERR("not a block cipher mode");
   GC_BDRY(GCIPHER_C(me));
@@ -627,7 +648,7 @@ end:
   return (0);
 }
 
-static PyGetSetDef gccipher_pygetset[] = {
+static const PyGetSetDef gccipher_pygetset[] = {
 #define GETSETNAME(op, name) gcc##op##_##name
   GET	(keysz,		"CC.keysz -> acceptable key sizes")
   GET	(blksz,		"CC.blksz -> block size, or zero")
@@ -636,19 +657,19 @@ static PyGetSetDef gccipher_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef gcipher_pymethods[] = {
+static const PyMethodDef gcipher_pymethods[] = {
 #define METHNAME(name) gcmeth_##name
   METH	(encrypt,	"C.encrypt(PT) -> CT")
   METH	(enczero,	"C.enczero(N) -> CT")
   METH	(decrypt,	"C.decrypt(CT) -> PT")
   METH	(deczero,	"C.deczero(N) -> PT")
   METH	(setiv,		"C.setiv(IV)")
-  METH	(bdry,		"C.bdry()")
+  NAMETH(bdry,		"C.bdry()")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject gccipher_pytype_skel = {
+static const PyTypeObject gccipher_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GCCipher",				/* @tp_name@ */
   sizeof(gccipher_pyobj),		/* @tp_basicsize@ */
@@ -683,7 +704,7 @@ static PyTypeObject gccipher_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gccipher_pygetset,			/* @tp_getset@ */
+  PYGETSET(gccipher),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -696,7 +717,7 @@ static PyTypeObject gccipher_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gcipher_pytype_skel = {
+static const PyTypeObject gcipher_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GCipher",				/* @tp_name@ */
   sizeof(gcipher_pyobj),		/* @tp_basicsize@ */
@@ -729,7 +750,7 @@ static PyTypeObject gcipher_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gcipher_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gcipher),			/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -938,7 +959,7 @@ static PyObject *gcaeget_ohd(PyObject *me, void *hunoz)
 static PyObject *gcaeget_flags(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(GCAEAD_AEC(me)->f)); }
 
-static PyGetSetDef gcaead_pygetset[] = {
+static const PyGetSetDef gcaead_pygetset[] = {
 #define GETSETNAME(op, name) gcae##op##_##name
   GET	(keysz,		"AEC.keysz -> acceptable key sizes")
   GET	(noncesz,	"AEC.noncesz -> acceptable nonce sizes")
@@ -952,12 +973,11 @@ static PyGetSetDef gcaead_pygetset[] = {
   { 0 }
 };
 
-static PyObject *gaekmeth_aad(PyObject *me, PyObject *arg)
+static PyObject *gaekmeth_aad(PyObject *me)
 {
   const gaead_key *k = GAEADKEY_K(me);
   PyObject *rc = 0;
 
-  if (!PyArg_ParseTuple(arg, ":aad")) return (0);
   if (k->ops->c->f&AEADF_AADNDEP)
     VALERR("aad must be associated with enc/dec op");
   rc = gaeadaad_pywrap((PyObject *)GCAEAD_AAD(me->ob_type),
@@ -1042,9 +1062,9 @@ end:
   return (rc);
 }
 
-static PyMethodDef gaeadkey_pymethods[] = {
+static const PyMethodDef gaeadkey_pymethods[] = {
 #define METHNAME(name) gaekmeth_##name
-  METH	(aad,		"KEY.aad() -> AAD")
+  NAMETH(aad,		"KEY.aad() -> AAD")
   KWMETH(enc,		"KEY.enc(NONCE, [hsz], [msz], [tsz]) -> ENC")
   KWMETH(dec,		"KEY.dec(NONCE, [hsz], [csz], [tsz]) -> DEC")
 #undef METHNAME
@@ -1100,7 +1120,7 @@ static PyObject *gaeaget_hsz(PyObject *me, void *hunoz)
 static PyObject *gaeaget_hlen(PyObject *me, void *hunoz)
   { return (gaea_check(me) ? 0 : getulong(GAEADAAD_HLEN(me))); }
 
-static PyGetSetDef gaeadaad_pygetset[] = {
+static const PyGetSetDef gaeadaad_pygetset[] = {
 #define GETSETNAME(op, name) gaea##op##_##name
   GET	(hsz,		"AAD.hsz -> precommitted header length or `None'")
   GET	(hlen,		"AAD.hlen -> header length so far")
@@ -1108,11 +1128,10 @@ static PyGetSetDef gaeadaad_pygetset[] = {
   { 0 }
 };
 
-static PyObject *gaeameth_copy(PyObject *me, PyObject *arg)
+static PyObject *gaeameth_copy(PyObject *me)
 {
   PyObject *rc = 0;
 
-  if (!PyArg_ParseTuple(arg, ":copy")) goto end;
   if (gaea_check(me)) goto end;
   if (GAEADAAD_F(me)&AEADF_AADNDEP)
     VALERR("can't duplicate nonce-dependent aad");
@@ -1181,9 +1200,9 @@ static PyObject *gaeameth_hashstrz(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
-static PyMethodDef gaeadaad_pymethods[] = {
+static const PyMethodDef gaeadaad_pymethods[] = {
 #define METHNAME(name) gaeameth_##name
-  METH	(copy,		"AAD.copy() -> AAD'")
+  NAMETH(copy,		"AAD.copy() -> AAD'")
   METH	(hash,		"AAD.hash(H)")
 #define METHU_(n, W, w) METH(hashu##w, "AAD.hashu" #w "(WORD)")
   DOUINTCONV(METHU_)
@@ -1237,7 +1256,7 @@ static PyObject *gaeeget_tsz(PyObject *me, void *hunoz)
 static PyObject *gaeeget_mlen(PyObject *me, void *hunoz)
   { return getulong(GAEADENC_MLEN(me)); }
 
-static PyGetSetDef gaeadenc_pygetset[] = {
+static const PyGetSetDef gaeadenc_pygetset[] = {
 #define GETSETNAME(op, name) gaee##op##_##name
   GET	(hsz,		"ENC.hsz -> precommitted header length or `None'")
   GET	(msz,		"ENC.msz -> precommitted message length or `None'")
@@ -1247,12 +1266,11 @@ static PyGetSetDef gaeadenc_pygetset[] = {
   { 0 }
 };
 
-static PyObject *gaeemeth_aad(PyObject *me, PyObject *arg)
+static PyObject *gaeemeth_aad(PyObject *me)
 {
   gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me;
   PyObject *rc = 0;
 
-  if (!PyArg_ParseTuple(arg, ":aad")) return (0);
   if (!(ge->f&AEADF_AADNDEP))
     rc = gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(ge->ob_type)->aad,
 			 GAEAD_AAD(ge->e), 0, 0);
@@ -1362,9 +1380,9 @@ end:
   return (rc);
 }
 
-static PyMethodDef gaeadenc_pymethods[] = {
+static const PyMethodDef gaeadenc_pymethods[] = {
 #define METHNAME(name) gaeemeth_##name
-  METH	(aad,		"ENC.aad() -> AAD")
+  NAMETH(aad,		"ENC.aad() -> AAD")
   KWMETH(reinit,	"ENC.reinit(NONCE, [hsz], [msz], [tsz])")
   METH	(encrypt,	"ENC.encrypt(MSG) -> CT")
   KWMETH(done,		"ENC.done([tsz], [aad]) -> CT, TAG")
@@ -1412,7 +1430,7 @@ static PyObject *gaedget_tsz(PyObject *me, void *hunoz)
 static PyObject *gaedget_clen(PyObject *me, void *hunoz)
   { return getulong(GAEADDEC_CLEN(me)); }
 
-static PyGetSetDef gaeaddec_pygetset[] = {
+static const PyGetSetDef gaeaddec_pygetset[] = {
 #define GETSETNAME(op, name) gaed##op##_##name
   GET	(hsz,		"DEC.hsz -> precommitted header length or `None'")
   GET	(csz,	       "DEC.csz -> precommitted ciphertext length or `None'")
@@ -1422,11 +1440,10 @@ static PyGetSetDef gaeaddec_pygetset[] = {
   { 0 }
 };
 
-static PyObject *gaedmeth_aad(PyObject *me, PyObject *arg)
+static PyObject *gaedmeth_aad(PyObject *me)
 {
   gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me;
 
-  if (!PyArg_ParseTuple(arg, ":aad")) return (0);
   if (!(gd->f&AEADF_AADNDEP))
     return (gaeadaad_pywrap((PyObject *)GCAEADDEC_KEY(gd->ob_type)->aad,
 			    GAEAD_AAD(gd->d), 0, 0));
@@ -1525,9 +1542,9 @@ end:
   return (rc);
 }
 
-static PyMethodDef gaeaddec_pymethods[] = {
+static const PyMethodDef gaeaddec_pymethods[] = {
 #define METHNAME(name) gaedmeth_##name
-  METH	(aad,		"DEC.aad() -> AAD")
+  NAMETH(aad,		"DEC.aad() -> AAD")
   KWMETH(reinit,	"DEC.reinit(NONCE, [hsz], [csz], [tsz])")
   METH	(decrypt,	"DEC.decrypt(CT) -> MSG")
   KWMETH(done,		"DEC.done(TAG, [aad]) -> MSG | None")
@@ -1535,7 +1552,7 @@ static PyMethodDef gaeaddec_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject gcaead_pytype_skel = {
+static const PyTypeObject gcaead_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GCAEAD",				/* @tp_name@ */
   sizeof(gcaead_pyobj),			/* @tp_basicsize@ */
@@ -1570,7 +1587,7 @@ static PyTypeObject gcaead_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gcaead_pygetset,			/* @tp_getset@ */
+  PYGETSET(gcaead),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1583,7 +1600,7 @@ static PyTypeObject gcaead_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gaeadkey_pytype_skel = {
+static const PyTypeObject gaeadkey_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GAEKey",				/* @tp_name@ */
   sizeof(gaeadkey_pyobj),		/* @tp_basicsize@ */
@@ -1616,7 +1633,7 @@ static PyTypeObject gaeadkey_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gaeadkey_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gaeadkey),			/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -1631,7 +1648,7 @@ static PyTypeObject gaeadkey_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gcaeadaad_pytype_skel = {
+static const PyTypeObject gcaeadaad_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GAEAADClass",			/* @tp_name@ */
   sizeof(gcaeadaad_pyobj),		/* @tp_basicsize@ */
@@ -1679,7 +1696,7 @@ static PyTypeObject gcaeadaad_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gaeadaad_pytype_skel = {
+static const PyTypeObject gaeadaad_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GAEAAD",				/* @tp_name@ */
   sizeof(gaeadaad_pyobj),		/* @tp_basicsize@ */
@@ -1712,9 +1729,9 @@ static PyTypeObject gaeadaad_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gaeadaad_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gaeadaad),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gaeadaad_pygetset,			/* @tp_getset@ */
+  PYGETSET(gaeadaad),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1727,7 +1744,7 @@ static PyTypeObject gaeadaad_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gcaeadenc_pytype_skel = {
+static const PyTypeObject gcaeadenc_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GAEEncClass",			/* @tp_name@ */
   sizeof(gcaeadenc_pyobj),		/* @tp_basicsize@ */
@@ -1775,7 +1792,7 @@ static PyTypeObject gcaeadenc_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gaeadenc_pytype_skel = {
+static const PyTypeObject gaeadenc_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GAEEnc",				/* @tp_name@ */
   sizeof(gaeadenc_pyobj),		/* @tp_basicsize@ */
@@ -1808,9 +1825,9 @@ static PyTypeObject gaeadenc_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gaeadenc_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gaeadenc),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gaeadenc_pygetset,			/* @tp_getset@ */
+  PYGETSET(gaeadenc),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1823,7 +1840,7 @@ static PyTypeObject gaeadenc_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gcaeaddec_pytype_skel = {
+static const PyTypeObject gcaeaddec_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GAEDecClass",			/* @tp_name@ */
   sizeof(gcaeaddec_pyobj),		/* @tp_basicsize@ */
@@ -1871,7 +1888,7 @@ static PyTypeObject gcaeaddec_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gaeaddec_pytype_skel = {
+static const PyTypeObject gaeaddec_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GAEDec",				/* @tp_name@ */
   sizeof(gaeaddec_pyobj),		/* @tp_basicsize@ */
@@ -1904,9 +1921,9 @@ static PyTypeObject gaeaddec_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gaeaddec_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gaeaddec),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gaeaddec_pygetset,			/* @tp_getset@ */
+  PYGETSET(gaeaddec),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1989,11 +2006,8 @@ static PyObject *gchget_hashsz(PyObject *me, void *hunoz)
 static PyObject *gchget_bufsz(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(GCHASH_CH(me)->bufsz)); }
 
-static PyObject *ghmeth_copy(PyObject *me, PyObject *arg)
-{
-  if (!PyArg_ParseTuple(arg, ":copy")) return (0);
-  return (ghash_pywrap((PyObject *)me->ob_type, GH_COPY(GHASH_H(me))));
-}
+static PyObject *ghmeth_copy(PyObject *me)
+  { return (ghash_pywrap((PyObject *)me->ob_type, GH_COPY(GHASH_H(me)))); }
 
 static PyObject *ghmeth_hash(PyObject *me, PyObject *arg)
 {
@@ -2036,11 +2050,10 @@ static PyObject *ghmeth_hashstrz(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
-static PyObject *ghmeth_done(PyObject *me, PyObject *arg)
+static PyObject *ghmeth_done(PyObject *me)
 {
   ghash *g;
   PyObject *rc;
-  if (!PyArg_ParseTuple(arg, ":done")) return (0);
   g = GH_COPY(GHASH_H(me));
   rc = bytestring_pywrap(0, g->ops->c->hashsz);
   GH_DONE(g, PyString_AS_STRING(rc));
@@ -2048,7 +2061,7 @@ static PyObject *ghmeth_done(PyObject *me, PyObject *arg)
   return (rc);
 }
 
-static PyGetSetDef gchash_pygetset[] = {
+static const PyGetSetDef gchash_pygetset[] = {
 #define GETSETNAME(op, name) gch##op##_##name
   GET	(bufsz,		"CH.bufsz -> hash buffer size, or zero")
   GET	(hashsz,	"CH.hashsz -> hash output size")
@@ -2057,9 +2070,9 @@ static PyGetSetDef gchash_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef ghash_pymethods[] = {
+static const PyMethodDef ghash_pymethods[] = {
 #define METHNAME(name) ghmeth_##name
-  METH	(copy,		"H.copy() -> HH")
+  NAMETH(copy,		"H.copy() -> HH")
   METH	(hash,		"H.hash(M)")
 #define METHU_(n, W, w) METH(hashu##w, "H.hashu" #w "(WORD)")
   DOUINTCONV(METHU_)
@@ -2068,12 +2081,12 @@ static PyMethodDef ghash_pymethods[] = {
   DOUINTCONV(METHBUF_)
 #undef METHBUF_
   METH	(hashstrz,	"H.hashstrz(STRING)")
-  METH	(done,		"H.done() -> HASH")
+  NAMETH(done,		"H.done() -> HASH")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject gchash_pytype_skel = {
+static const PyTypeObject gchash_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GCHash",				/* @tp_name@ */
   sizeof(gchash_pyobj),			/* @tp_basicsize@ */
@@ -2108,7 +2121,7 @@ static PyTypeObject gchash_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gchash_pygetset,			/* @tp_getset@ */
+  PYGETSET(gchash),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -2121,7 +2134,7 @@ static PyTypeObject gchash_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject ghash_pytype_skel = {
+static const PyTypeObject ghash_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GHash",				/* @tp_name@ */
   sizeof(ghash_pyobj),			/* @tp_basicsize@ */
@@ -2154,7 +2167,7 @@ static PyTypeObject ghash_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  ghash_pymethods,			/* @tp_methods@ */
+  PYMETHODS(ghash),			/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -2278,7 +2291,7 @@ static PyObject *gcmget_keysz(PyObject *me, void *hunoz)
 static PyObject *gcmget_tagsz(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(GCMAC_CM(me)->hashsz)); }
 
-static PyGetSetDef gcmac_pygetset[] = {
+static const PyGetSetDef gcmac_pygetset[] = {
 #define GETSETNAME(op, name) gcm##op##_##name
   GET	(keysz,		"CM.keysz -> acceptable key sizes")
   GET	(tagsz,		"CM.tagsz -> MAC output size")
@@ -2287,7 +2300,7 @@ static PyGetSetDef gcmac_pygetset[] = {
   { 0 }
 };
 
-static PyTypeObject gcmac_pytype_skel = {
+static const PyTypeObject gcmac_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GCMAC",				/* @tp_name@ */
   sizeof(gchash_pyobj),			/* @tp_basicsize@ */
@@ -2322,7 +2335,7 @@ static PyTypeObject gcmac_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gcmac_pygetset,			/* @tp_getset@ */
+  PYGETSET(gcmac),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -2335,7 +2348,7 @@ static PyTypeObject gcmac_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gmac_pytype_skel = {
+static const PyTypeObject gmac_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GMAC",				/* @tp_name@ */
   sizeof(gmac_pyobj),			/* @tp_basicsize@ */
@@ -2383,7 +2396,7 @@ static PyTypeObject gmac_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gmhash_pytype_skel = {
+static const PyTypeObject gmhash_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GMACHash",				/* @tp_name@ */
   sizeof(ghash_pyobj),			/* @tp_basicsize@ */
@@ -2518,10 +2531,9 @@ static PyObject *poly1305clsget_masksz(PyObject *me, void *hunoz)
 static PyObject *poly1305clsget_tagsz(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(POLY1305_TAGSZ)); }
 
-static PyObject *polymeth_copy(PyObject *me, PyObject *arg)
+static PyObject *polymeth_copy(PyObject *me)
 {
   poly1305hash_pyobj *ph;
-  if (!PyArg_ParseTuple(arg, ":copy")) return (0);
   ph = PyObject_NEW(poly1305hash_pyobj, me->ob_type);
   poly1305_copy(&ph->ctx, P1305_CTX(me));
   Py_INCREF(me->ob_type);
@@ -2572,19 +2584,11 @@ static PyObject *polymeth_hashstrz(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
-static PyObject *polymeth_flush(PyObject *me, PyObject *arg)
-{
-  if (!PyArg_ParseTuple(arg, ":flush")) return (0);
-  poly1305_flush(P1305_CTX(me));
-  RETURN_ME;
-}
+static PyObject *polymeth_flush(PyObject *me)
+  { poly1305_flush(P1305_CTX(me)); RETURN_ME; }
 
-static PyObject *polymeth_flushzero(PyObject *me, PyObject *arg)
-{
-  if (!PyArg_ParseTuple(arg, ":flushzero")) return (0);
-  poly1305_flushzero(P1305_CTX(me));
-  RETURN_ME;
-}
+static PyObject *polymeth_flushzero(PyObject *me)
+  { poly1305_flushzero(P1305_CTX(me)); RETURN_ME; }
 
 static PyObject *polymeth_concat(PyObject *me, PyObject *arg)
 {
@@ -2602,10 +2606,9 @@ end:
   return (0);
 }
 
-static PyObject *polymeth_done(PyObject *me, PyObject *arg)
+static PyObject *polymeth_done(PyObject *me)
 {
   PyObject *rc;
-  if (!PyArg_ParseTuple(arg, ":done")) return (0);
   if (!(P1305_F(me) & f_mask)) VALERR("no mask");
   rc = bytestring_pywrap(0, POLY1305_TAGSZ);
   poly1305_done(P1305_CTX(me), PyString_AS_STRING(rc));
@@ -2614,7 +2617,7 @@ end:
   return (0);
 }
 
-static PyGetSetDef poly1305cls_pygetset[] = {
+static const PyGetSetDef poly1305cls_pygetset[] = {
 #define GETSETNAME(op, name) poly1305cls##op##_##name
   GET	(keysz,		"PC.keysz -> acceptable key sizes")
   GET	(masksz,	"PC.masksz -> mask size")
@@ -2624,9 +2627,9 @@ static PyGetSetDef poly1305cls_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef poly1305hash_pymethods[] = {
+static const PyMethodDef poly1305hash_pymethods[] = {
 #define METHNAME(name) polymeth_##name
-  METH	(copy,		"P.copy() -> PP")
+  NAMETH(copy,		"P.copy() -> PP")
   METH	(hash,		"P.hash(M)")
 #define METHU_(n, W, w) METH(hashu##w, "P.hashu" #w "(WORD)")
   DOUINTCONV(METHU_)
@@ -2635,15 +2638,15 @@ static PyMethodDef poly1305hash_pymethods[] = {
   DOUINTCONV(METHBUF_)
 #undef METHBUF_
   METH	(hashstrz,	"P.hashstrz(STRING)")
-  METH	(flush,		"P.flush()")
-  METH	(flushzero,	"P.flushzero()")
+  NAMETH(flush,		"P.flush()")
+  NAMETH(flushzero,	"P.flushzero()")
   METH	(concat,	"P.concat(PREFIX, SUFFIX)")
-  METH	(done,		"P.done() -> TAG")
+  NAMETH(done,		"P.done() -> TAG")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject poly1305cls_pytype_skel = {
+static const PyTypeObject poly1305cls_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "Poly1305Class",			/* @tp_name@ */
   sizeof(PyHeapTypeObject),		/* @tp_basicsize@ */
@@ -2678,7 +2681,7 @@ static PyTypeObject poly1305cls_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  poly1305cls_pygetset,			/* @tp_getset@ */
+  PYGETSET(poly1305cls),		/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -2691,7 +2694,7 @@ static PyTypeObject poly1305cls_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject poly1305key_pytype_skel = {
+static const PyTypeObject poly1305key_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "poly1305",				/* @tp_name@ */
   sizeof(poly1305key_pyobj),		/* @tp_basicsize@ */
@@ -2739,7 +2742,7 @@ static PyTypeObject poly1305key_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject poly1305hash_pytype_skel = {
+static const PyTypeObject poly1305hash_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "Poly1305Hash",			/* @tp_name@ */
   sizeof(poly1305hash_pyobj),		/* @tp_basicsize@ */
@@ -2772,7 +2775,7 @@ static PyTypeObject poly1305hash_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  poly1305hash_pymethods,		/* @tp_methods@ */
+  PYMETHODS(poly1305hash),		/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -2842,13 +2845,11 @@ end:
   return ((PyObject *)rc);
 }
 
-static PyObject *kxvikmeth_copy(PyObject *me, PyObject *arg)
+static PyObject *kxvikmeth_copy(PyObject *me)
 {
   kxvik_pyobj *k = (kxvik_pyobj *)me, *rc = 0;
-  if (!PyArg_ParseTuple(arg, ":copy")) goto end;
   rc = (kxvik_pyobj *)k->ob_type->tp_alloc(k->ob_type, 0);
   rc->s = k->s; rc->n = k->n;
-end:
   return ((PyObject *)rc);
 }
 
@@ -2897,52 +2898,31 @@ end:
   return (rc);
 }
 
-static PyObject *kxvikmeth_step(PyObject *me, PyObject *arg)
+static PyObject *kxvikmeth_step(PyObject *me)
 {
   kxvik_pyobj *k = (kxvik_pyobj *)me;
-  if (!PyArg_ParseTuple(arg, ":step")) return (0);
   keccak1600_p(&k->s, &k->s, k->n);
   RETURN_ME;
 }
 
-static PyObject *kxvikget_nround(PyObject *me, void *hunoz)
-{
-  kxvik_pyobj *k = (kxvik_pyobj *)me;
-  return (PyInt_FromLong(k->n));
-}
-
-static int kxvikset_nround(PyObject *me, PyObject *val, void *hunoz)
-{
-  kxvik_pyobj *k = (kxvik_pyobj *)me;
-  unsigned n;
-  int rc = -1;
-
-  if (!val) NIERR("__del__");
-  if (!convuint(val, &n)) goto end;
-  k->n = n;
-  rc = 0;
-end:
-  return (rc);
-}
-
-static PyGetSetDef kxvik_pygetset[] = {
-#define GETSETNAME(op, name) kxvik##op##_##name
-  GETSET(nround,	"KECCAK.nround -> number of rounds")
-#undef GETSETNAME
+static const PyMemberDef kxvik_pymembers[] = {
+#define MEMBERSTRUCT kxvik_pyobj
+  MEMRNM(nround, T_UINT, n, 0,	    "KECCAC.nround -> number of rounds")
+#undef MEMBERSTRUCT
   { 0 }
 };
 
-static PyMethodDef kxvik_pymethods[] = {
+static const PyMethodDef kxvik_pymethods[] = {
 #define METHNAME(func) kxvikmeth_##func
-  METH	(copy,		"KECCAK.copy() -> KECCAK'")
+  NAMETH(copy,		"KECCAK.copy() -> KECCAK'")
   METH	(mix,		"KECCAK.mix(DATA)")
   METH	(extract,	"KECCAK.extract(NOCTETS)")
-  METH	(step,		"KECCAK.step()")
+  NAMETH(step,		"KECCAK.step()")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject kxvik_pytype_skel = {
+static const PyTypeObject kxvik_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "Keccak1600",				/* @tp_name@ */
   sizeof(kxvik_pyobj),			/* @tp_basicsize@ */
@@ -2975,9 +2955,9 @@ static PyTypeObject kxvik_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  kxvik_pymethods,			/* @tp_methods@ */
-  0,					/* @tp_members@ */
-  kxvik_pygetset,			/* @tp_getset@ */
+  PYMETHODS(kxvik),			/* @tp_methods@ */
+  PYMEMBERS(kxvik),			/* @tp_members@ */
+  0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -3086,9 +3066,8 @@ static PyObject *shakemeth_hashstrz(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
-static PyObject *shakemeth_xof(PyObject *me, PyObject *arg)
+static PyObject *shakemeth_xof(PyObject *me)
 {
-  if (!PyArg_ParseTuple(arg, ":xof")) goto end;
   if (shake_check(me, 0)) goto end;
   shake_xof(SHAKE_H(me));
   SHAKE_ST(me) = 1;
@@ -3110,15 +3089,13 @@ end:
   return (rc);
 }
 
-static PyObject *shakemeth_copy(PyObject *me, PyObject *arg)
+static PyObject *shakemeth_copy(PyObject *me)
 {
   shake_pyobj *rc = 0;
 
-  if (!PyArg_ParseTuple(arg, ":copy")) goto end;
   rc = PyObject_NEW(shake_pyobj, me->ob_type);
   rc->h = *SHAKE_H(me);
   rc->st = SHAKE_ST(me);
-end:
   return ((PyObject *)rc);
 }
 
@@ -3148,12 +3125,6 @@ end:
   return (rc);
 }
 
-static PyObject *shakeget_rate(PyObject *me, void *hunoz)
-  { return (PyInt_FromLong(SHAKE_H(me)->h.r)); }
-
-static PyObject *shakeget_buffered(PyObject *me, void *hunoz)
-  { return (PyInt_FromLong(SHAKE_H(me)->h.n)); }
-
 static PyObject *shakeget_state(PyObject *me, void *hunoz)
 {
   int st = SHAKE_ST(me);
@@ -3161,18 +3132,25 @@ static PyObject *shakeget_state(PyObject *me, void *hunoz)
 			      st == 1 ? "squeeze" : "dead"));
 }
 
-static PyGetSetDef shake_pygetset[] = {
+static const PyMemberDef shake_pymembers[] = {
+#define MEMBERSTRUCT shake_pyobj
+  MEMRNM(rate,	T_UINT, h.h.r, READONLY, "S.rate -> rate, in bytes")
+  MEMRNM(buffered, T_UINT, h.h.n, READONLY,
+				   "S.buffered -> amount currently buffered")
+#undef MEMBERSTRUCT
+  { 0 }
+};
+
+static const PyGetSetDef shake_pygetset[] = {
 #define GETSETNAME(op, name) shake##op##_##name
-  GET	(rate,		"S.rate -> rate, in bytes")
-  GET	(buffered,	"S.buffered -> amount currently buffered")
   GET	(state,		"S.state -> `absorb', `squeeze', `dead'")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyMethodDef shake_pymethods[] = {
+static const PyMethodDef shake_pymethods[] = {
 #define METHNAME(func) shakemeth_##func
-  METH	(copy,		"S.copy() -> SS")
+  NAMETH(copy,		"S.copy() -> SS")
   METH	(hash,		"S.hash(M)")
 #define METHU_(n, W, w) METH(hashu##w, "S.hashu" #w "(WORD)")
   DOUINTCONV(METHU_)
@@ -3181,7 +3159,7 @@ static PyMethodDef shake_pymethods[] = {
   DOUINTCONV(METHBUF_)
 #undef METHBUF_
   METH	(hashstrz,	"S.hashstrz(STRING)")
-  METH	(xof,		"S.xof()")
+  NAMETH(xof,		"S.xof()")
   METH	(done,		"S.done(LEN) -> H")
   METH	(get,		"S.get(LEN) -> H")
   METH	(mask,		"S.mask(M) -> C")
@@ -3189,7 +3167,7 @@ static PyMethodDef shake_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject shake_pytype_skel = {
+static const PyTypeObject shake_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "Shake",				/* @tp_name@ */
   sizeof(shake_pyobj),			/* @tp_basicsize@ */
@@ -3222,9 +3200,9 @@ static PyTypeObject shake_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  shake_pymethods,			/* @tp_methods@ */
-  0,					/* @tp_members@ */
-  shake_pygetset,			/* @tp_getset@ */
+  PYMETHODS(shake),			/* @tp_methods@ */
+  PYMEMBERS(shake),			/* @tp_members@ */
+  PYGETSET(shake),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -3237,7 +3215,7 @@ static PyTypeObject shake_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject shake128_pytype_skel = {
+static const PyTypeObject shake128_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "Shake128",				/* @tp_name@ */
   0,					/* @tp_basicsize@ */
@@ -3285,7 +3263,7 @@ static PyTypeObject shake128_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject shake256_pytype_skel = {
+static const PyTypeObject shake256_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "Shake256",				/* @tp_name@ */
   0,					/* @tp_basicsize@ */
@@ -3465,7 +3443,7 @@ end:
   return (rc);
 }
 
-static PyGetSetDef gcprp_pygetset[] = {
+static const PyGetSetDef gcprp_pygetset[] = {
 #define GETSETNAME(op, name) gcp##op##_##name
   GET	(keysz,		"CP.keysz -> acceptable key sizes")
   GET	(blksz,		"CP.blksz -> block size")
@@ -3474,7 +3452,7 @@ static PyGetSetDef gcprp_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef gprp_pymethods[] = {
+static const PyMethodDef gprp_pymethods[] = {
 #define METHNAME(name) gpmeth_##name
   METH	(encrypt,	"P.encrypt(PT) -> CT")
   METH	(decrypt,	"P.decrypt(CT) -> PT")
@@ -3482,7 +3460,7 @@ static PyMethodDef gprp_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject gcprp_pytype_skel = {
+static const PyTypeObject gcprp_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GCPRP",				/* @tp_name@ */
   sizeof(gcprp_pyobj),			/* @tp_basicsize@ */
@@ -3517,7 +3495,7 @@ static PyTypeObject gcprp_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gcprp_pygetset,			/* @tp_getset@ */
+  PYGETSET(gcprp),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -3530,7 +3508,7 @@ static PyTypeObject gcprp_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gprp_pytype_skel = {
+static const PyTypeObject gprp_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
   "GPRP",				/* @tp_name@ */
   sizeof(gprp_pyobj),			/* @tp_basicsize@ */
@@ -3563,7 +3541,7 @@ static PyTypeObject gprp_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gprp_pymethods,			/* @tp_methods@ */
+  PYMETHODS(gprp),			/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -3580,26 +3558,14 @@ static PyTypeObject gprp_pytype_skel = {
 
 /*----- Main code ---------------------------------------------------------*/
 
-static PyMethodDef methods[] = {
+static const struct nameval consts[] = {
+  CONST(AEADF_PCHSZ), CONST(AEADF_PCMSZ), CONST(AEADF_PCTSZ),
+  CONST(AEADF_AADNDEP), CONST(AEADF_AADFIRST), CONST(AEADF_NOAAD),
+  { 0 }
+};
+
+static const PyMethodDef methods[] = {
 #define METHNAME(func) meth_##func
-  METH	(_KeySZ_fromdl,	"fromdl(N) -> M: "
-		    "convert integer discrete log field size to work factor")
-  METH	(_KeySZ_fromschnorr, "fromschnorr(N) -> M: "
-				"convert Schnorr group order to work factor")
-  METH	(_KeySZ_fromif,	"fromif(N) -> M: "
-		 "convert integer factorization problem size to work factor")
-  METH	(_KeySZ_fromec,	"fromec(N) -> M: "
-			 "convert elliptic curve group order to work factor")
-  METH	(_KeySZ_todl,	"todl(N) -> M: "
-		    "convert work factor to integer discrete log field size")
-  METH	(_KeySZ_toschnorr, "toschnorr(N) -> M: "
-				"convert work factor to Schnorr group order")
-  METH	(_KeySZ_toif,	"toif(N) -> M: "
-		 "convert work factor to integer factorization problem size")
-  METH	(_KeySZ_toec,	"toec(N) -> M: "
-			 "convert work factor to elliptic curve group order")
-  METH	(_KeySZ_toec,	"toec(N) -> M: "
-			 "convert work factor to elliptic curve group order")
 #define METH_HDANCE(hdance, HDance) METH(hdance##_prf,			\
 	 "" #hdance "_prf(K, N) -> H: calculate " HDance " hash of N with K")
   METH_HDANCE(hsalsa20, "HSalsa20")
@@ -3691,6 +3657,7 @@ void algorithms_pyinsert(PyObject *mod)
   INSERT("GCPRP", gcprp_pytype);
   INSERT("GPRP", gprp_pytype);
   INSERT("gcprps", gcprps());
+  setconstants(mod, consts);
 }
 
 /*----- That's all, folks -------------------------------------------------*/