Merge branch 'mdw/aead'

[catacomb-python] / algorithms.c

diff --git a/algorithms.c b/algorithms.c
index 3f9d4b77edb97072288e0b10be5bc841cbeb0ae8..d73981e252f0e5a0c8de0a2d29bee7d9b48bce0d 100644 (file)
--- a/algorithms.c
+++ b/algorithms.c
@@ -35,21 +35,31 @@ PyTypeObject *keysz_pytype;
 PyTypeObject *keyszany_pytype, *keyszrange_pytype, *keyszset_pytype;
 PyObject *sha_pyobj, *has160_pyobj;
 
 PyTypeObject *keyszany_pytype, *keyszrange_pytype, *keyszset_pytype;
 PyObject *sha_pyobj, *has160_pyobj;
 

+#ifndef KSZ_OPMASK
+#  define KSZ_OPMASK 0x1f
+#endif
+
+#ifndef KSZ_16BIT
+#  define KSZ_16BIT 0x20
+#endif
+

 PyObject *keysz_pywrap(const octet *k)
 {
 PyObject *keysz_pywrap(const octet *k)
 {

-  switch (k[0]) {
+  unsigned op = *k++;
+#define ARG(i) (op&KSZ_16BIT ? LOAD16(k + 2*(i)) : k[i])
+  switch (op&KSZ_OPMASK) {

     case KSZ_ANY: {
       keysz_pyobj *o = PyObject_New(keysz_pyobj, keyszany_pytype);
     case KSZ_ANY: {
       keysz_pyobj *o = PyObject_New(keysz_pyobj, keyszany_pytype);

-      o->dfl = k[1];
+      o->dfl = ARG(0);

       return ((PyObject *)o);
     } break;
     case KSZ_RANGE: {
       keyszrange_pyobj *o =
        PyObject_New(keyszrange_pyobj, keyszrange_pytype);
       return ((PyObject *)o);
     } break;
     case KSZ_RANGE: {
       keyszrange_pyobj *o =
        PyObject_New(keyszrange_pyobj, keyszrange_pytype);

-      o->dfl = k[1];
-      o->min = k[2];
-      o->max = k[3];
-      o->mod = k[4];
+      o->dfl = ARG(0);
+      o->min = ARG(1);
+      o->max = ARG(2);
+      o->mod = ARG(3);

       if (!o->mod) o->mod = 1;
       return ((PyObject *)o);
     } break;
       if (!o->mod) o->mod = 1;
       return ((PyObject *)o);
     } break;


@@ -57,26 +67,27 @@ PyObject *keysz_pywrap(const octet *k)
       keyszset_pyobj *o =
        PyObject_New(keyszset_pyobj, keyszset_pytype);
       int i, n;
       keyszset_pyobj *o =
        PyObject_New(keyszset_pyobj, keyszset_pytype);
       int i, n;

-      o->dfl = k[1];
-      for (i = 0; k[i + 1]; i++) ;
+      o->dfl = ARG(0);
+      for (i = 0; ARG(i); i++) ;

       n = i; o->set = PyTuple_New(n);
       for (i = 0; i < n; i++)
       n = i; o->set = PyTuple_New(n);
       for (i = 0; i < n; i++)

-       PyTuple_SET_ITEM(o->set, i, PyInt_FromLong(k[i + 1]));
+       PyTuple_SET_ITEM(o->set, i, PyInt_FromLong(ARG(i)));

       return ((PyObject *)o);
     } break;
     default:
       abort();
   }
       return ((PyObject *)o);
     } break;
     default:
       abort();
   }

+#undef ARG

 }
 
 static PyObject *keyszany_pynew(PyTypeObject *ty,
                                PyObject *arg, PyObject *kw)
 {
 }
 
 static PyObject *keyszany_pynew(PyTypeObject *ty,
                                PyObject *arg, PyObject *kw)
 {

-  char *kwlist[] = { "default", 0 };
+  static const char *const kwlist[] = { "default", 0 };

   int dfl;
   keysz_pyobj *o;
 
   int dfl;
   keysz_pyobj *o;
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "i:new", kwlist, &dfl))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "i:new", KWLIST, &dfl))

     goto end;
   if (dfl < 0) VALERR("key size cannot be negative");
   o = (keysz_pyobj *)ty->tp_alloc(ty, 0);
     goto end;
   if (dfl < 0) VALERR("key size cannot be negative");
   o = (keysz_pyobj *)ty->tp_alloc(ty, 0);


@@ -89,18 +100,16 @@ end:
 static PyObject *keyszrange_pynew(PyTypeObject *ty,
                                  PyObject *arg, PyObject *kw)
 {
 static PyObject *keyszrange_pynew(PyTypeObject *ty,
                                  PyObject *arg, PyObject *kw)
 {

-  char *kwlist[] = { "default", "min", "max", "mod", 0 };
+  static const char *const kwlist[] = { "default", "min", "max", "mod", 0 };

   int dfl, min = 0, max = 0, mod = 1;
   keyszrange_pyobj *o;
 
   int dfl, min = 0, max = 0, mod = 1;
   keyszrange_pyobj *o;
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "i|iii:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "i|iii:new", KWLIST,

                                   &dfl, &min, &max, &mod))
     goto end;
                                   &dfl, &min, &max, &mod))
     goto end;

-  if (dfl < 0 || min < 0 || max < 0)
-    VALERR("key size cannot be negative");
-  if (min > dfl || (max && dfl > max))
-    VALERR("bad key size bounds");
-  if (mod <= 0 || dfl % mod || min % mod || max % mod)
+  if (dfl < 0 || min < 0) VALERR("key size cannot be negative");
+  if (min > dfl || (max && dfl > max)) VALERR("bad key size bounds");
+  if (mod <= 0 || dfl%mod || min%mod || max%mod)

     VALERR("bad key size modulus");
   o = (keyszrange_pyobj *)ty->tp_alloc(ty, 0);
   o->dfl = dfl;
     VALERR("bad key size modulus");
   o = (keyszrange_pyobj *)ty->tp_alloc(ty, 0);
   o->dfl = dfl;


@@ -115,14 +124,13 @@ end:
 static PyObject *keyszset_pynew(PyTypeObject *ty,
                                PyObject *arg, PyObject *kw)
 {
 static PyObject *keyszset_pynew(PyTypeObject *ty,
                                PyObject *arg, PyObject *kw)
 {

-  char *kwlist[] = { "default", "set", 0 };
+  static const char *const kwlist[] = { "default", "set", 0 };

   int dfl, i, n, xx;
   PyObject *set = 0;
   PyObject *x = 0, *l = 0;
   keyszset_pyobj *o = 0;
 
   int dfl, i, n, xx;
   PyObject *set = 0;
   PyObject *x = 0, *l = 0;
   keyszset_pyobj *o = 0;
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "i|O:new", kwlist,
-                                         &dfl, &set))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "i|O:new", KWLIST, &dfl, &set))

     goto end;
   if (!set) set = PyTuple_New(0);
   else Py_INCREF(set);
     goto end;
   if (!set) set = PyTuple_New(0);
   else Py_INCREF(set);


@@ -253,7 +261,7 @@ static PyTypeObject keysz_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */

-"Key size constraints.",
+"Key size constraints.  Abstract.",

 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */


@@ -301,7 +309,8 @@ static PyTypeObject keyszany_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */

-"Key size constraints.  This object imposes no constraints on size.",
+"KeySZAny(DEFAULT)\n\
+  Key size constraints.  This object imposes no constraints on size.",

 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */


@@ -349,8 +358,9 @@ static PyTypeObject keyszrange_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */

-"Key size constraints.  This object asserts minimum and maximum (if\n\
-sizes, and requires the key length to be a multiple of some value.",
+"KeySZRange(DEFAULT, [min = 0], [max = 0], [mod = 1])\n\
+  Key size constraints.  Key size must be between MIN and MAX inclusive,\n\
+  and be a multiple of MOD.",

 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */


@@ -398,8 +408,8 @@ static PyTypeObject keyszset_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */

-"Key size constraints.  This object requires the key to be one of a\n\
-few listed sizes.",
+"KeySZSet(DEFAULT, SEQ)\n\
+  Key size constraints.  Key size must be DEFAULT or one in SEQ.",

 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */


@@ -447,29 +457,27 @@ PyTypeObject *gccipher_pytype, *gcipher_pytype;
 CONVFUNC(gccipher, gccipher *, GCCIPHER_CC)
 CONVFUNC(gcipher, gcipher *, GCIPHER_C)
 
 CONVFUNC(gccipher, gccipher *, GCCIPHER_CC)
 CONVFUNC(gcipher, gcipher *, GCIPHER_C)
 

-PyObject *gcipher_pywrap(PyObject *cobj, gcipher *c, unsigned f)
+PyObject *gcipher_pywrap(PyObject *cobj, gcipher *c)

 {
   gcipher_pyobj *g;
   if (!cobj) cobj = gccipher_pywrap((/*unconst*/ gccipher *)GC_CLASS(c));
   else Py_INCREF(cobj);
   g = PyObject_NEW(gcipher_pyobj, (PyTypeObject *)cobj);
   g->c = c;
 {
   gcipher_pyobj *g;
   if (!cobj) cobj = gccipher_pywrap((/*unconst*/ gccipher *)GC_CLASS(c));
   else Py_INCREF(cobj);
   g = PyObject_NEW(gcipher_pyobj, (PyTypeObject *)cobj);
   g->c = c;

-  g->f = f;

   return ((PyObject *)g);
 }
 
 static PyObject *gcipher_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
   return ((PyObject *)g);
 }
 
 static PyObject *gcipher_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {

-  char *kwlist[] = { "k", 0 };
+  static const char *const kwlist[] = { "k", 0 };

   char *k;
   Py_ssize_t sz;
 
   char *k;
   Py_ssize_t sz;
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", kwlist, &k, &sz))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))

     goto end;
   if (keysz(sz, GCCIPHER_CC(ty)->keysz) != sz) VALERR("bad key length");
   return (gcipher_pywrap((PyObject *)ty,
     goto end;
   if (keysz(sz, GCCIPHER_CC(ty)->keysz) != sz) VALERR("bad key length");
   return (gcipher_pywrap((PyObject *)ty,

-                        GC_INIT(GCCIPHER_CC(ty), k, sz),
-                        f_freeme));
+                        GC_INIT(GCCIPHER_CC(ty), k, sz)));

 end:
   return (0);
 }
 end:
   return (0);
 }


@@ -493,8 +501,7 @@ PyObject *gccipher_pywrap(gccipher *cc)
 
 static void gcipher_pydealloc(PyObject *me)
 {
 
 static void gcipher_pydealloc(PyObject *me)
 {

-  if (GCIPHER_F(me) & f_freeme)
-    GC_DESTROY(GCIPHER_C(me));
+  GC_DESTROY(GCIPHER_C(me));

   Py_DECREF(me->ob_type);
   FREEOBJ(me);
 }
   Py_DECREF(me->ob_type);
   FREEOBJ(me);
 }


@@ -566,6 +573,7 @@ static PyObject *gcmeth_setiv(PyObject *me, PyObject *arg)
   Py_ssize_t sz;
 
   if (!PyArg_ParseTuple(arg, "s#:setiv", &p, &sz)) goto end;
   Py_ssize_t sz;
 
   if (!PyArg_ParseTuple(arg, "s#:setiv", &p, &sz)) goto end;

+  if (!GCIPHER_C(me)->ops->setiv) VALERR("`setiv' not supported");

   if (!GC_CLASS(GCIPHER_C(me))->blksz) VALERR("not a block cipher mode");
   if (sz != GC_CLASS(GCIPHER_C(me))->blksz) VALERR("bad IV length");
   GC_SETIV(GCIPHER_C(me), p);
   if (!GC_CLASS(GCIPHER_C(me))->blksz) VALERR("not a block cipher mode");
   if (sz != GC_CLASS(GCIPHER_C(me))->blksz) VALERR("bad IV length");
   GC_SETIV(GCIPHER_C(me), p);


@@ -577,6 +585,7 @@ end:
 static PyObject *gcmeth_bdry(PyObject *me, PyObject *arg)
 {
   if (!PyArg_ParseTuple(arg, ":bdry")) goto end;
 static PyObject *gcmeth_bdry(PyObject *me, PyObject *arg)
 {
   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));
   RETURN_ME;
   if (!GC_CLASS(GCIPHER_C(me))->blksz) VALERR("not a block cipher mode");
   GC_BDRY(GCIPHER_C(me));
   RETURN_ME;


@@ -701,350 +710,702 @@ static PyTypeObject gcipher_pytype_skel = {
   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 

-/*----- Hash functions ----------------------------------------------------*/
+/*----- Authenticated encryption ------------------------------------------*/

 
 

-PyTypeObject *gchash_pytype, *ghash_pytype;
+PyTypeObject *gcaead_pytype, *gaeadkey_pytype;
+PyTypeObject *gcaeadaad_pytype, *gaeadaad_pytype;
+PyTypeObject *gcaeadenc_pytype, *gaeadenc_pytype;
+PyTypeObject *gcaeaddec_pytype, *gaeaddec_pytype;

 
 

-CONVFUNC(gchash, gchash *, GCHASH_CH)
-CONVFUNC(ghash, ghash *, GHASH_H)
+CONVFUNC(gcaead, gcaead *, GCAEAD_AEC)
+CONVFUNC(gaeadkey, gaead_key *, GAEADKEY_K)

 
 

-static PyObject *ghash_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
+PyObject *gaeadkey_pywrap(PyObject *cobj, gaead_key *k)
+{
+  gaeadkey_pyobj *gk;
+
+  if (!cobj) cobj = gcaead_pywrap((/*unconst*/ gcaead *)GAEAD_CLASS(k));
+  else Py_INCREF(cobj);
+  gk = PyObject_NEW(gaeadkey_pyobj, (PyTypeObject *)cobj);
+  gk->k = k;
+  return ((PyObject *)gk);
+}
+
+static PyObject *gaeadkey_pynew(PyTypeObject *ty,
+                               PyObject *arg, PyObject *kw)

 {
 {

-  char *kwlist[] = { 0 };
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, ":new", kwlist))
+  static const char *const kwlist[] = { "k", 0 };
+  char *k;
+  Py_ssize_t sz;
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))

     goto end;
     goto end;

