X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/637b91402d2497db1318debd3cb3868a5abb8f01..620169aef06f74c9a8574e28b5482061e81a7389:/algorithms.c

diff --git a/algorithms.c b/algorithms.c
index af98018..9dbebe6 100644
--- a/algorithms.c
+++ b/algorithms.c
@@ -215,13 +215,53 @@ static PyObject *ksget_max(PyObject *me, void *hunoz)
 
 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 }
 };
 
+#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")
@@ -255,8 +295,8 @@ static const PyMemberDef keyszset_pymembers[] = {
   { 0 }
 };
 
-static PyTypeObject keysz_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject keysz_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "KeySZ",				/* @tp_name@ */
   sizeof(keysz_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -288,7 +328,7 @@ static PyTypeObject keysz_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  0,					/* @tp_methods@ */
+  PYMETHODS(keysz),			/* @tp_methods@ */
   PYMEMBERS(keysz),			/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -303,8 +343,8 @@ static PyTypeObject keysz_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject keyszany_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject keyszany_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "KeySZAny",				/* @tp_name@ */
   sizeof(keysz_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -352,8 +392,8 @@ static PyTypeObject keyszany_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject keyszrange_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject keyszrange_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "KeySZRange",				/* @tp_name@ */
   sizeof(keyszrange_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -402,8 +442,8 @@ static PyTypeObject keyszrange_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject keyszset_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject keyszset_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "KeySZSet",				/* @tp_name@ */
   sizeof(keyszset_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -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;
@@ -536,7 +558,7 @@ PyObject *gccipher_pywrap(gccipher *cc)
 static void gcipher_pydealloc(PyObject *me)
 {
   GC_DESTROY(GCIPHER_C(me));
-  Py_DECREF(me->ob_type);
+  Py_DECREF(Py_TYPE(me));
   FREEOBJ(me);
 }
 
@@ -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));
@@ -643,13 +664,13 @@ static const PyMethodDef gcipher_pymethods[] = {
   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 = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gccipher_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GCCipher",				/* @tp_name@ */
   sizeof(gccipher_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -696,8 +717,8 @@ static PyTypeObject gccipher_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gcipher_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gcipher_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GCipher",				/* @tp_name@ */
   sizeof(gcipher_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -912,7 +933,7 @@ static PyObject *gcaead_pywrap(gcaead *aec)
 }
 
 static void gaeadkey_pydealloc(PyObject *me)
-  { GAEAD_DESTROY(GAEADKEY_K(me)); Py_DECREF(me->ob_type); FREEOBJ(me); }
+  { GAEAD_DESTROY(GAEADKEY_K(me)); Py_DECREF(Py_TYPE(me)); FREEOBJ(me); }
 
 static PyObject *gcaeget_name(PyObject *me, void *hunoz)
   { return (PyString_FromString(GCAEAD_AEC(me)->name)); }
@@ -952,15 +973,14 @@ static const 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),
+  rc = gaeadaad_pywrap((PyObject *)GCAEAD_AAD(Py_TYPE(me)),
 		       GAEAD_AAD(k), 0, 0);
 end:
   return (rc);
@@ -1011,7 +1031,7 @@ static PyObject *gaekmeth_enc(PyObject *me, PyObject *arg, PyObject *kw)
     goto end;
   e = GAEAD_ENC(GAEADKEY_K(me), n, nsz, hsz, msz, tsz);
   if (!e) VALERR("bad aead parameter combination");
-  rc = gaeadenc_pywrap((PyObject *)GCAEAD_ENC(me->ob_type),
+  rc = gaeadenc_pywrap((PyObject *)GCAEAD_ENC(Py_TYPE(me)),
 		       e, f, hsz, msz, tsz);
 end:
   return (rc);
@@ -1036,7 +1056,7 @@ static PyObject *gaekmeth_dec(PyObject *me, PyObject *arg, PyObject *kw)
     goto end;
   d = GAEAD_DEC(GAEADKEY_K(me), n, nsz, hsz, csz, tsz);
   if (!d) VALERR("bad aead parameter combination");
-  rc = gaeaddec_pywrap((PyObject *)GCAEAD_DEC(me->ob_type),
+  rc = gaeaddec_pywrap((PyObject *)GCAEAD_DEC(Py_TYPE(me)),
 		       d, f, hsz, csz, tsz);
 end:
   return (rc);
@@ -1044,7 +1064,7 @@ end:
 
 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
@@ -1067,7 +1087,7 @@ static void gaeadaad_pydealloc(PyObject *me)
   gaeadaad_pyobj *ga = (gaeadaad_pyobj *)me;
 
   if (ga->a) GAEAD_DESTROY(ga->a);
-  Py_DECREF(me->ob_type); FREEOBJ(me);
+  Py_DECREF(Py_TYPE(me)); FREEOBJ(me);
 }
 
 static int gaea_check(PyObject *me)
@@ -1108,15 +1128,14 @@ static const 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");
-  rc = gaeadaad_pywrap((PyObject *)me->ob_type,
+  rc = gaeadaad_pywrap((PyObject *)Py_TYPE(me),
 		       GAEAD_DUP(GAEADAAD_A(me)), 0, 0);
   GAEADAAD_HLEN(rc) = GAEADAAD_HLEN(me);
 end:
@@ -1183,7 +1202,7 @@ static PyObject *gaeameth_hashstrz(PyObject *me, PyObject *arg)
 
 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_)
@@ -1213,7 +1232,7 @@ static void gaeadenc_pydealloc(PyObject *me)
   gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me;
 
   gaea_sever(&ge->aad); GAEAD_DESTROY(ge->e);
-  Py_DECREF(me->ob_type); FREEOBJ(me);
+  Py_DECREF(Py_TYPE(me)); FREEOBJ(me);
 }
 
 static PyObject *gaeeget_hsz(PyObject *me, void *hunoz)
@@ -1247,21 +1266,20 @@ static const 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,
+    rc = gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(Py_TYPE(ge))->aad,
 			 GAEAD_AAD(ge->e), 0, 0);
   else {
     if ((ge->f&AEADF_AADFIRST) && ge->mlen)
       VALERR("too late for aad");
     if (!ge->aad)
       ge->aad = (gaeadaad_pyobj *)
-	gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(ge->ob_type)->aad,
+	gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(Py_TYPE(ge))->aad,
 			GAEAD_AAD(ge->e), ge->f&(AEADF_PCHSZ | AEADF_NOAAD),
 			ge->hsz);
     Py_INCREF(ge->aad);
@@ -1334,7 +1352,7 @@ static PyObject *gaeemeth_done(PyObject *me, PyObject *arg, PyObject *kw)
   if (tszobj != Py_None && !convszt(tszobj, &tsz)) goto end;
   if (aad != Py_None &&
       !PyObject_TypeCheck(aad,
-			  (PyTypeObject *)GCAEADENC_KEY(me->ob_type)->aad))
+			  (PyTypeObject *)GCAEADENC_KEY(Py_TYPE(me))->aad))
     TYERR("wanted aad");
   if ((ge->f&AEADF_AADNDEP) && aad != Py_None && aad != (PyObject *)ge->aad)
     VALERR("mismatched aad");