-  return (ghash_pywrap((PyObject *)ty, GH_INIT(GCHASH_CH(ty)), f_freeme));
+  if (keysz(sz, GCAEAD_AEC(ty)->keysz) != sz) VALERR("bad key length");
+  return (gaeadkey_pywrap((PyObject *)ty,
+                         GAEAD_KEY(GCAEAD_AEC(ty), k, sz)));

 end:
   return (0);
 }
 
 end:
   return (0);
 }
 

-PyObject *gchash_pywrap(gchash *ch)
+PyObject *gcaead_pywrap(gcaead *aec)

 {
 {

-  gchash_pyobj *g = newtype(gchash_pytype, 0, ch->name);
-  g->ch = ch;
-  g->ty.ht_type.tp_basicsize = sizeof(ghash_pyobj);
-  g->ty.ht_type.tp_base = ghash_pytype;
-  Py_INCREF(ghash_pytype);
-  g->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
-                           Py_TPFLAGS_BASETYPE |
-                           Py_TPFLAGS_HEAPTYPE);
-  g->ty.ht_type.tp_alloc = PyType_GenericAlloc;
-  g->ty.ht_type.tp_free = 0;
-  g->ty.ht_type.tp_new = ghash_pynew;
-  typeready(&g->ty.ht_type);
-  return ((PyObject *)g);
+  gcaead_pyobj *gck;
+  gcaeadaad_pyobj *gca;
+  gcaeadenc_pyobj *gce;
+  gcaeaddec_pyobj *gcd;
+
+#define MKTYPE(obj, thing, newfn, namefmt) do {                                \
+  (obj) = newtype(gcaead_pytype, 0, 0);                                        \
+  (obj)->ty.ht_name = PyString_FromFormat(namefmt, aec->name);         \
+  (obj)->ty.ht_type.tp_name = PyString_AS_STRING((obj)->ty.ht_name);   \
+  (obj)->ty.ht_type.tp_basicsize = sizeof(gaead##thing##_pyobj);       \
+  (obj)->ty.ht_type.tp_base = gaead##thing##_pytype;                   \
+  Py_INCREF(gaead##thing##_pytype);                                    \
+  (obj)->ty.ht_type.tp_flags =                                         \
+    (Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HEAPTYPE);  \
+  (obj)->ty.ht_type.tp_alloc = PyType_GenericAlloc;                    \
+  (obj)->ty.ht_type.tp_free = 0;                                       \
+  (obj)->ty.ht_type.tp_new = newfn;                                    \
+  typeready(&(obj)->ty.ht_type);                                       \
+} while (0)
+
+  MKTYPE(gck, key, gaeadkey_pynew, "%s(key)");
+  MKTYPE(gca, aad, abstract_pynew, "%s(aad-hash)");
+  MKTYPE(gce, enc, abstract_pynew, "%s(encrypt)");
+  MKTYPE(gcd, dec, abstract_pynew, "%s(decrypt)");
+
+#undef MKTYPE
+
+  gck->aec = aec; gck->aad = gca; gck->enc = gce; gck->dec = gcd;
+  gca->key = gce->key = gcd->key = gck;
+  return ((PyObject *)gck);

 }
 
 }
 

-PyObject *ghash_pywrap(PyObject *cobj, ghash *h, unsigned f)
+static void gaeadkey_pydealloc(PyObject *me)
+  { GAEAD_DESTROY(GAEADKEY_K(me)); Py_DECREF(me->ob_type); FREEOBJ(me); }
+
+static PyObject *gcaeget_name(PyObject *me, void *hunoz)
+  { return (PyString_FromString(GCAEAD_AEC(me)->name)); }
+
+static PyObject *gcaeget_keysz(PyObject *me, void *hunoz)
+  { return (keysz_pywrap(GCAEAD_AEC(me)->keysz)); }
+
+static PyObject *gcaeget_noncesz(PyObject *me, void *hunoz)
+  { return (keysz_pywrap(GCAEAD_AEC(me)->noncesz)); }
+
+static PyObject *gcaeget_tagsz(PyObject *me, void *hunoz)
+  { return (keysz_pywrap(GCAEAD_AEC(me)->tagsz)); }
+
+static PyObject *gcaeget_blksz(PyObject *me, void *hunoz)
+  { return (PyInt_FromLong(GCAEAD_AEC(me)->blksz)); }
+
+static PyObject *gcaeget_bufsz(PyObject *me, void *hunoz)
+  { return (PyInt_FromLong(GCAEAD_AEC(me)->bufsz)); }
+
+static PyObject *gcaeget_ohd(PyObject *me, void *hunoz)
+  { return (PyInt_FromLong(GCAEAD_AEC(me)->ohd)); }
+
+static PyObject *gcaeget_flags(PyObject *me, void *hunoz)
+  { return (PyInt_FromLong(GCAEAD_AEC(me)->f)); }
+
+static PyGetSetDef gcaead_pygetset[] = {
+#define GETSETNAME(op, name) gcae##op##_##name
+  GET  (keysz,                 "AEC.keysz -> acceptable key sizes")
+  GET  (noncesz,               "AEC.noncesz -> acceptable nonce sizes")
+  GET  (tagsz,                 "AEC.tagsz -> acceptable tag sizes")
+  GET  (blksz,                 "AEC.blksz -> block size, or zero")
+  GET  (bufsz,                 "AEC.bufsz -> amount of data buffered internally")
+  GET  (ohd,                   "AEC.ohd -> maximum encryption overhead")
+  GET  (name,                  "AEC.name -> name of this kind of AEAD scheme")
+  GET  (flags,                 "AEC.flags -> mask of `AEADF_...' flags")
+#undef GETSETNAME
+  { 0 }
+};
+
+static PyObject *gaekmeth_aad(PyObject *me, PyObject *arg)

 {
 {

-  ghash_pyobj *g;
-  if (!cobj) cobj = gchash_pywrap((/*unconst*/ gchash *)GH_CLASS(h));
-  else Py_INCREF(cobj);
-  g = PyObject_NEW(ghash_pyobj, (PyTypeObject *)cobj);
-  g->h = h;
-  g->f = f;
-  return ((PyObject *)g);
+  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),
+                      GAEAD_AAD(k), 0, 0);
+end:
+  return (rc);

 }
 
 }
 

-static void ghash_pydealloc(PyObject *me)
+static int check_aead_encdec(const gcaead *aec, unsigned *f_out, size_t nsz,
+                            PyObject *hszobj, size_t *hsz_out,
+                            PyObject *mszobj, size_t *msz_out,
+                            PyObject *tszobj, size_t *tsz_out)

 {
 {

-  if (GHASH_F(me) & f_freeme)
-    GH_DESTROY(GHASH_H(me));
-  Py_DECREF(me->ob_type);
-  FREEOBJ(me);
+  unsigned f = 0, miss;
+  int rc = -1;
+
+  if (hszobj != Py_None)
+    { f |= AEADF_PCHSZ; if (!convszt(hszobj, hsz_out)) goto end; }
+  if (mszobj != Py_None)
+    { f |= AEADF_PCMSZ; if (!convszt(mszobj, msz_out)) goto end; }
+  if (tszobj != Py_None)
+    { f |= AEADF_PCTSZ; if (!convszt(tszobj, tsz_out)) goto end; }
+  miss = aec->f&~f;
+  if (miss&AEADF_PCHSZ) VALERR("header length precommitment required");
+  if (miss&AEADF_PCMSZ) VALERR("message length precommitment required");
+  if (miss&AEADF_PCTSZ) VALERR("tag length precommitment required");
+  if (keysz(nsz, aec->noncesz) != nsz) VALERR("bad nonce length");
+  if (tszobj != Py_None && keysz(*tsz_out, aec->tagsz) != *tsz_out)
+    VALERR("bad tag length");
+  *f_out = f | aec->f; rc = 0;
+end:
+  return (rc);

 }
 
 }
 

-static PyObject *gchget_name(PyObject *me, void *hunoz)
-  { return (PyString_FromString(GCHASH_CH(me)->name)); }
+static PyObject *gaekmeth_enc(PyObject *me, PyObject *arg, PyObject *kw)
+{
+  static const char *const kwlist[] = { "nonce", "hsz", "msz", "tsz", 0 };
+  const gaead_key *k = GAEADKEY_K(me);
+  gaead_enc *e;
+  PyObject *rc = 0;
+  char *n; Py_ssize_t nsz;
+  PyObject *hszobj = Py_None, *mszobj = Py_None, *tszobj = Py_None;
+  size_t hsz = 0, msz = 0, tsz = 0;
+  unsigned f;

 
 

-static PyObject *gchget_hashsz(PyObject *me, void *hunoz)
-  { return (PyInt_FromLong(GCHASH_CH(me)->hashsz)); }
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|OOO:enc", KWLIST,
+                                  &n, &nsz, &hszobj, &mszobj, &tszobj))
+    goto end;
+  if (check_aead_encdec(k->ops->c, &f, nsz,
+                       hszobj, &hsz, mszobj, &msz, tszobj, &tsz))
+    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),
+                      e, f, hsz, msz, tsz);
+end:
+  return (rc);
+}

 
 

-static PyObject *gchget_bufsz(PyObject *me, void *hunoz)
-  { return (PyInt_FromLong(GCHASH_CH(me)->bufsz)); }
+static PyObject *gaekmeth_dec(PyObject *me, PyObject *arg, PyObject *kw)
+{
+  static const char *const kwlist[] = { "nonce", "hsz", "csz", "tsz", 0 };
+  const gaead_key *k = GAEADKEY_K(me);
+  gaead_dec *d;
+  PyObject *rc = 0;
+  char *n; Py_ssize_t nsz;
+  PyObject *hszobj = Py_None, *cszobj = Py_None, *tszobj = Py_None;
+  size_t hsz = 0, csz = 0, tsz = 0;
+  unsigned f;

 
 

-static PyObject *ghmeth_hash(PyObject *me, PyObject *arg)
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|OOO:dec", KWLIST,
+                                  &n, &nsz, &hszobj, &cszobj, &tszobj))
+    goto end;
+  if (check_aead_encdec(k->ops->c, &f, nsz,
+                       hszobj, &hsz, cszobj, &csz, tszobj, &tsz))
+    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),
+                      d, f, hsz, csz, tsz);
+end:
+  return (rc);
+}
+
+static PyMethodDef gaeadkey_pymethods[] = {
+#define METHNAME(name) gaekmeth_##name
+  METH  (aad,                  "KEY.aad() -> AAD")
+  KWMETH(enc,                  "KEY.enc(NONCE, [hsz], [msz], [tsz]) -> ENC")
+  KWMETH(dec,                  "KEY.dec(NONCE, [hsz], [csz], [tsz]) -> DEC")
+#undef METHNAME
+  { 0 }
+};
+
+PyObject *gaeadaad_pywrap(PyObject *cobj, gaead_aad *a,
+                         unsigned f, size_t hsz)

 {
 {

-  char *p;
-  Py_ssize_t sz;
-  if (!PyArg_ParseTuple(arg, "s#:hash", &p, &sz)) return (0);
-  GH_HASH(GHASH_H(me), p, sz);
+  gaeadaad_pyobj *ga;
+
+  assert(cobj); Py_INCREF(cobj);
+  ga = PyObject_NEW(gaeadaad_pyobj, (PyTypeObject *)cobj);
+  ga->a = a; ga->f = f; ga->hsz = hsz; ga->hlen = 0;
+  return ((PyObject *)ga);
+}
+
+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);
+}
+
+static int gaea_check(PyObject *me)
+{
+  gaeadaad_pyobj *ga = (gaeadaad_pyobj *)me;
+  int rc = -1;
+
+  if ((ga->f&AEADF_DEAD) || !ga->a) VALERR("aad object no longer active");
+  rc = 0;
+end:
+  return (rc);
+}
+
+static void gaea_invalidate(gaeadaad_pyobj *ga)
+  { if (ga) ga->f |= AEADF_DEAD; }
+
+static void gaea_sever(gaeadaad_pyobj **ga_inout)
+{
+  gaeadaad_pyobj *ga = *ga_inout;
+  if (ga) { ga->f |= AEADF_DEAD; ga->a = 0; Py_DECREF(ga); *ga_inout = 0; }
+}
+
+static PyObject *gaeaget_hsz(PyObject *me, void *hunoz)
+{
+  if (gaea_check(me)) return (0);
+  else if (GAEADAAD_F(me)&AEADF_PCHSZ) return getulong(GAEADAAD_HSZ(me));
+  else RETURN_NONE;
+}
+
+static PyObject *gaeaget_hlen(PyObject *me, void *hunoz)
+  { return (gaea_check(me) ? 0 : getulong(GAEADAAD_HLEN(me))); }
+
+static 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")
+#undef GETSETNAME
+  { 0 }
+};
+
+static PyObject *gaeameth_copy(PyObject *me, PyObject *arg)
+{
+  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,
+                      GAEAD_DUP(GAEADAAD_A(me)), 0, 0);
+end:
+  return (rc);
+}
+
+static int gaeadaad_hash(PyObject *me, const void *h, size_t hsz)
+{
+  gaeadaad_pyobj *ga = (gaeadaad_pyobj *)me;
+  int rc = -1;
+
+  if (gaea_check(me)) goto end;
+  if ((ga->f&AEADF_NOAAD) && hsz)
+    VALERR("header data not permitted");
+  if ((ga->f&AEADF_PCHSZ) && hsz > ga->hsz - ga->hlen)
+    VALERR("too large for precommitted header length");
+  GAEAD_HASH(ga->a, h, hsz); ga->hlen += hsz;
+  rc = 0;
+end:
+  return (rc);
+}
+
+
+static PyObject *gaeameth_hash(PyObject *me, PyObject *arg)
+{
+  char *h; Py_ssize_t hsz;
+
+  if (!PyArg_ParseTuple(arg, "s#:hash", &h, &hsz)) return (0);
+  if (gaeadaad_hash(me, h, hsz)) return (0);

   RETURN_ME;
 }
 
   RETURN_ME;
 }
 

-#define GHMETH_HASHU_(n, W, w)                                         \
-  static PyObject *ghmeth_hashu##w(PyObject *me, PyObject *arg)                \
+#define GAEAMETH_HASHU_(n, W, w)                                       \
+  static PyObject *gaeameth_hashu##w(PyObject *me, PyObject *arg)      \

   {                                                                    \
   {                                                                    \

-    uint##n x;                                                         \
-    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) goto end; \
-    GH_HASHU##W(GHASH_H(me), x);                                       \
+    uint##n x; octet b[SZ_##W];                                                \
+    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) return (0); \
+    STORE##W(b, x); if (gaeadaad_hash(me, b, sizeof(b))) return (0);   \

     RETURN_ME;                                                         \
     RETURN_ME;                                                         \