@@ -1364,7 +1382,7 @@ end:
 
 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")
@@ -1388,7 +1406,7 @@ static void gaeaddec_pydealloc(PyObject *me)
   gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me;
 
   gaea_sever(&gd->aad); GAEAD_DESTROY(GAEADDEC_D(me));
-  Py_DECREF(me->ob_type); FREEOBJ(me);
+  Py_DECREF(Py_TYPE(me)); FREEOBJ(me);
 }
 
 static PyObject *gaedget_hsz(PyObject *me, void *hunoz)
@@ -1422,18 +1440,17 @@ static const 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,
+    return (gaeadaad_pywrap((PyObject *)GCAEADDEC_KEY(Py_TYPE(gd))->aad,
 			    GAEAD_AAD(gd->d), 0, 0));
   else {
     if (!gd->aad)
       gd->aad = (gaeadaad_pyobj *)
-	gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(gd->ob_type)->aad,
+	gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(Py_TYPE(gd))->aad,
 			GAEAD_AAD(gd->d), gd->f&(AEADF_PCHSZ | AEADF_NOAAD),
 			gd->hsz);
     Py_INCREF(gd->aad);
@@ -1503,7 +1520,7 @@ static PyObject *gaedmeth_done(PyObject *me, PyObject *arg, PyObject *kw)
     goto end;
   if (aad != Py_None &&
       !PyObject_TypeCheck(aad,
-			  (PyTypeObject *)GCAEADENC_KEY(me->ob_type)->aad))
+			  (PyTypeObject *)GCAEADENC_KEY(Py_TYPE(me))->aad))
     TYERR("wanted aad");
   if ((gd->f&AEADF_AADNDEP) && aad != Py_None && aad != (PyObject *)gd->aad)
     VALERR("mismatched aad");