-  end:                                                                 \
-    return (0);                                                                \

   }
   }

-DOUINTCONV(GHMETH_HASHU_)
+DOUINTCONV(GAEAMETH_HASHU_)

 
 

-#define GHMETH_HASHBUF_(n, W, w)                                       \
-  static PyObject *ghmeth_hashbuf##w(PyObject *me, PyObject *arg)      \
+#define GAEAMETH_HASHBUF_(n, W, w)                                     \
+  static PyObject *gaeameth_hashbuf##w(PyObject *me, PyObject *arg)    \

   {                                                                    \
   {                                                                    \

-    char *p;                                                           \
-    Py_ssize_t sz;                                                     \
+    char *p; Py_ssize_t sz; octet b[SZ_##W];                           \

     if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end;    \
     if (sz > MASK##n) TYERR("string too long");                                \
     if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end;    \
     if (sz > MASK##n) TYERR("string too long");                                \

-    GH_HASHBUF##W(GHASH_H(me), p, sz);                                 \
+    STORE##W(b, sz); if (gaeadaad_hash(me, b, sizeof(b))) goto end;    \
+    if (gaeadaad_hash(me, p, sz)) goto end;                            \

     RETURN_ME;                                                         \
   end:                                                                 \
     return (0);                                                                \
   }
     RETURN_ME;                                                         \
   end:                                                                 \
     return (0);                                                                \
   }

-DOUINTCONV(GHMETH_HASHBUF_)
+DOUINTCONV(GAEAMETH_HASHBUF_)

 
 

-static PyObject *ghmeth_hashstrz(PyObject *me, PyObject *arg)
+static PyObject *gaeameth_hashstrz(PyObject *me, PyObject *arg)

 {
   char *p;
   if (!PyArg_ParseTuple(arg, "s:hashstrz", &p)) return (0);
 {
   char *p;
   if (!PyArg_ParseTuple(arg, "s:hashstrz", &p)) return (0);

-  GH_HASHSTRZ(GHASH_H(me), p);
+  if (gaeadaad_hash(me, p, strlen(p) + 1)) return (0);

   RETURN_ME;
 }
 
   RETURN_ME;
 }
 

-static PyObject *ghmeth_done(PyObject *me, PyObject *arg)
-{
-  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));
-  GH_DESTROY(g);
-  return (rc);
-}
-
-static 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")
-  GET  (name,                  "CH.name -> name of this kind of hash")
-#undef GETSETNAME
-  { 0 }
-};
-
-static PyMethodDef ghash_pymethods[] = {
-#define METHNAME(name) ghmeth_##name
-  METH (hash,                  "H.hash(M)")
-#define METHU_(n, W, w) METH(hashu##w, "H.hashu" #w "(WORD)")
+static PyMethodDef gaeadaad_pymethods[] = {
+#define METHNAME(name) gaeameth_##name
+  METH  (copy,                 "AAD.copy() -> AAD'")
+  METH  (hash,                 "AAD.hash(H)")
+#define METHU_(n, W, w) METH(hashu##w, "AAD.hashu" #w "(WORD)")

   DOUINTCONV(METHU_)
 #undef METHU_
   DOUINTCONV(METHU_)
 #undef METHU_

-#define METHBUF_(n, W, w) METH(hashbuf##w, "H.hashbuf" #w "(BYTES)")
+#define METHBUF_(n, W, w) METH(hashbuf##w, "AAD.hashbuf" #w "(BYTES)")

   DOUINTCONV(METHBUF_)
 #undef METHBUF_
   DOUINTCONV(METHBUF_)
 #undef METHBUF_

-  METH (hashstrz,              "H.hashstrz(STRING)")
-  METH (done,                  "H.done() -> HASH")
+  METH  (hashstrz,             "AAD.hashstrz(STRING)")

 #undef METHNAME
   { 0 }
 };
 
 #undef METHNAME
   { 0 }
 };
 

-static PyTypeObject gchash_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,             /* Header */
-  "GCHash",                            /* @tp_name@ */
-  sizeof(gchash_pyobj),                        /* @tp_basicsize@ */
-  0,                                   /* @tp_itemsize@ */
+PyObject *gaeadenc_pywrap(PyObject *cobj, gaead_enc *e, unsigned f,
+                         size_t hsz, size_t msz, size_t tsz)
+{
+  gaeadenc_pyobj *ge;

 
 

-  0,                                   /* @tp_dealloc@ */
-  0,                                   /* @tp_print@ */
-  0,                                   /* @tp_getattr@ */
-  0,                                   /* @tp_setattr@ */
-  0,                                   /* @tp_compare@ */
-  0,                                   /* @tp_repr@ */
-  0,                                   /* @tp_as_number@ */
-  0,                                   /* @tp_as_sequence@ */
-  0,                                   /* @tp_as_mapping@ */
-  0,                                   /* @tp_hash@ */
-  0,                                   /* @tp_call@ */
-  0,                                   /* @tp_str@ */
-  0,                                   /* @tp_getattro@ */
-  0,                                   /* @tp_setattro@ */
-  0,                                   /* @tp_as_buffer@ */
-  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
-    Py_TPFLAGS_BASETYPE,
+  assert(cobj); Py_INCREF(cobj);
+  ge = PyObject_NEW(gaeadenc_pyobj, (PyTypeObject *)cobj);
+  ge->e = e; ge->f = f; ge->hsz = hsz; ge->msz = msz; ge->tsz = tsz;
+  ge->aad = 0; ge->mlen = 0;
+  return ((PyObject *)ge);
+}

 
 

-  /* @tp_doc@ */
-"Hash function metaclass.",
+static void gaeadenc_pydealloc(PyObject *me)
+{
+  gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me;

 
 

-  0,                                   /* @tp_traverse@ */
-  0,                                   /* @tp_clear@ */
-  0,                                   /* @tp_richcompare@ */
-  0,                                   /* @tp_weaklistoffset@ */
-  0,                                   /* @tp_iter@ */
-  0,                                   /* @tp_iternext@ */
-  0,                                   /* @tp_methods@ */
-  0,                                   /* @tp_members@ */
-  gchash_pygetset,                     /* @tp_getset@ */
-  0,                                   /* @tp_base@ */
-  0,                                   /* @tp_dict@ */
-  0,                                   /* @tp_descr_get@ */
-  0,                                   /* @tp_descr_set@ */
-  0,                                   /* @tp_dictoffset@ */
-  0,                                   /* @tp_init@ */
-  PyType_GenericAlloc,                 /* @tp_alloc@ */
-  abstract_pynew,                      /* @tp_new@ */
-  0,                                   /* @tp_free@ */
-  0                                    /* @tp_is_gc@ */
-};
+  gaea_sever(&ge->aad); GAEAD_DESTROY(ge->e);
+  Py_DECREF(me->ob_type); FREEOBJ(me);
+}

 
 

-static PyTypeObject ghash_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,             /* Header */
-  "GHash",                             /* @tp_name@ */
-  sizeof(ghash_pyobj),                 /* @tp_basicsize@ */
-  0,                                   /* @tp_itemsize@ */
+static PyObject *gaeeget_hsz(PyObject *me, void *hunoz)
+{
+  if (GAEADENC_F(me)&AEADF_PCHSZ) return getulong(GAEADENC_HSZ(me));
+  else RETURN_NONE;
+}

 
 

-  ghash_pydealloc,                     /* @tp_dealloc@ */
-  0,                                   /* @tp_print@ */
-  0,                                   /* @tp_getattr@ */
-  0,                                   /* @tp_setattr@ */
-  0,                                   /* @tp_compare@ */
-  0,                                   /* @tp_repr@ */
-  0,                                   /* @tp_as_number@ */
-  0,                                   /* @tp_as_sequence@ */
-  0,                                   /* @tp_as_mapping@ */
-  0,                                   /* @tp_hash@ */
-  0,                                   /* @tp_call@ */
-  0,                                   /* @tp_str@ */
-  0,                                   /* @tp_getattro@ */
-  0,                                   /* @tp_setattro@ */
-  0,                                   /* @tp_as_buffer@ */
-  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
-    Py_TPFLAGS_BASETYPE,
+static PyObject *gaeeget_msz(PyObject *me, void *hunoz)
+{
+  if (GAEADENC_F(me)&AEADF_PCMSZ) return getulong(GAEADENC_MSZ(me));
+  else RETURN_NONE;
+}

 
 

-  /* @tp_doc@ */
-"Hash function, abstract base class.",
+static PyObject *gaeeget_tsz(PyObject *me, void *hunoz)
+{
+  if (GAEADENC_F(me)&AEADF_PCTSZ) return getulong(GAEADENC_TSZ(me));
+  else RETURN_NONE;
+}

 
 

-  0,                                   /* @tp_traverse@ */
-  0,                                   /* @tp_clear@ */
-  0,                                   /* @tp_richcompare@ */
-  0,                                   /* @tp_weaklistoffset@ */
-  0,                                   /* @tp_iter@ */
-  0,                                   /* @tp_iternext@ */
-  ghash_pymethods,                     /* @tp_methods@ */
-  0,                                   /* @tp_members@ */
-  0,                                   /* @tp_getset@ */
-  0,                                   /* @tp_base@ */
-  0,                                   /* @tp_dict@ */
-  0,                                   /* @tp_descr_get@ */
-  0,                                   /* @tp_descr_set@ */
-  0,                                   /* @tp_dictoffset@ */
-  0,                                   /* @tp_init@ */
-  PyType_GenericAlloc,                 /* @tp_alloc@ */
-  abstract_pynew,                      /* @tp_new@ */
-  0,                                   /* @tp_free@ */
-  0                                    /* @tp_is_gc@ */
-};
+static PyObject *gaeeget_mlen(PyObject *me, void *hunoz)
+  { return getulong(GAEADENC_MLEN(me)); }

 
 

-/*----- Message authentication --------------------------------------------*/
+static 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'")
+  GET  (tsz,                   "ENC.tsz -> precommitted tag length or `None'")
+  GET  (mlen,                  "ENC.mlen -> message length so far")
+#undef GETSETNAME
+  { 0 }
+};

 
 

-PyTypeObject *gcmac_pytype, *gmac_pytype, *gmhash_pytype;
+static PyObject *gaeemeth_aad(PyObject *me, PyObject *arg)
+{
+  gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me;
+  PyObject *rc = 0;

 
 

-CONVFUNC(gcmac, gcmac *, GCMAC_CM)
-CONVFUNC(gmac, gmac *, GMAC_M)
-CONVFUNC(gmhash, ghash *, GHASH_H)
+  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);
+  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,
+                       GAEAD_AAD(ge->e), ge->f&AEADF_PCHSZ, ge->hsz);
+    Py_INCREF(ge->aad);
+    rc = (PyObject *)ge->aad;
+  }
+end:
+  return (rc);
+}

 
 

-static PyObject *gmac_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
+static PyObject *gaeemeth_reinit(PyObject *me, PyObject *arg, PyObject *kw)

 {
 {

-  char *kwlist[] = { "k", 0 };
-  char *k;
-  Py_ssize_t sz;
+  static const char *const kwlist[] = { "nonce", "hsz", "msz", "tsz", 0 };
+  gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me;
+  char *n; Py_ssize_t nsz;
+  PyObject *hszobj = Py_None, *mszobj = Py_None, *tszobj = Py_None;
+  size_t hsz = 0, msz = 0, tsz = 0;
+  unsigned f;

 
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", kwlist, &k, &sz))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|OOO:enc", KWLIST,
+                                  &n, &nsz, &hszobj, &mszobj, &tszobj))

     goto end;
     goto end;

-  if (keysz(sz, GCMAC_CM(ty)->keysz) != sz) VALERR("bad key length");
-  return (gmac_pywrap((PyObject *)ty,
-                     GM_KEY(GCMAC_CM(ty), k, sz),
-                     f_freeme));
+  if (check_aead_encdec(ge->e->ops->c, &f, nsz,
+                       hszobj, &hsz, mszobj, &msz, tszobj, &tsz))
+    goto end;
+  if (GAEAD_REINIT(ge->e, n, nsz, hsz, msz, tsz))
+    VALERR("bad aead parameter combination");
+  gaea_sever(&ge->aad);
+  ge->f = f; ge->hsz = hsz; ge->msz = msz; ge->tsz = tsz;

 end:
   return (0);
 }
 
 end:
   return (0);
 }
 

-static PyObject *gmhash_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
+static PyObject *gaeemeth_encrypt(PyObject *me, PyObject *arg)

 {
 {

-  char *kwlist[] = { 0 };
-  ghash_pyobj *g;
+  gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me;
+  char *m; Py_ssize_t msz;
+  char *c = 0; size_t csz; buf b;
+  int err;
+  PyObject *rc = 0;

 
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, ":new", kwlist)) return (0);
-  g = PyObject_NEW(ghash_pyobj, ty);
-  g->h = GM_INIT(GMAC_M(ty));
-  g->f = f_freeme;
-  Py_INCREF(ty);
-  return ((PyObject *)g);
+  if (!PyArg_ParseTuple(arg, "s#:encrypt", &m, &msz)) goto end;
+  if (ge->f&AEADF_AADFIRST) {
+    if ((ge->f&AEADF_PCHSZ) && (ge->aad ? ge->aad->hlen : 0) != ge->hsz)
+      VALERR("header doesn't match precommitted length");
+    gaea_invalidate(ge->aad);
+  }
+  if ((ge->f&AEADF_PCMSZ) && msz > ge->msz - ge->mlen)
+    VALERR("too large for precommitted message length");
+  csz = msz + ge->e->ops->c->bufsz; c = xmalloc(csz); buf_init(&b, c, csz);
+  err = GAEAD_ENCRYPT(ge->e, m, msz, &b); assert(!err); (void)err;
+  buf_flip(&b); rc = bytestring_pywrapbuf(&b); ge->mlen += msz;
+end:
+  xfree(c);
+  return (rc);

 }
 
 }
 

-PyObject *gcmac_pywrap(gcmac *cm)
+static PyObject *gaeemeth_done(PyObject *me, PyObject *arg, PyObject *kw)

 {
 {

-  gcmac_pyobj *g = newtype(gcmac_pytype, 0, cm->name);
-  g->cm = cm;
-  g->ty.ht_type.tp_basicsize = sizeof(gmac_pyobj);
-  g->ty.ht_type.tp_base = gmac_pytype;
-  Py_INCREF(gmac_pytype);
-  g->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
-                           Py_TPFLAGS_BASETYPE |
-                           Py_TPFLAGS_HEAPTYPE);
-  g->ty.ht_type.tp_alloc = PyType_GenericAlloc;
-  g->ty.ht_type.tp_free = 0;
-  g->ty.ht_type.tp_new = gmac_pynew;
-  typeready(&g->ty.ht_type);
-  return ((PyObject *)g);
+  static const char *const kwlist[] = { "tsz", "aad", 0 };
+  gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me;
+  PyObject *aad = Py_None;
+  char *c = 0; size_t csz; buf b;
+  PyObject *tszobj = Py_None; PyObject *tag; size_t tsz;
+  int err;
+  PyObject *rc = 0;
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|OO:done", KWLIST,
+                                  &tszobj, &aad))
+    goto end;
+  if (tszobj != Py_None && !convszt(tszobj, &tsz)) goto end;
+  if (aad != Py_None &&
+      !PyObject_TypeCheck(aad,
+                         (PyTypeObject *)GCAEADENC_KEY(me->ob_type)->aad))
+    TYERR("wanted aad");
+  if ((ge->f&AEADF_AADNDEP) && aad != Py_None && aad != (PyObject *)ge->aad)
+    VALERR("mismatched aad");
+  if ((ge->f&AEADF_PCHSZ) &&
+      (aad == Py_None ? 0 : GAEADAAD_HLEN(aad)) != ge->hsz)
+    VALERR("header doesn't match precommitted length");
+  if ((ge->f&AEADF_PCMSZ) && ge->mlen != ge->msz)
+    VALERR("message doesn't match precommitted length");
+  if (tszobj == Py_None) {
+    if (ge->f&AEADF_PCTSZ) tsz = ge->tsz;
+    else tsz = keysz(0, ge->e->ops->c->tagsz);
+  } else {
+    if ((ge->f&AEADF_PCTSZ) && tsz != ge->tsz)
+      VALERR("tag length doesn't match precommitted value");
+    if (keysz(tsz, ge->e->ops->c->tagsz) != tsz) VALERR("bad tag length");
+  }
+  csz = ge->e->ops->c->bufsz; c = xmalloc(csz); buf_init(&b, c, csz);
+  tag = bytestring_pywrap(0, tsz);
+  err = GAEAD_DONE(ge->e, aad == Py_None ? 0 : GAEADAAD_A(aad), &b,
+                  PyString_AS_STRING(tag), tsz);
+  assert(!err); (void)err;
+  buf_flip(&b); rc = Py_BuildValue("NN", bytestring_pywrapbuf(&b), tag);
+end:
+  xfree(c);
+  return (rc);

 }
 
 }
 

-PyObject *gmac_pywrap(PyObject *cobj, gmac *m, unsigned f)
+static PyMethodDef gaeadenc_pymethods[] = {
+#define METHNAME(name) gaeemeth_##name
+  METH  (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")
+#undef METHNAME
+  { 0 }
+};
+
+PyObject *gaeaddec_pywrap(PyObject *cobj, gaead_dec *d, unsigned f,
+                         size_t hsz, size_t csz, size_t tsz)

 {
 {

-  gmac_pyobj *g;
-  if (!cobj) cobj = gcmac_pywrap((/*unconst*/ gcmac *)GM_CLASS(m));
-  else Py_INCREF(cobj);
-  g = newtype((PyTypeObject *)cobj, 0, 0);
-  g->ty.ht_type.tp_basicsize = sizeof(ghash_pyobj);
-  g->ty.ht_name = PyString_FromFormat("%s(keyed)", m->ops->c->name);
-  g->ty.ht_type.tp_name = PyString_AS_STRING(g->ty.ht_name);
-  g->ty.ht_type.tp_base = gmhash_pytype;
-  Py_INCREF(gmac_pytype);
-  g->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
-                           Py_TPFLAGS_BASETYPE |
-                           Py_TPFLAGS_HEAPTYPE);
-  g->ty.ht_type.tp_alloc = PyType_GenericAlloc;
-  g->ty.ht_type.tp_free = 0;
-  g->ty.ht_type.tp_new = gmhash_pynew;
-  typeready(&g->ty.ht_type);
-  g->m = m;
-  g->f = f;
-  return ((PyObject *)g);
+  gaeaddec_pyobj *gd;
+  assert(cobj); Py_INCREF(cobj);
+  gd = PyObject_NEW(gaeaddec_pyobj, (PyTypeObject *)cobj);
+  gd->d = d; gd->f = f; gd->hsz = hsz; gd->csz = csz; gd->tsz = tsz;
+  gd->aad = 0; gd->clen = 0;
+  return ((PyObject *)gd);

 }
 
 }
 

-static void gmac_pydealloc(PyObject *me)
+static void gaeaddec_pydealloc(PyObject *me)

 {
 {

-  if (GMAC_F(me) & f_freeme)
-    GM_DESTROY(GMAC_M(me));
-  Py_DECREF(me->ob_type);
-  PyType_Type.tp_dealloc(me);
+  gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me;
+
+  gaea_sever(&gd->aad); GAEAD_DESTROY(GAEADDEC_D(me));
+  Py_DECREF(me->ob_type); FREEOBJ(me);

 }
 
 }
 

-static PyObject *gcmget_name(PyObject *me, void *hunoz)
-  { return (PyString_FromString(GCMAC_CM(me)->name)); }
+static PyObject *gaedget_hsz(PyObject *me, void *hunoz)
+{
+  if (GAEADDEC_F(me)&AEADF_PCHSZ) return getulong(GAEADDEC_HSZ(me));
+  else RETURN_NONE;
+}

 
 

-static PyObject *gcmget_keysz(PyObject *me, void *hunoz)
-  { return (keysz_pywrap(GCMAC_CM(me)->keysz)); }
+static PyObject *gaedget_csz(PyObject *me, void *hunoz)
+{
+  if (GAEADDEC_F(me)&AEADF_PCMSZ) return getulong(GAEADDEC_CSZ(me));
+  else RETURN_NONE;
+}

 
 

-static PyObject *gcmget_tagsz(PyObject *me, void *hunoz)
-  { return (PyInt_FromLong(GCMAC_CM(me)->hashsz)); }
+static PyObject *gaedget_tsz(PyObject *me, void *hunoz)
+{
+  if (GAEADDEC_F(me)&AEADF_PCTSZ) return getulong(GAEADDEC_TSZ(me));
+  else RETURN_NONE;
+}

 
 

-static PyGetSetDef gcmac_pygetset[] = {
-#define GETSETNAME(op, name) gcm##op##_##name
-  GET  (keysz,                 "CM.keysz -> acceptable key sizes")
-  GET  (tagsz,                 "CM.tagsz -> MAC output size")
-  GET  (name,                  "CM.name -> name of this kind of MAC")
+static PyObject *gaedget_clen(PyObject *me, void *hunoz)
+  { return getulong(GAEADDEC_CLEN(me)); }
+
+static 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'")
+  GET  (tsz,                   "DEC.tsz -> precommitted tag length or `None'")
+  GET  (clen,                  "DEC.clen -> ciphertext length so far")

 #undef GETSETNAME
   { 0 }
 };
 
 #undef GETSETNAME
   { 0 }
 };
 