@@ -1527,7 +1544,7 @@ end:
 
 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,8 +1552,8 @@ static const PyMethodDef gaeaddec_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject gcaead_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gcaead_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GCAEAD",				/* @tp_name@ */
   sizeof(gcaead_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1583,8 +1600,8 @@ static PyTypeObject gcaead_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gaeadkey_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gaeadkey_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GAEKey",				/* @tp_name@ */
   sizeof(gaeadkey_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1631,8 +1648,8 @@ static PyTypeObject gaeadkey_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gcaeadaad_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gcaeadaad_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GAEAADClass",			/* @tp_name@ */
   sizeof(gcaeadaad_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1679,8 +1696,8 @@ static PyTypeObject gcaeadaad_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gaeadaad_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gaeadaad_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GAEAAD",				/* @tp_name@ */
   sizeof(gaeadaad_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1727,8 +1744,8 @@ static PyTypeObject gaeadaad_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gcaeadenc_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gcaeadenc_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GAEEncClass",			/* @tp_name@ */
   sizeof(gcaeadenc_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1775,8 +1792,8 @@ static PyTypeObject gcaeadenc_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gaeadenc_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gaeadenc_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GAEEnc",				/* @tp_name@ */
   sizeof(gaeadenc_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1823,8 +1840,8 @@ static PyTypeObject gaeadenc_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gcaeaddec_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gcaeaddec_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GAEDecClass",			/* @tp_name@ */
   sizeof(gcaeaddec_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1871,8 +1888,8 @@ static PyTypeObject gcaeaddec_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gaeaddec_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gaeaddec_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GAEDec",				/* @tp_name@ */
   sizeof(gaeaddec_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1976,7 +1993,7 @@ PyObject *ghash_pywrap(PyObject *cobj, ghash *h)
 static void ghash_pydealloc(PyObject *me)
 {
   GH_DESTROY(GHASH_H(me));
-  Py_DECREF(me->ob_type);
+  Py_DECREF(Py_TYPE(me));
   FREEOBJ(me);
 }
 
@@ -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 *)Py_TYPE(me), 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));
@@ -2059,7 +2072,7 @@ static const PyGetSetDef gchash_pygetset[] = {
 
 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,13 +2081,13 @@ static const 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 = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gchash_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GCHash",				/* @tp_name@ */
   sizeof(gchash_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2121,8 +2134,8 @@ static PyTypeObject gchash_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject ghash_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject ghash_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GHash",				/* @tp_name@ */
   sizeof(ghash_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2265,7 +2278,7 @@ static PyObject *gmac_pywrap(PyObject *cobj, gmac *m)
 static void gmac_pydealloc(PyObject *me)
 {
   GM_DESTROY(GMAC_M(me));
-  Py_DECREF(me->ob_type);
+  Py_DECREF(Py_TYPE(me));
   PyType_Type.tp_dealloc(me);
 }
 
@@ -2287,8 +2300,8 @@ static const PyGetSetDef gcmac_pygetset[] = {
   { 0 }
 };
 
-static PyTypeObject gcmac_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gcmac_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GCMAC",				/* @tp_name@ */
   sizeof(gchash_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2335,8 +2348,8 @@ static PyTypeObject gcmac_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gmac_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gmac_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GMAC",				/* @tp_name@ */
   sizeof(gmac_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2383,8 +2396,8 @@ static PyTypeObject gmac_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gmhash_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gmhash_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GMACHash",				/* @tp_name@ */
   sizeof(ghash_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2518,13 +2531,12 @@ 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);
+  ph = PyObject_NEW(poly1305hash_pyobj, Py_TYPE(me));
   poly1305_copy(&ph->ctx, P1305_CTX(me));
-  Py_INCREF(me->ob_type);
+  Py_INCREF(Py_TYPE(me));
   return ((PyObject *)ph);
 }
 
@@ -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)
 {
@@ -2593,7 +2597,7 @@ static PyObject *polymeth_concat(PyObject *me, PyObject *arg)
   if (!PyObject_TypeCheck(pre, poly1305hash_pytype) ||
       !PyObject_TypeCheck(suff, poly1305hash_pytype))
     TYERR("wanted a poly1305hash");
-  if (me->ob_type != pre->ob_type || me->ob_type != suff->ob_type)
+  if (Py_TYPE(me) != Py_TYPE(pre) || Py_TYPE(me) != Py_TYPE(suff))
     TYERR("key mismatch");
   if (P1305_CTX(pre)->nbuf) VALERR("prefix is not block-aligned");
   poly1305_concat(P1305_CTX(me), P1305_CTX(pre), P1305_CTX(suff));
@@ -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));
@@ -2626,7 +2629,7 @@ static const PyGetSetDef poly1305cls_pygetset[] = {
 
 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,16 +2638,16 @@ static const 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 = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject poly1305cls_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "Poly1305Class",			/* @tp_name@ */
   sizeof(PyHeapTypeObject),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2691,8 +2694,8 @@ static PyTypeObject poly1305cls_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject poly1305key_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject poly1305key_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "poly1305",				/* @tp_name@ */
   sizeof(poly1305key_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2739,8 +2742,8 @@ static PyTypeObject poly1305key_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject poly1305hash_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject poly1305hash_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "Poly1305Hash",			/* @tp_name@ */
   sizeof(poly1305hash_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -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 = (kxvik_pyobj *)Py_TYPE(k)->tp_alloc(Py_TYPE(k), 0);
   rc->s = k->s; rc->n = k->n;
-end:
   return ((PyObject *)rc);
 }
 
@@ -2897,53 +2898,32 @@ 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 const 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 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 = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject kxvik_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "Keccak1600",				/* @tp_name@ */
   sizeof(kxvik_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -2976,8 +2956,8 @@ static PyTypeObject kxvik_pytype_skel = {
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
   PYMETHODS(kxvik),			/* @tp_methods@ */
-  0,					/* @tp_members@ */
-  PYGETSET(kxvik),			/* @tp_getset@ */
+  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 = PyObject_NEW(shake_pyobj, Py_TYPE(me));
   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,10 +3132,17 @@ static PyObject *shakeget_state(PyObject *me, void *hunoz)
 			      st == 1 ? "squeeze" : "dead"));
 }
 
+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 }
@@ -3172,7 +3150,7 @@ static const PyGetSetDef shake_pygetset[] = {
 
 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 const 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,8 +3167,8 @@ static const PyMethodDef shake_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject shake_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject shake_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "Shake",				/* @tp_name@ */
   sizeof(shake_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -3223,7 +3201,7 @@ static PyTypeObject shake_pytype_skel = {
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
   PYMETHODS(shake),			/* @tp_methods@ */
-  0,					/* @tp_members@ */
+  PYMEMBERS(shake),			/* @tp_members@ */
   PYGETSET(shake),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
@@ -3237,8 +3215,8 @@ static PyTypeObject shake_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject shake128_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject shake128_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "Shake128",				/* @tp_name@ */
   0,					/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -3285,8 +3263,8 @@ static PyTypeObject shake128_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject shake256_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject shake256_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "Shake256",				/* @tp_name@ */
   0,					/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -3411,7 +3389,7 @@ end:
 }
 
 static void gprp_pydealloc(PyObject *me)
-  { Py_DECREF(me->ob_type); FREEOBJ(me); }
+  { Py_DECREF(Py_TYPE(me)); FREEOBJ(me); }
 
 static PyObject *gcprp_pywrap(const prpinfo *prp)
 {
@@ -3482,8 +3460,8 @@ static const PyMethodDef gprp_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject gcprp_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gcprp_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GCPRP",				/* @tp_name@ */
   sizeof(gcprp_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -3530,8 +3508,8 @@ static PyTypeObject gcprp_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gprp_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gprp_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GPRP",				/* @tp_name@ */
   sizeof(gprp_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -3580,26 +3558,14 @@ static PyTypeObject gprp_pytype_skel = {
 
 /*----- Main code ---------------------------------------------------------*/
 
+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")
@@ -3646,12 +3612,14 @@ void algorithms_pyinit(void)
   addmethods(methods);
 }
 
-GEN(gcciphers, cipher)
-GEN(gcaeads, aead)
-GEN(gchashes, hash)
-GEN(gcmacs, mac)
 #define gcprp prpinfo
-GEN(gcprps, prp)
+#define CLASS_TABLES(_) _(cipher) _(aead) _(hash) _(mac) _(prp)
+#define TABLE_FNS(pre)							\
+  static const char *pre##_namefn(const void *p)			\
+    { const gc##pre *const *cls = p; return (*cls ? (*cls)->name : 0); } \
+  static PyObject *pre##_valfn(const void *p)				\
+    { gc##pre *const*cls = p; return (gc##pre##_pywrap(*cls)); }
+CLASS_TABLES(TABLE_FNS)
 
 void algorithms_pyinsert(PyObject *mod)
 {
@@ -3662,7 +3630,8 @@ void algorithms_pyinsert(PyObject *mod)
   INSERT("KeySZSet", keyszset_pytype);
   INSERT("GCCipher", gccipher_pytype);
   INSERT("GCipher", gcipher_pytype);
-  INSERT("gcciphers", gcciphers());
+  INSERT("gcciphers", make_algtab(gciphertab, sizeof(gccipher *),
+				  cipher_namefn, cipher_valfn));
   INSERT("GCAEAD", gcaead_pytype);
   INSERT("GAEKey", gaeadkey_pytype);
   INSERT("GAEAADClass", gcaeadaad_pytype);
@@ -3671,16 +3640,19 @@ void algorithms_pyinsert(PyObject *mod)
   INSERT("GAEEnc", gaeadenc_pytype);
   INSERT("GAEDecClass", gcaeaddec_pytype);
   INSERT("GAEDec", gaeaddec_pytype);
-  INSERT("gcaeads", gcaeads());
+  INSERT("gcaeads", make_algtab(gaeadtab, sizeof(gcaead *),
+				aead_namefn, aead_valfn));
   INSERT("GCHash", gchash_pytype);
   INSERT("GHash", ghash_pytype);
-  INSERT("gchashes", d = gchashes());
-  sha_pyobj = PyDict_GetItemString(d, "sha"); Py_INCREF(sha_pyobj);
-  has160_pyobj = PyDict_GetItemString(d, "has160"); Py_INCREF(has160_pyobj);
+  d = make_algtab(ghashtab, sizeof(gchash *), hash_namefn, hash_valfn);
+  INSERT("gchashes", d);
+  sha_pyobj = PyMapping_GetItemString(d, "sha"); Py_INCREF(sha_pyobj);
+  has160_pyobj = PyMapping_GetItemString(d, "has160"); Py_INCREF(has160_pyobj);
   INSERT("GCMAC", gcmac_pytype);
   INSERT("GMAC", gmac_pytype);
   INSERT("GMACHash", gmhash_pytype);
-  INSERT("gcmacs", gcmacs());
+  INSERT("gcmacs", make_algtab(gmactab, sizeof(gcmac *),
+			       mac_namefn, mac_valfn));
   INSERT("Poly1305Class", poly1305cls_pytype);
   INSERT("poly1305", poly1305key_pytype);
   INSERT("Poly1305Hash", poly1305hash_pytype);
@@ -3690,7 +3662,9 @@ void algorithms_pyinsert(PyObject *mod)
   INSERT("Shake256", shake256_pytype);
   INSERT("GCPRP", gcprp_pytype);
   INSERT("GPRP", gprp_pytype);
-  INSERT("gcprps", gcprps());
+  INSERT("gcprps", make_algtab(gprptab, sizeof(gcprp *),
+			       prp_namefn, prp_valfn));
+  setconstants(mod, consts);
 }
 
 /*----- That's all, folks -------------------------------------------------*/