-static PyTypeObject gcmac_pytype_skel = {
+static PyObject *gaedmeth_aad(PyObject *me, PyObject *arg)
+{
+  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));
+  else {
+    if (!gd->aad)
+      gd->aad = (gaeadaad_pyobj *)
+       gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(gd->ob_type)->aad,
+                       GAEAD_AAD(gd->d), gd->f&AEADF_PCHSZ, gd->hsz);
+    Py_INCREF(gd->aad);
+    return ((PyObject *)gd->aad);
+  }
+}
+
+static PyObject *gaedmeth_reinit(PyObject *me, PyObject *arg, PyObject *kw)
+{
+  static const char *const kwlist[] = { "nonce", "hsz", "csz", "tsz", 0 };
+  gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me;
+  char *n; Py_ssize_t nsz;
+  PyObject *hszobj = Py_None, *cszobj = Py_None, *tszobj = Py_None;
+  size_t hsz = 0, csz = 0, tsz = 0;
+  unsigned f;
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|OOO:enc", KWLIST,
+                                  &n, &nsz, &hszobj, &cszobj, &tszobj))
+    goto end;
+  if (check_aead_encdec(gd->d->ops->c, &f, nsz,
+                       hszobj, &hsz, cszobj, &csz, tszobj, &tsz))
+    goto end;
+  if (GAEAD_REINIT(gd->d, n, nsz, hsz, csz, tsz))
+    VALERR("bad aead parameter combination");
+  gaea_sever(&gd->aad);
+  gd->f = f; gd->hsz = hsz; gd->csz = csz; gd->tsz = tsz;
+end:
+  return (0);
+}
+
+static PyObject *gaedmeth_decrypt(PyObject *me, PyObject *arg)
+{
+  gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me;
+  char *c; Py_ssize_t csz;
+  char *m = 0; size_t msz; buf b;
+  int err;
+  PyObject *rc = 0;
+
+  if (!PyArg_ParseTuple(arg, "s#:decrypt", &c, &csz)) goto end;
+  if (gd->f&AEADF_AADFIRST) {
+    if ((gd->f&AEADF_PCHSZ) && (gd->aad ? gd->aad->hlen : 0) != gd->hsz)
+      VALERR("header doesn't match precommitted length");
+    gaea_invalidate(gd->aad);
+  }
+  if ((gd->f&AEADF_PCMSZ) && csz > gd->csz - gd->clen)
+    VALERR("too large for precommitted message length");
+  msz = csz + gd->d->ops->c->bufsz; m = xmalloc(msz); buf_init(&b, m, msz);
+  err = GAEAD_DECRYPT(gd->d, c, csz, &b); assert(!err); (void)err;
+  buf_flip(&b); rc = bytestring_pywrapbuf(&b); gd->clen += csz;
+end:
+  xfree(m);
+  return (rc);
+}
+
+static PyObject *gaedmeth_done(PyObject *me, PyObject *arg, PyObject *kw)
+{
+  static const char *const kwlist[] = { "tag", "aad", 0 };
+  gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me;
+  PyObject *aad = Py_None;
+  char *t; Py_ssize_t tsz;
+  char *m = 0; size_t msz; buf b;
+  int err;
+  PyObject *rc = 0;
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|O:done", KWLIST,
+                                  &t, &tsz, &aad))
+    goto end;
+  if (aad != Py_None &&
+      !PyObject_TypeCheck(aad,
+                         (PyTypeObject *)GCAEADENC_KEY(me->ob_type)->aad))
+    TYERR("wanted aad");
+  if ((gd->f&AEADF_AADNDEP) && aad != Py_None && aad != (PyObject *)gd->aad)
+    VALERR("mismatched aad");
+  if ((gd->f&AEADF_PCHSZ) &&
+      (aad == Py_None ? 0 : GAEADAAD_HLEN(aad)) != gd->hsz)
+    VALERR("header doesn't match precommitted length");
+  if ((gd->f&AEADF_PCMSZ) && gd->clen != gd->csz)
+    VALERR("message doesn't match precommitted length");
+  if ((gd->f&AEADF_PCTSZ) && tsz != gd->tsz)
+    VALERR("tag length doesn't match precommitted value");
+  if (keysz(tsz, gd->d->ops->c->tagsz) != tsz) VALERR("bad tag length");
+  msz = gd->d->ops->c->bufsz; m = xmalloc(msz); buf_init(&b, m, msz);
+  err = GAEAD_DONE(gd->d, aad == Py_None ? 0 : GAEADAAD_A(aad), &b, t, tsz);
+  assert(err >= 0);
+  if (!err) VALERR("decryption failed");
+  buf_flip(&b); rc = bytestring_pywrapbuf(&b);
+end:
+  xfree(m);
+  return (rc);
+}
+
+static PyMethodDef gaeaddec_pymethods[] = {
+#define METHNAME(name) gaedmeth_##name
+  METH  (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")
+#undef METHNAME
+  { 0 }
+};
+
+static PyTypeObject gcaead_pytype_skel = {

   PyObject_HEAD_INIT(0) 0,             /* Header */
   PyObject_HEAD_INIT(0) 0,             /* Header */

-  "GCMAC",                             /* @tp_name@ */
-  sizeof(gchash_pyobj),                        /* @tp_basicsize@ */
+  "GCAEAD",                            /* @tp_name@ */
+  sizeof(gcaead_pyobj),                        /* @tp_basicsize@ */

   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_dealloc@ */
   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_dealloc@ */


@@ -1066,7 +1427,7 @@ static PyTypeObject gcmac_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */

-"Message authentication code metametaclass.",
+"Authenticated encryption (key) metaclass.",

 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */


@@ -1076,7 +1437,7 @@ static PyTypeObject gcmac_pytype_skel = {
   0,                                   /* @tp_iternext@ */
   0,                                   /* @tp_methods@ */
   0,                                   /* @tp_members@ */
   0,                                   /* @tp_iternext@ */
   0,                                   /* @tp_methods@ */
   0,                                   /* @tp_members@ */

-  gcmac_pygetset,                      /* @tp_getset@ */
+  gcaead_pygetset,                     /* @tp_getset@ */

   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */


@@ -1089,13 +1450,109 @@ static PyTypeObject gcmac_pytype_skel = {
   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 

-static PyTypeObject gmac_pytype_skel = {
+static PyTypeObject gaeadkey_pytype_skel = {

   PyObject_HEAD_INIT(0) 0,             /* Header */
   PyObject_HEAD_INIT(0) 0,             /* Header */

-  "GMAC",                              /* @tp_name@ */
-  sizeof(gmac_pyobj),                  /* @tp_basicsize@ */
+  "GAEKey",                            /* @tp_name@ */
+  sizeof(gaeadkey_pyobj),              /* @tp_basicsize@ */

   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_itemsize@ */
 

-  gmac_pydealloc,                      /* @tp_dealloc@ */
+  gaeadkey_pydealloc,                  /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Authenticated encryption key.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  gaeadkey_pymethods,                  /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  0,                                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject gcaeadaad_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GAEAADClass",                       /* @tp_name@ */
+  sizeof(gcaeadaad_pyobj),             /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  0,                                   /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Authenticated encryption additional-data hash metaclass.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  0,                                   /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  0,                                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject gaeadaad_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GAEAAD",                            /* @tp_name@ */
+  sizeof(gaeadaad_pyobj),              /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  gaeadaad_pydealloc,                  /* @tp_dealloc@ */

   0,                                   /* @tp_print@ */
   0,                                   /* @tp_getattr@ */
   0,                                   /* @tp_setattr@ */
   0,                                   /* @tp_print@ */
   0,                                   /* @tp_getattr@ */
   0,                                   /* @tp_setattr@ */


@@ -1113,37 +1570,1220 @@ static PyTypeObject gmac_pytype_skel = {
   Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
     Py_TPFLAGS_BASETYPE,
 
   Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
     Py_TPFLAGS_BASETYPE,
 

-  /* @tp_doc@ */
-"Message authentication code metaclass, abstract base class.",
+  /* @tp_doc@ */
+"Authenticated encryption AAD hash.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  gaeadaad_pymethods,                  /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  gaeadaad_pygetset,                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject gcaeadenc_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GAEEncClass",                       /* @tp_name@ */
+  sizeof(gcaeadenc_pyobj),             /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  0,                                   /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Authenticated encryption operation metaclass.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  0,                                   /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  0,                                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject gaeadenc_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GAEEnc",                            /* @tp_name@ */
+  sizeof(gaeadenc_pyobj),              /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  gaeadenc_pydealloc,                  /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Authenticated encryption operation.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  gaeadenc_pymethods,                  /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  gaeadenc_pygetset,                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject gcaeaddec_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GAEDecClass",                       /* @tp_name@ */
+  sizeof(gcaeaddec_pyobj),             /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  0,                                   /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Authenticated decryption operation metaclass.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  0,                                   /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  0,                                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject gaeaddec_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GAEDec",                            /* @tp_name@ */
+  sizeof(gaeaddec_pyobj),              /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  gaeaddec_pydealloc,                  /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Authenticated decryption operation.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  gaeaddec_pymethods,                  /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  gaeaddec_pygetset,                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+/*----- Hash functions ----------------------------------------------------*/
+
+PyTypeObject *gchash_pytype, *ghash_pytype;
+
+CONVFUNC(gchash, gchash *, GCHASH_CH)
+CONVFUNC(ghash, ghash *, GHASH_H)
+
+static PyObject *ghash_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
+{
+  static const char *const kwlist[] = { 0 };
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, ":new", KWLIST))
+    goto end;
+  return (ghash_pywrap((PyObject *)ty, GH_INIT(GCHASH_CH(ty))));
+end:
+  return (0);
+}
+
+PyObject *gchash_pywrap(gchash *ch)
+{
+  gchash_pyobj *g = newtype(gchash_pytype, 0, ch->name);
+  g->ch = ch;
+  g->ty.ht_type.tp_basicsize = sizeof(ghash_pyobj);
+  g->ty.ht_type.tp_base = ghash_pytype;
+  Py_INCREF(ghash_pytype);
+  g->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
+                           Py_TPFLAGS_BASETYPE |
+                           Py_TPFLAGS_HEAPTYPE);
+  g->ty.ht_type.tp_alloc = PyType_GenericAlloc;
+  g->ty.ht_type.tp_free = 0;
+  g->ty.ht_type.tp_new = ghash_pynew;
+  typeready(&g->ty.ht_type);
+  return ((PyObject *)g);
+}
+
+PyObject *ghash_pywrap(PyObject *cobj, ghash *h)
+{
+  ghash_pyobj *g;
+  if (!cobj) cobj = gchash_pywrap((/*unconst*/ gchash *)GH_CLASS(h));
+  else Py_INCREF(cobj);
+  g = PyObject_NEW(ghash_pyobj, (PyTypeObject *)cobj);
+  g->h = h;
+  return ((PyObject *)g);
+}
+
+static void ghash_pydealloc(PyObject *me)
+{
+  GH_DESTROY(GHASH_H(me));
+  Py_DECREF(me->ob_type);
+  FREEOBJ(me);
+}
+
+static PyObject *gchget_name(PyObject *me, void *hunoz)
+  { return (PyString_FromString(GCHASH_CH(me)->name)); }
+
+static PyObject *gchget_hashsz(PyObject *me, void *hunoz)
+  { return (PyInt_FromLong(GCHASH_CH(me)->hashsz)); }
+
+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_hash(PyObject *me, PyObject *arg)
+{
+  char *p;
+  Py_ssize_t sz;
+  if (!PyArg_ParseTuple(arg, "s#:hash", &p, &sz)) return (0);
+  GH_HASH(GHASH_H(me), p, sz);
+  RETURN_ME;
+}
+
+#define GHMETH_HASHU_(n, W, w)                                         \
+  static PyObject *ghmeth_hashu##w(PyObject *me, PyObject *arg)                \
+  {                                                                    \
+    uint##n x;                                                         \
+    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) return (0); \
+    GH_HASHU##W(GHASH_H(me), x);                                       \
+    RETURN_ME;                                                         \
+  }
+DOUINTCONV(GHMETH_HASHU_)
+
+#define GHMETH_HASHBUF_(n, W, w)                                       \
+  static PyObject *ghmeth_hashbuf##w(PyObject *me, PyObject *arg)      \
+  {                                                                    \
+    char *p;                                                           \
+    Py_ssize_t sz;                                                     \
+    if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end;    \
+    if (sz > MASK##n) TYERR("string too long");                                \
+    GH_HASHBUF##W(GHASH_H(me), p, sz);                                 \
+    RETURN_ME;                                                         \
+  end:                                                                 \
+    return (0);                                                                \
+  }
+DOUINTCONV(GHMETH_HASHBUF_)
+
+static PyObject *ghmeth_hashstrz(PyObject *me, PyObject *arg)
+{
+  char *p;
+  if (!PyArg_ParseTuple(arg, "s:hashstrz", &p)) return (0);
+  GH_HASHSTRZ(GHASH_H(me), p);
+  RETURN_ME;
+}
+
+static PyObject *ghmeth_done(PyObject *me, PyObject *arg)
+{
+  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));
+  GH_DESTROY(g);
+  return (rc);
+}
+
+static 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")
+  GET  (name,                  "CH.name -> name of this kind of hash")
+#undef GETSETNAME
+  { 0 }
+};
+
+static PyMethodDef ghash_pymethods[] = {
+#define METHNAME(name) ghmeth_##name
+  METH (copy,                  "H.copy() -> HH")
+  METH (hash,                  "H.hash(M)")
+#define METHU_(n, W, w) METH(hashu##w, "H.hashu" #w "(WORD)")
+  DOUINTCONV(METHU_)
+#undef METHU_
+#define METHBUF_(n, W, w) METH(hashbuf##w, "H.hashbuf" #w "(BYTES)")
+  DOUINTCONV(METHBUF_)
+#undef METHBUF_
+  METH (hashstrz,              "H.hashstrz(STRING)")
+  METH (done,                  "H.done() -> HASH")
+#undef METHNAME
+  { 0 }
+};
+
+static PyTypeObject gchash_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GCHash",                            /* @tp_name@ */
+  sizeof(gchash_pyobj),                        /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  0,                                   /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Hash function metaclass.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  0,                                   /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  gchash_pygetset,                     /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject ghash_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GHash",                             /* @tp_name@ */
+  sizeof(ghash_pyobj),                 /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  ghash_pydealloc,                     /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Hash function, abstract base class.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  ghash_pymethods,                     /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  0,                                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+/*----- Message authentication --------------------------------------------*/
+
+PyTypeObject *gcmac_pytype, *gmac_pytype, *gmhash_pytype;
+
+CONVFUNC(gcmac, gcmac *, GCMAC_CM)
+CONVFUNC(gmac, gmac *, GMAC_M)
+CONVFUNC(gmhash, ghash *, GHASH_H)
+
+static PyObject *gmac_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
+{
+  static const char *const kwlist[] = { "k", 0 };
+  char *k;
+  Py_ssize_t sz;
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))
+    goto end;
+  if (keysz(sz, GCMAC_CM(ty)->keysz) != sz) VALERR("bad key length");
+  return (gmac_pywrap((PyObject *)ty,
+                     GM_KEY(GCMAC_CM(ty), k, sz)));
+end:
+  return (0);
+}
+
+static PyObject *gmhash_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
+{
+  static const char *const kwlist[] = { 0 };
+  ghash_pyobj *g;
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, ":new", KWLIST)) return (0);
+  g = PyObject_NEW(ghash_pyobj, ty);
+  g->h = GM_INIT(GMAC_M(ty));
+  Py_INCREF(ty);
+  return ((PyObject *)g);
+}
+
+PyObject *gcmac_pywrap(gcmac *cm)
+{
+  gcmac_pyobj *g = newtype(gcmac_pytype, 0, cm->name);
+  g->cm = cm;
+  g->ty.ht_type.tp_basicsize = sizeof(gmac_pyobj);
+  g->ty.ht_type.tp_base = gmac_pytype;
+  Py_INCREF(gmac_pytype);
+  g->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
+                           Py_TPFLAGS_BASETYPE |
+                           Py_TPFLAGS_HEAPTYPE);
+  g->ty.ht_type.tp_alloc = PyType_GenericAlloc;
+  g->ty.ht_type.tp_free = 0;
+  g->ty.ht_type.tp_new = gmac_pynew;
+  typeready(&g->ty.ht_type);
+  return ((PyObject *)g);
+}
+
+PyObject *gmac_pywrap(PyObject *cobj, gmac *m)
+{
+  gmac_pyobj *g;
+  if (!cobj) cobj = gcmac_pywrap((/*unconst*/ gcmac *)GM_CLASS(m));
+  else Py_INCREF(cobj);
+  g = newtype((PyTypeObject *)cobj, 0, 0);
+  g->ty.ht_type.tp_basicsize = sizeof(ghash_pyobj);
+  g->ty.ht_name = PyString_FromFormat("%s(keyed)", m->ops->c->name);
+  g->ty.ht_type.tp_name = PyString_AS_STRING(g->ty.ht_name);
+  g->ty.ht_type.tp_base = gmhash_pytype;
+  Py_INCREF(gmac_pytype);
+  g->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
+                           Py_TPFLAGS_BASETYPE |
+                           Py_TPFLAGS_HEAPTYPE);
+  g->ty.ht_type.tp_alloc = PyType_GenericAlloc;
+  g->ty.ht_type.tp_free = 0;
+  g->ty.ht_type.tp_new = gmhash_pynew;
+  typeready(&g->ty.ht_type);
+  g->m = m;
+  return ((PyObject *)g);
+}
+
+static void gmac_pydealloc(PyObject *me)
+{
+  GM_DESTROY(GMAC_M(me));
+  Py_DECREF(me->ob_type);
+  PyType_Type.tp_dealloc(me);
+}
+
+static PyObject *gcmget_name(PyObject *me, void *hunoz)
+  { return (PyString_FromString(GCMAC_CM(me)->name)); }
+
+static PyObject *gcmget_keysz(PyObject *me, void *hunoz)
+  { return (keysz_pywrap(GCMAC_CM(me)->keysz)); }
+
+static PyObject *gcmget_tagsz(PyObject *me, void *hunoz)
+  { return (PyInt_FromLong(GCMAC_CM(me)->hashsz)); }
+
+static PyGetSetDef gcmac_pygetset[] = {
+#define GETSETNAME(op, name) gcm##op##_##name
+  GET  (keysz,                 "CM.keysz -> acceptable key sizes")
+  GET  (tagsz,                 "CM.tagsz -> MAC output size")
+  GET  (name,                  "CM.name -> name of this kind of MAC")
+#undef GETSETNAME
+  { 0 }
+};
+
+static PyTypeObject gcmac_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GCMAC",                             /* @tp_name@ */
+  sizeof(gchash_pyobj),                        /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  0,                                   /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Message authentication code metametaclass.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  0,                                   /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  gcmac_pygetset,                      /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject gmac_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GMAC",                              /* @tp_name@ */
+  sizeof(gmac_pyobj),                  /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  gmac_pydealloc,                      /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Message authentication code metaclass, abstract base class.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  0,                                   /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  0,                                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject gmhash_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "GMACHash",                          /* @tp_name@ */
+  sizeof(ghash_pyobj),                 /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  ghash_pydealloc,                     /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Message authentication code, abstract base class.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  0,                                   /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  0,                                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+/*----- Special snowflake for Poly1305 ------------------------------------*/
+
+PyTypeObject *poly1305cls_pytype, *poly1305key_pytype, *poly1305hash_pytype;
+
+typedef struct poly1305key_pyobj {
+  PyHeapTypeObject ty;
+  poly1305_key k;
+} poly1305key_pyobj;
+
+typedef struct poly1305hash_pyobj {
+  PyObject_HEAD
+  unsigned f;
+#define f_mask 1u
+  poly1305_ctx ctx;
+} poly1305hash_pyobj;
+
+#define P1305_F(o) (((poly1305hash_pyobj *)(o))->f)
+#define P1305_CTX(o) (&((poly1305hash_pyobj *)(o))->ctx)
+CONVFUNC(poly1305hash, poly1305_ctx *, P1305_CTX)
+
+static PyObject *poly1305hash_pynew(PyTypeObject *ty,
+                                   PyObject *arg, PyObject *kw)
+{
+  static const char *const kwlist[] = { "mask", 0 };
+  poly1305key_pyobj *pk = (poly1305key_pyobj *)ty;
+  poly1305hash_pyobj *ph;
+  char *m = 0;
+  Py_ssize_t sz;
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|s#:new", KWLIST, &m, &sz))
+    return (0);
+  if (m && sz != POLY1305_MASKSZ) VALERR("bad mask length");
+  ph = PyObject_NEW(poly1305hash_pyobj, ty);
+  ph->f = 0;
+  if (m) ph->f |= f_mask;
+  poly1305_macinit(&ph->ctx, &pk->k, m);
+  Py_INCREF(ty);
+  return ((PyObject *)ph);
+end:
+  return (0);
+}
+
+static PyObject *poly1305key_pynew(PyTypeObject *ty,
+                                  PyObject *arg, PyObject *kw)
+{
+  static const char *const kwlist[] = { "k", 0 };
+  poly1305key_pyobj *pk;
+  char *k;
+  Py_ssize_t sz;
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))
+    goto end;
+  if (keysz(sz, poly1305_keysz) != sz) VALERR("bad key length");
+
+  pk = newtype(ty, 0, 0);
+  pk->ty.ht_name = PyString_FromString("poly1305(keyed)");
+  pk->ty.ht_type.tp_basicsize = sizeof(poly1305hash_pyobj);
+  pk->ty.ht_type.tp_name = PyString_AS_STRING(pk->ty.ht_name);
+  pk->ty.ht_type.tp_base = poly1305hash_pytype;
+  Py_INCREF(poly1305key_pytype);
+  pk->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
+                            Py_TPFLAGS_BASETYPE |
+                            Py_TPFLAGS_HEAPTYPE);
+  pk->ty.ht_type.tp_alloc = PyType_GenericAlloc;
+  pk->ty.ht_type.tp_free = 0;
+  pk->ty.ht_type.tp_new = poly1305hash_pynew;
+  typeready(&pk->ty.ht_type);
+
+  poly1305_keyinit(&pk->k, k, sz);
+  return ((PyObject *)pk);
+
+end:
+  return (0);
+}
+
+static PyObject *poly1305clsget_name(PyObject *me, void *hunoz)
+  { return (PyString_FromString("poly1305")); }
+
+static PyObject *poly1305clsget_keysz(PyObject *me, void *hunoz)
+  { return (keysz_pywrap(poly1305_keysz)); }
+
+static PyObject *poly1305clsget_masksz(PyObject *me, void *hunoz)
+  { return (PyInt_FromLong(POLY1305_MASKSZ)); }
+
+static PyObject *poly1305clsget_tagsz(PyObject *me, void *hunoz)
+  { return (PyInt_FromLong(POLY1305_TAGSZ)); }
+
+static PyObject *polymeth_copy(PyObject *me, PyObject *arg)
+{
+  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);
+  return ((PyObject *)ph);
+}
+
+static PyObject *polymeth_hash(PyObject *me, PyObject *arg)
+{
+  char *p;
+  Py_ssize_t sz;
+  if (!PyArg_ParseTuple(arg, "s#:hash", &p, &sz)) return (0);
+  poly1305_hash(P1305_CTX(me), p, sz);
+  RETURN_ME;
+}
+
+#define POLYMETH_HASHU_(n, W, w)                                       \
+  static PyObject *polymeth_hashu##w(PyObject *me, PyObject *arg)      \
+  {                                                                    \
+    uint##n x;                                                         \
+    octet b[SZ_##W];                                                   \
+    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) return (0); \
+    STORE##W(b, x); poly1305_hash(P1305_CTX(me), b, sizeof(b));                \
+    RETURN_ME;                                                         \
+  }
+DOUINTCONV(POLYMETH_HASHU_)
+
+#define POLYMETH_HASHBUF_(n, W, w)                                     \
+  static PyObject *polymeth_hashbuf##w(PyObject *me, PyObject *arg)    \
+  {                                                                    \
+    char *p;                                                           \
+    Py_ssize_t sz;                                                     \
+    octet b[SZ_##W];                                                   \
+    if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end;    \
+    if (sz > MASK##n) TYERR("string too long");                                \
+    STORE##W(b, sz); poly1305_hash(P1305_CTX(me), b, sizeof(b));       \
+    poly1305_hash(P1305_CTX(me), p, sz);                               \
+    RETURN_ME;                                                         \
+  end:                                                                 \
+    return (0);                                                                \
+  }
+DOUINTCONV(POLYMETH_HASHBUF_)
+
+static PyObject *polymeth_hashstrz(PyObject *me, PyObject *arg)
+{
+  char *p;
+  if (!PyArg_ParseTuple(arg, "s:hashstrz", &p)) return (0);
+  poly1305_hash(P1305_CTX(me), p, strlen(p) + 1);
+  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_flushzero(PyObject *me, PyObject *arg)
+{
+  if (!PyArg_ParseTuple(arg, ":flushzero")) return (0);
+  poly1305_flushzero(P1305_CTX(me));
+  RETURN_ME;
+}
+
+static PyObject *polymeth_concat(PyObject *me, PyObject *arg)
+{
+  PyObject *pre, *suff;
+  if (!PyArg_ParseTuple(arg, "OO:concat", &pre, &suff)) return (0);
+  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)
+    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));
+  RETURN_ME;
+end:
+  return (0);
+}
+
+static PyObject *polymeth_done(PyObject *me, PyObject *arg)
+{
+  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));
+  return (rc);
+end:
+  return (0);
+}
+
+static PyGetSetDef poly1305cls_pygetset[] = {
+#define GETSETNAME(op, name) poly1305cls##op##_##name
+  GET  (keysz,                 "PC.keysz -> acceptable key sizes")
+  GET  (masksz,                "PC.masksz -> mask size")
+  GET  (tagsz,                 "PC.tagsz -> MAC output size")
+  GET  (name,                  "PC.name -> name of this kind of MAC")
+#undef GETSETNAME
+  { 0 }
+};
+
+static PyMethodDef poly1305hash_pymethods[] = {
+#define METHNAME(name) polymeth_##name
+  METH  (copy,                 "P.copy() -> PP")
+  METH (hash,                  "P.hash(M)")
+#define METHU_(n, W, w) METH(hashu##w, "P.hashu" #w "(WORD)")
+  DOUINTCONV(METHU_)
+#undef METHU_
+#define METHBUF_(n, W, w) METH(hashbuf##w, "P.hashbuf" #w "(BYTES)")
+  DOUINTCONV(METHBUF_)
+#undef METHBUF_
+  METH (hashstrz,              "P.hashstrz(STRING)")
+  METH  (flush,                        "P.flush()")
+  METH  (flushzero,            "P.flushzero()")
+  METH  (concat,               "P.concat(PREFIX, SUFFIX)")
+  METH (done,                  "P.done() -> TAG")
+#undef METHNAME
+  { 0 }
+};
+
+static PyTypeObject poly1305cls_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "Poly1305Class",                     /* @tp_name@ */
+  sizeof(PyHeapTypeObject),            /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  0,                                   /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Poly1305 metametaclass.  Best not to ask.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  0,                                   /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  poly1305cls_pygetset,                        /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject poly1305key_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "poly1305",                          /* @tp_name@ */
+  sizeof(poly1305key_pyobj),           /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  0,                                   /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"poly1305(K): Poly1305 key.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  0,                                   /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  0,                                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  poly1305key_pynew,                   /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+static PyTypeObject poly1305hash_pytype_skel = {
+  PyObject_HEAD_INIT(0) 0,             /* Header */
+  "Poly1305Hash",                      /* @tp_name@ */
+  sizeof(poly1305hash_pyobj),          /* @tp_basicsize@ */
+  0,                                   /* @tp_itemsize@ */
+
+  0,                                   /* @tp_dealloc@ */
+  0,                                   /* @tp_print@ */
+  0,                                   /* @tp_getattr@ */
+  0,                                   /* @tp_setattr@ */
+  0,                                   /* @tp_compare@ */
+  0,                                   /* @tp_repr@ */
+  0,                                   /* @tp_as_number@ */
+  0,                                   /* @tp_as_sequence@ */
+  0,                                   /* @tp_as_mapping@ */
+  0,                                   /* @tp_hash@ */
+  0,                                   /* @tp_call@ */
+  0,                                   /* @tp_str@ */
+  0,                                   /* @tp_getattro@ */
+  0,                                   /* @tp_setattro@ */
+  0,                                   /* @tp_as_buffer@ */
+  Py_TPFLAGS_DEFAULT |                 /* @tp_flags@ */
+    Py_TPFLAGS_BASETYPE,
+
+  /* @tp_doc@ */
+"Poly1305 MAC context base class.",
+
+  0,                                   /* @tp_traverse@ */
+  0,                                   /* @tp_clear@ */
+  0,                                   /* @tp_richcompare@ */
+  0,                                   /* @tp_weaklistoffset@ */
+  0,                                   /* @tp_iter@ */
+  0,                                   /* @tp_iternext@ */
+  poly1305hash_pymethods,              /* @tp_methods@ */
+  0,                                   /* @tp_members@ */
+  0,                                   /* @tp_getset@ */
+  0,                                   /* @tp_base@ */
+  0,                                   /* @tp_dict@ */
+  0,                                   /* @tp_descr_get@ */
+  0,                                   /* @tp_descr_set@ */
+  0,                                   /* @tp_dictoffset@ */
+  0,                                   /* @tp_init@ */
+  PyType_GenericAlloc,                 /* @tp_alloc@ */
+  abstract_pynew,                      /* @tp_new@ */
+  0,                                   /* @tp_free@ */
+  0                                    /* @tp_is_gc@ */
+};
+
+/*----- Special snowflake for HSalsa and HChaCha --------------------------*/
+
+#define DEF_HDANCE(DANCE, HDANCE, dance, hdance)                       \
+  static PyObject *meth_##hdance##_prf(PyObject *me, PyObject *arg)    \
+  {                                                                    \
+    dance##_ctx dance;                                                 \
+    char *k, *n;                                                       \
+    Py_ssize_t ksz, nsz;                                               \
+    PyObject *rc;                                                      \
+    if (!PyArg_ParseTuple(arg, "s#s#:" #hdance "_prf",                 \
+                         &k, &ksz, &n, &nsz))                          \
+      goto end;                                                                \
+    if (ksz != DANCE##_KEYSZ) VALERR("bad key length");                        \
+    if (nsz != HDANCE##_INSZ) VALERR("bad input length");              \
+    rc = bytestring_pywrap(0, HSALSA20_OUTSZ);                         \
+    dance##_init(&dance, k, ksz, 0);                                   \
+    hdance##_prf(&dance, n, PyString_AS_STRING(rc));                   \
+    return (rc);                                                       \
+  end:                                                                 \
+    return (0);                                                                \
+  }
+
+DEF_HDANCE(SALSA20, HSALSA20, salsa20, hsalsa20)
+DEF_HDANCE(SALSA20, HSALSA20, salsa20, hsalsa2012)
+DEF_HDANCE(SALSA20, HSALSA20, salsa20, hsalsa208)
+
+DEF_HDANCE(CHACHA, HCHACHA, chacha, hchacha20)
+DEF_HDANCE(CHACHA, HCHACHA, chacha, hchacha12)
+DEF_HDANCE(CHACHA, HCHACHA, chacha, hchacha8)
+
+/*----- Keccak-p[1600, n] -------------------------------------------------*/
+
+static PyTypeObject *kxvik_pytype;
+
+typedef struct kxvik_pyobj {
+  PyObject_HEAD
+  keccak1600_state s;
+  unsigned n;
+} kxvik_pyobj;
+
+static PyObject *kxvik_pynew(PyTypeObject *ty,
+                                 PyObject *arg, PyObject *kw)
+{
+  unsigned n = 24;
+  kxvik_pyobj *rc = 0;
+  static const char *const kwlist[] = { "nround", 0 };
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:new", KWLIST,
+                                  convuint, &n))
+    goto end;
+  rc = (kxvik_pyobj *)ty->tp_alloc(ty, 0);
+  rc->n = n;
+  keccak1600_init(&rc->s);
+end:
+  return ((PyObject *)rc);
+}
+
+static PyObject *kxvikmeth_copy(PyObject *me, PyObject *arg)
+{
+  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);
+}
+
+static PyObject *kxvikmeth_mix(PyObject *me, PyObject *arg)
+{
+  kxvik_pyobj *k = (kxvik_pyobj *)me;
+  kludge64 t[25];
+  const octet *q;
+  octet buf[8];
+  unsigned i;
+  char *p; Py_ssize_t n;
+
+  if (!PyArg_ParseTuple(arg, "s#:mix", &p, &n)) goto end;
+  if (n > 200) VALERR("out of range");
+  q = (const octet *)p;
+  i = 0;
+  while (n > 8) { LOAD64_L_(t[i], q); i++; q += 8; n -= 8; }
+  if (n) {
+    memcpy(buf, q, n); memset(buf + n, 0, 8 - n);
+    LOAD64_L_(t[i], buf); i++;
+  }
+  keccak1600_mix(&k->s, t, i);
+  RETURN_ME;
+end:
+  return (0);
+}
+
+static PyObject *kxvikmeth_extract(PyObject *me, PyObject *arg)
+{
+  kxvik_pyobj *k = (kxvik_pyobj *)me;
+  PyObject *rc = 0;
+  kludge64 t[25];
+  octet *q, buf[8];
+  unsigned i;
+  unsigned n;
+
+  if (!PyArg_ParseTuple(arg, "O&:mix", convuint, &n)) goto end;
+  if (n > 200) VALERR("out of range");
+  rc = bytestring_pywrap(0, n);
+  q = (octet *)PyString_AS_STRING(rc);
+  keccak1600_extract(&k->s, t, (n + 7)/8);
+  i = 0;
+  while (n > 8) { STORE64_L_(q, t[i]); i++; q += 8; n -= 8; }
+  if (n) { STORE64_L_(buf, t[i]); memcpy(q, buf, n); }
+end:
+  return (rc);
+}
+
+static PyObject *kxvikmeth_step(PyObject *me, PyObject *arg)
+{
+  kxvik_pyobj *k = (kxvik_pyobj *)me;
+  if (!PyArg_ParseTuple(arg, ":step")) return (0);
+  keccak1600_p(&k->s, &k->s, k->n);
+  RETURN_ME;
+}

 
 

-  0,                                   /* @tp_traverse@ */
-  0,                                   /* @tp_clear@ */
-  0,                                   /* @tp_richcompare@ */
-  0,                                   /* @tp_weaklistoffset@ */
-  0,                                   /* @tp_iter@ */
-  0,                                   /* @tp_iternext@ */
-  0,                                   /* @tp_methods@ */
-  0,                                   /* @tp_members@ */
-  0,                                   /* @tp_getset@ */
-  0,                                   /* @tp_base@ */
-  0,                                   /* @tp_dict@ */
-  0,                                   /* @tp_descr_get@ */
-  0,                                   /* @tp_descr_set@ */
-  0,                                   /* @tp_dictoffset@ */
-  0,                                   /* @tp_init@ */
-  PyType_GenericAlloc,                 /* @tp_alloc@ */
-  abstract_pynew,                      /* @tp_new@ */
-  0,                                   /* @tp_free@ */
-  0                                    /* @tp_is_gc@ */
+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;
+
+  if (!convuint(val, &n)) return (-1);
+  k->n = n;
+  return (0);
+}
+
+static PyGetSetDef kxvik_pygetset[] = {
+#define GETSETNAME(op, name) kxvik##op##_##name
+  GETSET(nround,               "KECCAK.nround -> number of rounds")
+#undef GETSETNAME
+  { 0 }

 };
 
 };
 

-static PyTypeObject gmhash_pytype_skel = {
+static PyMethodDef kxvik_pymethods[] = {
+#define METHNAME(func) kxvikmeth_##func
+  METH (copy,                  "KECCAK.copy() -> KECCAK'")
+  METH (mix,                   "KECCAK.mix(DATA)")
+  METH (extract,               "KECCAK.extract(NOCTETS)")
+  METH (step,                  "KECCAK.step()")
+#undef METHNAME
+  { 0 }
+};
+
+static PyTypeObject kxvik_pytype_skel = {

   PyObject_HEAD_INIT(0) 0,             /* Header */
   PyObject_HEAD_INIT(0) 0,             /* Header */

-  "GMACHash",                          /* @tp_name@ */
-  sizeof(ghash_pyobj),                 /* @tp_basicsize@ */
+  "Keccak1600",                                /* @tp_name@ */
+  sizeof(kxvik_pyobj),                 /* @tp_basicsize@ */

   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_itemsize@ */
 

-  ghash_pydealloc,                     /* @tp_dealloc@ */
+  0,                                   /* @tp_dealloc@ */

   0,                                   /* @tp_print@ */
   0,                                   /* @tp_getattr@ */
   0,                                   /* @tp_setattr@ */
   0,                                   /* @tp_print@ */
   0,                                   /* @tp_getattr@ */
   0,                                   /* @tp_setattr@ */


@@ -1162,7 +2802,7 @@ static PyTypeObject gmhash_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */

-"Message authentication code, abstract base class.",
+"Keccak1600([nround = 24]): Keccak-p[1600, n] state.",

 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */


@@ -1170,9 +2810,9 @@ static PyTypeObject gmhash_pytype_skel = {
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */

-  0,                                   /* @tp_methods@ */
+  kxvik_pymethods,                     /* @tp_methods@ */

   0,                                   /* @tp_members@ */
   0,                                   /* @tp_members@ */

-  0,                                   /* @tp_getset@ */
+  kxvik_pygetset,                      /* @tp_getset@ */

   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */


@@ -1180,221 +2820,214 @@ static PyTypeObject gmhash_pytype_skel = {
   0,                                   /* @tp_dictoffset@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   0,                                   /* @tp_dictoffset@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */

-  abstract_pynew,                      /* @tp_new@ */
+  kxvik_pynew,                         /* @tp_new@ */

   0,                                   /* @tp_free@ */
   0                                    /* @tp_is_gc@ */
 };
 
   0,                                   /* @tp_free@ */
   0                                    /* @tp_is_gc@ */
 };
 

-/*----- Special snowflake for Poly1305 ------------------------------------*/
-
-PyTypeObject *poly1305cls_pytype, *poly1305key_pytype, *poly1305hash_pytype;
-
-typedef struct poly1305key_pyobj {
-  PyHeapTypeObject ty;
-  poly1305_key k;
-} poly1305key_pyobj;
+static PyTypeObject *shake_pytype, *shake128_pytype, *shake256_pytype;

 
 

-typedef struct poly1305hash_pyobj {
+typedef struct shake_pyobj {

   PyObject_HEAD
   PyObject_HEAD

-  unsigned f;
-#define f_mask 1u
-  poly1305_ctx ctx;
-} poly1305hash_pyobj;
-
-#define P1305_F(o) (((poly1305hash_pyobj *)(o))->f)
-#define P1305_CTX(o) (&((poly1305hash_pyobj *)(o))->ctx)
-CONVFUNC(poly1305hash, poly1305_ctx *, P1305_CTX)
-
-static PyObject *poly1305hash_pynew(PyTypeObject *ty,
-                                   PyObject *arg, PyObject *kw)
-{
-  char *kwlist[] = { "mask", 0 };
-  poly1305key_pyobj *pk = (poly1305key_pyobj *)ty;
-  poly1305hash_pyobj *ph;
-  char *m = 0;
-  Py_ssize_t sz;
-
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|s#:new", kwlist, &m, &sz))
-    return (0);
-  if (m && sz != POLY1305_MASKSZ) VALERR("bad mask length");
-  ph = PyObject_NEW(poly1305hash_pyobj, ty);
-  ph->f = 0;
-  if (m) ph->f |= f_mask;
-  poly1305_macinit(&ph->ctx, &pk->k, m);
-  Py_INCREF(ty);
-  return ((PyObject *)ph);
-end:
-  return (0);
-}
-
-static PyObject *poly1305key_pynew(PyTypeObject *ty,
-                                  PyObject *arg, PyObject *kw)
+  int st;
+  shake_ctx h;
+} shake_pyobj;
+
+#define SHAKE_H(o) (&((shake_pyobj *)(o))->h)
+#define SHAKE_ST(o) (((shake_pyobj *)(o))->st)
+
+static PyObject *shake_dopynew(void (*initfn)(shake_ctx *,
+                                             const void *, size_t,
+                                             const void *, size_t),
+                              PyTypeObject *ty,
+                              PyObject *arg, PyObject *kw)

 {
 {

-  char *kwlist[] = { "k", 0 };
-  poly1305key_pyobj *pk;
-  char *k;
-  Py_ssize_t sz;
+  shake_pyobj *rc = 0;
+  char *p = 0, *f = 0;
+  Py_ssize_t psz = 0, fsz = 0;
+  static const char *const kwlist[] = { "perso", "func", 0 };

 
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", kwlist, &k, &sz))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|s#s#:new", KWLIST,
+                                  &p, &psz, &f, &fsz))

     goto end;
     goto end;

-  if (keysz(sz, poly1305_keysz) != sz) VALERR("bad key length");
-
-  pk = newtype(ty, 0, 0);
-  pk->ty.ht_name = PyString_FromString("poly1305(keyed)");
-  pk->ty.ht_type.tp_basicsize = sizeof(poly1305hash_pyobj);
-  pk->ty.ht_type.tp_name = PyString_AS_STRING(pk->ty.ht_name);
-  pk->ty.ht_type.tp_base = poly1305hash_pytype;
-  Py_INCREF(poly1305key_pytype);
-  pk->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
-                            Py_TPFLAGS_BASETYPE |
-                            Py_TPFLAGS_HEAPTYPE);
-  pk->ty.ht_type.tp_alloc = PyType_GenericAlloc;
-  pk->ty.ht_type.tp_free = 0;
-  pk->ty.ht_type.tp_new = poly1305hash_pynew;
-  typeready(&pk->ty.ht_type);
-
-  poly1305_keyinit(&pk->k, k, sz);
-  return ((PyObject *)pk);
-
+  rc = (shake_pyobj *)ty->tp_alloc(ty, 0);
+  initfn(&rc->h, f, fsz, p, psz);
+  rc->st = 0;

 end:
 end:

-  return (0);
+  return ((PyObject *)rc);

 }
 
 }
 

-static PyObject *poly1305clsget_name(PyObject *me, void *hunoz)
-  { return (PyString_FromString("poly1305")); }
-
-static PyObject *poly1305clsget_keysz(PyObject *me, void *hunoz)
-  { return (keysz_pywrap(poly1305_keysz)); }
-
-static PyObject *poly1305clsget_masksz(PyObject *me, void *hunoz)
-  { return (PyInt_FromLong(POLY1305_MASKSZ)); }
+static PyObject *shake128_pynew(PyTypeObject *ty,
+                               PyObject *arg, PyObject *kw)
+  { return (shake_dopynew(cshake128_init, ty, arg, kw)); }

 
 

-static PyObject *poly1305clsget_tagsz(PyObject *me, void *hunoz)
-  { return (PyInt_FromLong(POLY1305_TAGSZ)); }
+static PyObject *shake256_pynew(PyTypeObject *ty,
+                               PyObject *arg, PyObject *kw)
+  { return (shake_dopynew(cshake256_init, ty, arg, kw)); }

 
 

-static PyObject *polymeth_copy(PyObject *me, PyObject *arg)
+static int shake_check(PyObject *me, int st)

 {
 {

-  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);
-  return ((PyObject *)ph);
+  if (SHAKE_ST(me) != st) VALERR("wrong state");
+  return (0);
+end:
+  return (-1);

 }
 
 }
 

-static PyObject *polymeth_hash(PyObject *me, PyObject *arg)
+static PyObject *shakemeth_hash(PyObject *me, PyObject *arg)

 {
   char *p;
   Py_ssize_t sz;
   if (!PyArg_ParseTuple(arg, "s#:hash", &p, &sz)) return (0);
 {
   char *p;
   Py_ssize_t sz;
   if (!PyArg_ParseTuple(arg, "s#:hash", &p, &sz)) return (0);

-  poly1305_hash(P1305_CTX(me), p, sz);
+  if (shake_check(me, 0)) return (0);
+  shake_hash(SHAKE_H(me), p, sz);

   RETURN_ME;
 }
 
   RETURN_ME;
 }
 

-#define POLYMETH_HASHU_(n, W, w)                                       \
-  static PyObject *polymeth_hashu##w(PyObject *me, PyObject *arg)      \
+#define SHAKEMETH_HASHU_(n, W, w)                                      \
+  static PyObject *shakemeth_hashu##w(PyObject *me, PyObject *arg)     \

   {                                                                    \
     uint##n x;                                                         \
     octet b[SZ_##W];                                                   \
   {                                                                    \
     uint##n x;                                                         \
     octet b[SZ_##W];                                                   \

-    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) goto end; \
-    STORE##W(b, n); poly1305_hash(P1305_CTX(me), b, sizeof(b));                \
+    if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) return (0); \
+    if (shake_check(me, 0)) return (0);                                        \
+    STORE##W(b, x); shake_hash(SHAKE_H(me), b, sizeof(b));             \

     RETURN_ME;                                                         \
     RETURN_ME;                                                         \

-  end:                                                                 \
-    return (0);                                                                \

   }
   }

-DOUINTCONV(POLYMETH_HASHU_)
+DOUINTCONV(SHAKEMETH_HASHU_)

 
 

-#define POLYMETH_HASHBUF_(n, W, w)                                     \
-  static PyObject *polymeth_hashbuf##w(PyObject *me, PyObject *arg)    \
+#define SHAKEMETH_HASHBUF_(n, W, w)                                    \
+  static PyObject *shakemeth_hashbuf##w(PyObject *me, PyObject *arg)   \

   {                                                                    \
     char *p;                                                           \
     Py_ssize_t sz;                                                     \
     octet b[SZ_##W];                                                   \
     if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end;    \
     if (sz > MASK##n) TYERR("string too long");                                \
   {                                                                    \
     char *p;                                                           \
     Py_ssize_t sz;                                                     \
     octet b[SZ_##W];                                                   \
     if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end;    \
     if (sz > MASK##n) TYERR("string too long");                                \

-    STORE##W(b, n); poly1305_hash(P1305_CTX(me), b, sizeof(b));                \
-    poly1305_hash(P1305_CTX(me), p, sz);                               \
+    if (shake_check(me, 0)) goto end;                                  \
+    STORE##W(b, sz); shake_hash(SHAKE_H(me), b, sizeof(b));            \
+    shake_hash(SHAKE_H(me), p, sz);                                    \

     RETURN_ME;                                                         \
   end:                                                                 \
     return (0);                                                                \
   }
     RETURN_ME;                                                         \
   end:                                                                 \
     return (0);                                                                \
   }

-DOUINTCONV(POLYMETH_HASHBUF_)
+DOUINTCONV(SHAKEMETH_HASHBUF_)

 
 

-static PyObject *polymeth_hashstrz(PyObject *me, PyObject *arg)
+static PyObject *shakemeth_hashstrz(PyObject *me, PyObject *arg)

 {
   char *p;
   if (!PyArg_ParseTuple(arg, "s:hashstrz", &p)) return (0);
 {
   char *p;
   if (!PyArg_ParseTuple(arg, "s:hashstrz", &p)) return (0);

-  poly1305_hash(P1305_CTX(me), p, strlen(p) + 1);
+  if (shake_check(me, 0)) return (0);
+  shake_hash(SHAKE_H(me), p, strlen(p) + 1);

   RETURN_ME;
 }
 
   RETURN_ME;
 }
 

-static PyObject *polymeth_flush(PyObject *me, PyObject *arg)
+static PyObject *shakemeth_xof(PyObject *me, PyObject *arg)

 {
 {

-  if (!PyArg_ParseTuple(arg, ":flush")) return (0);
-  poly1305_flush(P1305_CTX(me));
+  if (!PyArg_ParseTuple(arg, ":xof")) goto end;
+  if (shake_check(me, 0)) goto end;
+  shake_xof(SHAKE_H(me));
+  SHAKE_ST(me) = 1;

   RETURN_ME;
   RETURN_ME;

+end:
+  return (0);

 }
 
 }
 

-static PyObject *polymeth_concat(PyObject *me, PyObject *arg)
+static PyObject *shakemeth_done(PyObject *me, PyObject *arg)

 {
 {

-  PyObject *pre, *suff;
-  if (!PyArg_ParseTuple(arg, "OO:concat", &pre, &suff)) return (0);
-  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)
-    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));
-  RETURN_ME;
+  PyObject *rc = 0;
+  size_t n;
+  if (!PyArg_ParseTuple(arg, "O&:done", convszt, &n)) goto end;
+  if (shake_check(me, 0)) goto end;
+  rc = bytestring_pywrap(0, n);
+  shake_done(SHAKE_H(me), PyString_AS_STRING(rc), n);
+  SHAKE_ST(me) = -1;

 end:
 end:

-  return (0);
+  return (rc);

 }
 
 }
 

-static PyObject *polymeth_done(PyObject *me, PyObject *arg)
+static PyObject *shakemeth_copy(PyObject *me, PyObject *arg)

 {
 {

-  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));
+  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 *)me);
+}
+
+static PyObject *shakemeth_get(PyObject *me, PyObject *arg)
+{
+  PyObject *rc = 0;
+  size_t sz;
+
+  if (!PyArg_ParseTuple(arg, "O&:get", convszt, &sz)) goto end;
+  if (shake_check(me, 1)) goto end;
+  rc = bytestring_pywrap(0, sz);
+  shake_get(SHAKE_H(me), PyString_AS_STRING(rc), sz);
+end:

   return (rc);
   return (rc);

+}
+
+static PyObject *shakemeth_mask(PyObject *me, PyObject *arg)
+{
+  PyObject *rc = 0;
+  char *p; Py_ssize_t sz;
+
+  if (!PyArg_ParseTuple(arg, "s#:mask", &p, &sz)) goto end;
+  if (shake_check(me, 1)) goto end;
+  rc = bytestring_pywrap(0, sz);
+  shake_mask(SHAKE_H(me), p, PyString_AS_STRING(rc), sz);

 end:
 end:

-  return (0);
+  return (rc);

 }
 
 }
 

-static PyGetSetDef poly1305cls_pygetset[] = {
-#define GETSETNAME(op, name) poly1305cls##op##_##name
-  GET  (keysz,                 "PC.keysz -> acceptable key sizes")
-  GET  (masksz,                "PC.masksz -> mask size")
-  GET  (tagsz,                 "PC.tagsz -> MAC output size")
-  GET  (name,                  "PC.name -> name of this kind of MAC")
+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);
+  return (PyString_FromString(st == 0 ? "absorb" :
+                             st == 1 ? "squeeze" : "dead"));
+}
+
+static 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 }
 };
 
 #undef GETSETNAME
   { 0 }
 };
 

-static PyMethodDef poly1305hash_pymethods[] = {
-#define METHNAME(name) polymeth_##name
-  METH  (copy,                 "P.copy() -> PP")
-  METH (hash,                  "P.hash(M)")
-#define METHU_(n, W, w) METH(hashu##w, "P.hashu" #w "(WORD)")
+static PyMethodDef shake_pymethods[] = {
+#define METHNAME(func) shakemeth_##func
+  METH  (copy,                 "S.copy() -> SS")
+  METH (hash,                  "S.hash(M)")
+#define METHU_(n, W, w) METH(hashu##w, "S.hashu" #w "(WORD)")

   DOUINTCONV(METHU_)
 #undef METHU_
   DOUINTCONV(METHU_)
 #undef METHU_

-#define METHBUF_(n, W, w) METH(hashbuf##w, "P.hashbuf" #w "(BYTES)")
+#define METHBUF_(n, W, w) METH(hashbuf##w, "S.hashbuf" #w "(BYTES)")

   DOUINTCONV(METHBUF_)
 #undef METHBUF_
   DOUINTCONV(METHBUF_)
 #undef METHBUF_

-  METH (hashstrz,              "P.hashstrz(STRING)")
-  METH  (flush,                        "P.flush()")
-  METH  (concat,               "P.concat(PREFIX, SUFFIX)")
-  METH (done,                  "P.done() -> TAG")
+  METH (hashstrz,              "S.hashstrz(STRING)")
+  METH (xof,                   "S.xof()")
+  METH (done,                  "S.done(LEN) ->H")
+  METH (get,                   "S.get(LEN) -> H")
+  METH (mask,                  "S.mask(M) -> C")

 #undef METHNAME
   { 0 }
 };
 
 #undef METHNAME
   { 0 }
 };
 

-static PyTypeObject poly1305cls_pytype_skel = {
+static PyTypeObject shake_pytype_skel = {

   PyObject_HEAD_INIT(0) 0,             /* Header */
   PyObject_HEAD_INIT(0) 0,             /* Header */

-  "Poly1305Class",                     /* @tp_name@ */
-  sizeof(PyHeapTypeObject),            /* @tp_basicsize@ */
+  "Shake",                             /* @tp_name@ */
+  sizeof(shake_pyobj),                 /* @tp_basicsize@ */

   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_dealloc@ */
   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_dealloc@ */


@@ -1416,7 +3049,7 @@ static PyTypeObject poly1305cls_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */

-"Poly1305 metametaclass.  Best not to ask.",
+"SHAKE/cSHAKE base class.",

 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */


@@ -1424,9 +3057,9 @@ static PyTypeObject poly1305cls_pytype_skel = {
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */

-  0,                                   /* @tp_methods@ */
+  shake_pymethods,                     /* @tp_methods@ */

   0,                                   /* @tp_members@ */
   0,                                   /* @tp_members@ */

-  poly1305cls_pygetset,                        /* @tp_getset@ */
+  shake_pygetset,                      /* @tp_getset@ */

   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_dict@ */
   0,                                   /* @tp_descr_get@ */


@@ -1439,10 +3072,10 @@ static PyTypeObject poly1305cls_pytype_skel = {
   0                                    /* @tp_is_gc@ */
 };
 
   0                                    /* @tp_is_gc@ */
 };
 

-static PyTypeObject poly1305key_pytype_skel = {
+static PyTypeObject shake128_pytype_skel = {

   PyObject_HEAD_INIT(0) 0,             /* Header */
   PyObject_HEAD_INIT(0) 0,             /* Header */

-  "poly1305",                          /* @tp_name@ */
-  sizeof(poly1305key_pyobj),           /* @tp_basicsize@ */
+  "Shake128",                          /* @tp_name@ */
+  0,                                   /* @tp_basicsize@ */

   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_dealloc@ */
   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_dealloc@ */


@@ -1464,7 +3097,7 @@ static PyTypeObject poly1305key_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */

-"Poly1305 key.",
+"Shake128([perso = STR], [func = STR]): SHAKE128/cSHAKE128 XOF.",

 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */


@@ -1482,15 +3115,15 @@ static PyTypeObject poly1305key_pytype_skel = {
   0,                                   /* @tp_dictoffset@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   0,                                   /* @tp_dictoffset@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */

-  poly1305key_pynew,                   /* @tp_new@ */
+  shake128_pynew,                      /* @tp_new@ */

   0,                                   /* @tp_free@ */
   0                                    /* @tp_is_gc@ */
 };
 
   0,                                   /* @tp_free@ */
   0                                    /* @tp_is_gc@ */
 };
 

-static PyTypeObject poly1305hash_pytype_skel = {
+static PyTypeObject shake256_pytype_skel = {

   PyObject_HEAD_INIT(0) 0,             /* Header */
   PyObject_HEAD_INIT(0) 0,             /* Header */

-  "Poly1305Hash",                      /* @tp_name@ */
-  sizeof(poly1305hash_pyobj),          /* @tp_basicsize@ */
+  "Shake256",                          /* @tp_name@ */
+  0,                                   /* @tp_basicsize@ */

   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_dealloc@ */
   0,                                   /* @tp_itemsize@ */
 
   0,                                   /* @tp_dealloc@ */


@@ -1512,7 +3145,7 @@ static PyTypeObject poly1305hash_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */

-"Poly1305 MAC context base class.",
+"Shake256([perso = STR], [func = STR]): SHAKE256/cSHAKE256 XOF.",

 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */


@@ -1520,7 +3153,7 @@ static PyTypeObject poly1305hash_pytype_skel = {
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */

-  poly1305hash_pymethods,              /* @tp_methods@ */
+  0,                                   /* @tp_methods@ */

   0,                                   /* @tp_members@ */
   0,                                   /* @tp_getset@ */
   0,                                   /* @tp_base@ */
   0,                                   /* @tp_members@ */
   0,                                   /* @tp_getset@ */
   0,                                   /* @tp_base@ */


@@ -1530,41 +3163,11 @@ static PyTypeObject poly1305hash_pytype_skel = {
   0,                                   /* @tp_dictoffset@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */
   0,                                   /* @tp_dictoffset@ */
   0,                                   /* @tp_init@ */
   PyType_GenericAlloc,                 /* @tp_alloc@ */

-  abstract_pynew,                      /* @tp_new@ */
+  shake256_pynew,                      /* @tp_new@ */

   0,                                   /* @tp_free@ */
   0                                    /* @tp_is_gc@ */
 };
 
   0,                                   /* @tp_free@ */
   0                                    /* @tp_is_gc@ */
 };
 

-/*----- Special snowflake for HSalsa and HChaCha --------------------------*/
-
-#define DEF_HDANCE(DANCE, HDANCE, dance, hdance)                       \
-  static PyObject *meth_##hdance##_prf(PyObject *me, PyObject *arg)    \
-  {                                                                    \
-    dance##_ctx dance;                                                 \
-    char *k, *n;                                                       \
-    Py_ssize_t ksz, nsz;                                               \
-    PyObject *rc;                                                      \
-    if (!PyArg_ParseTuple(arg, "s#s#:" #hdance "_prf",                 \
-                         &k, &ksz, &n, &nsz))                          \
-      goto end;                                                                \
-    if (ksz != DANCE##_KEYSZ) VALERR("bad key length");                        \
-    if (nsz != HDANCE##_INSZ) VALERR("bad input length");              \
-    rc = bytestring_pywrap(0, HSALSA20_OUTSZ);                         \
-    dance##_init(&dance, k, ksz, 0);                                   \
-    hdance##_prf(&dance, n, PyString_AS_STRING(rc));                   \
-    return (rc);                                                       \
-  end:                                                                 \
-    return (0);                                                                \
-  }
-
-DEF_HDANCE(SALSA20, HSALSA20, salsa20, hsalsa20)
-DEF_HDANCE(SALSA20, HSALSA20, salsa20, hsalsa2012)
-DEF_HDANCE(SALSA20, HSALSA20, salsa20, hsalsa208)
-
-DEF_HDANCE(CHACHA, HCHACHA, chacha, hchacha20)
-DEF_HDANCE(CHACHA, HCHACHA, chacha, hchacha12)
-DEF_HDANCE(CHACHA, HCHACHA, chacha, hchacha8)
-

 /*----- Pseudorandom permutations -----------------------------------------*/
 
 static PyTypeObject *gcprp_pytype, *gprp_pytype;
 /*----- Pseudorandom permutations -----------------------------------------*/
 
 static PyTypeObject *gcprp_pytype, *gprp_pytype;


@@ -1624,13 +3227,13 @@ typedef struct prp {
 
 static PyObject *gprp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
 
 static PyObject *gprp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {

-  char *kwlist[] = { "key", 0 };
+  static const char *const kwlist[] = { "key", 0 };

   char *k;
   Py_ssize_t sz;
   const prpinfo *prp = GCPRP_PRP(ty);
   PyObject *me;
 
   char *k;
   Py_ssize_t sz;
   const prpinfo *prp = GCPRP_PRP(ty);
   PyObject *me;
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", kwlist, &k, &sz))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))

     goto end;
   if (keysz(sz, prp->keysz) != sz) VALERR("bad key length");
   me = (PyObject *)ty->tp_alloc(ty, 0);
     goto end;
   if (keysz(sz, prp->keysz) != sz) VALERR("bad key length");
   me = (PyObject *)ty->tp_alloc(ty, 0);


@@ -1853,6 +3456,14 @@ void algorithms_pyinit(void)
   INITTYPE(keyszset, keysz);
   INITTYPE(gccipher, type);
   INITTYPE(gcipher, root);
   INITTYPE(keyszset, keysz);
   INITTYPE(gccipher, type);
   INITTYPE(gcipher, root);

+  INITTYPE(gcaead, type);
+  INITTYPE(gaeadkey, root);
+  INITTYPE(gcaeadaad, type);
+  INITTYPE(gaeadaad, root);
+  INITTYPE(gcaeadenc, type);
+  INITTYPE(gaeadenc, root);
+  INITTYPE(gcaeaddec, type);
+  INITTYPE(gaeaddec, root);

   INITTYPE(gchash, type);
   INITTYPE(ghash, root);
   INITTYPE(gcmac, type);
   INITTYPE(gchash, type);
   INITTYPE(ghash, root);
   INITTYPE(gcmac, type);


@@ -1861,12 +3472,17 @@ void algorithms_pyinit(void)
   INITTYPE(poly1305cls, type);
   INITTYPE_META(poly1305key, type, poly1305cls);
   INITTYPE(poly1305hash, root);
   INITTYPE(poly1305cls, type);
   INITTYPE_META(poly1305key, type, poly1305cls);
   INITTYPE(poly1305hash, root);

+  INITTYPE(kxvik, root);
+  INITTYPE(shake, root);
+  INITTYPE(shake128, shake);
+  INITTYPE(shake256, shake);

   INITTYPE(gcprp, type);
   INITTYPE(gprp, root);
   addmethods(methods);
 }
 
 GEN(gcciphers, cipher)
   INITTYPE(gcprp, type);
   INITTYPE(gprp, root);
   addmethods(methods);
 }
 
 GEN(gcciphers, cipher)

+GEN(gcaeads, aead)

 GEN(gchashes, hash)
 GEN(gcmacs, mac)
 #define gcprp prpinfo
 GEN(gchashes, hash)
 GEN(gcmacs, mac)
 #define gcprp prpinfo


@@ -1882,6 +3498,15 @@ void algorithms_pyinsert(PyObject *mod)
   INSERT("GCCipher", gccipher_pytype);
   INSERT("GCipher", gcipher_pytype);
   INSERT("gcciphers", gcciphers());
   INSERT("GCCipher", gccipher_pytype);
   INSERT("GCipher", gcipher_pytype);
   INSERT("gcciphers", gcciphers());

+  INSERT("GCAEAD", gcaead_pytype);
+  INSERT("GAEKey", gaeadkey_pytype);
+  INSERT("GAEAADClass", gcaeadaad_pytype);
+  INSERT("GAEAAD", gaeadaad_pytype);
+  INSERT("GAEEncClass", gcaeadenc_pytype);
+  INSERT("GAEEnc", gaeadenc_pytype);
+  INSERT("GAEDecClass", gcaeaddec_pytype);
+  INSERT("GAEDec", gaeaddec_pytype);
+  INSERT("gcaeads", gcaeads());

   INSERT("GCHash", gchash_pytype);
   INSERT("GHash", ghash_pytype);
   INSERT("gchashes", d = gchashes());
   INSERT("GCHash", gchash_pytype);
   INSERT("GHash", ghash_pytype);
   INSERT("gchashes", d = gchashes());


@@ -1894,6 +3519,10 @@ void algorithms_pyinsert(PyObject *mod)
   INSERT("Poly1305Class", poly1305cls_pytype);
   INSERT("poly1305", poly1305key_pytype);
   INSERT("Poly1305Hash", poly1305hash_pytype);
   INSERT("Poly1305Class", poly1305cls_pytype);
   INSERT("poly1305", poly1305key_pytype);
   INSERT("Poly1305Hash", poly1305hash_pytype);

+  INSERT("Keccak1600", kxvik_pytype);
+  INSERT("Shake", shake_pytype);
+  INSERT("Shake128", shake128_pytype);
+  INSERT("Shake256", shake256_pytype);

   INSERT("GCPRP", gcprp_pytype);
   INSERT("GPRP", gprp_pytype);
   INSERT("gcprps", gcprps());
   INSERT("GCPRP", gcprp_pytype);
   INSERT("GPRP", gprp_pytype);
   INSERT("gcprps", gcprps());