X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/204416123385794c92b7767e7702c0d4fd387468..54fd7594ee5df9dbc9745d98adaa01a5ed43b6e4:/rand.c

diff --git a/rand.c b/rand.c
index 964a6a2..e72f450 100644
--- a/rand.c
+++ b/rand.c
@@ -33,10 +33,11 @@ PRIVATE_SYMBOLS;
 
 /*----- Main code ---------------------------------------------------------*/
 
-PyTypeObject *grand_pytype, *truerand_pytype;
-PyTypeObject *lcrand_pytype, *fibrand_pytype;
-PyTypeObject *dsarand_pytype, *bbs_pytype, *bbspriv_pytype;
-PyTypeObject *sslprf_pytype, *tlsdx_pytype, *tlsprf_pytype;
+PyTypeObject *grand_pytype;
+static PyTypeObject *truerand_pytype;
+static PyTypeObject *lcrand_pytype, *fibrand_pytype;
+static PyTypeObject *dsarand_pytype, *bbs_pytype, *bbspriv_pytype;
+static PyTypeObject *sslprf_pytype, *tlsdx_pytype, *tlsprf_pytype;
 PyObject *rand_pyobj;
 
 static PyObject *gccrands_dict;
@@ -64,7 +65,8 @@ PyObject *grand_pywrap(grand *r, unsigned f)
   else if (STRCMP(r->ops->name, ==, "sslprf")) ty = sslprf_pytype;
   else if (STRCMP(r->ops->name, ==, "tlsdx")) ty = tlsdx_pytype;
   else if (STRCMP(r->ops->name, ==, "tlsprf")) ty = tlsprf_pytype;
-  else if ((ob = PyDict_GetItemString(gccrands_dict, r->ops->name)) != 0)
+  else if ((ob = PyMapping_GetItemString
+		   (gccrands_dict, (/*unconst*/ char *)r->ops->name)) != 0)
     ty = (PyTypeObject *)ob;
   return (grand_dopywrap(ty, r, f));
 }
@@ -79,16 +81,14 @@ end:
   return (-1);
 }
 
-static PyObject *grmeth_byte(PyObject *me, PyObject *arg)
+static PyObject *grmeth_byte(PyObject *me)
 {
-  if (!PyArg_ParseTuple(arg, ":byte")) return (0);
   if (grand_check(me)) return (0);
   return (PyInt_FromLong(grand_byte(GRAND_R(me))));
 }
 
-static PyObject *grmeth_word(PyObject *me, PyObject *arg)
+static PyObject *grmeth_word(PyObject *me)
 {
-  if (!PyArg_ParseTuple(arg, ":word")) return (0);
   if (grand_check(me)) return (0);
   return (getulong(grand_word(GRAND_R(me))));
 }
@@ -102,16 +102,14 @@ static PyObject *grmeth_range(PyObject *me, PyObject *arg)
   if (!PyArg_ParseTuple(arg, "O:range", &m)) return (0);
   if (grand_check(me)) return (0);
   if (PyInt_Check(m)) {
-    long mm = PyInt_AS_LONG(m);
-    if (mm <= 0)
-      goto notpos;
-    if (mm <= 0xffffffff)
+    long mm = PyInt_AsLong(m);
+    if (mm == -1 && PyErr_Occurred()) PyErr_Clear();
+    else if (mm <= 0) goto notpos;
+    else if (mm <= 0xffffffff)
       return (PyInt_FromLong(grand_range(GRAND_R(me), mm)));
   }
-  if ((x = getmp(m)) == 0)
-    goto end;
-  if (!MP_POSP(x))
-    goto notpos;
+  if ((x = getmp(m)) == 0) goto end;
+  if (!MP_POSP(x)) goto notpos;
   y = mprand_range(MP_NEW, x, GRAND_R(me), 0);
   MP_DROP(x);
   return (mp_pywrap(y));
@@ -146,7 +144,7 @@ static PyObject *grmeth_block(PyObject *me, PyObject *arg)
   if (!PyArg_ParseTuple(arg, "O&:block", convulong, &n)) goto end;
   if (grand_check(me)) return (0);
   rc = bytestring_pywrap(0, n);
-  grand_fill(GRAND_R(me), PyString_AS_STRING(rc), n);
+  grand_fill(GRAND_R(me), BIN_PTR(rc), n);
 end:
   return (rc);
 }
@@ -186,13 +184,12 @@ end:
 
 static PyObject *grmeth_seedblock(PyObject *me, PyObject *arg)
 {
-  char *p;
-  Py_ssize_t n;
+  struct bin in;
   grand *r = GRAND_R(me);
-  if (!PyArg_ParseTuple(arg, "s#:seedblock", &p, &n) ||
+  if (!PyArg_ParseTuple(arg, "O&:seedblock", convbin, &in) ||
       grand_check(me) || checkop(r, GRAND_SEEDBLOCK, "seedblock"))
     goto end;
-  r->ops->misc(r, GRAND_SEEDBLOCK, p, (size_t)n);
+  r->ops->misc(r, GRAND_SEEDBLOCK, in.p, (size_t)in.sz);
   RETURN_ME;
 end:
   return (0);
@@ -232,16 +229,17 @@ end:
 static PyObject *grmeth_mask(PyObject *me, PyObject *arg)
 {
   grand *r = GRAND_R(me);
-  char *p, *q;
-  Py_ssize_t sz;
+  struct bin in;
+  const octet *p; size_t n;
+  octet *q;
   PyObject *rc;
 
-  if (!PyArg_ParseTuple(arg, "s#:mask", &p, &sz)) return (0);
+  if (!PyArg_ParseTuple(arg, "O&:mask", convbin, &in)) return (0);
   if (grand_check(me)) return (0);
-  rc = bytestring_pywrap(0, sz);
-  q = PyString_AS_STRING(rc);
-  GR_FILL(r, q, sz);
-  while (sz--) *q++ ^= *p++;
+  rc = bytestring_pywrap(0, in.sz);
+  q = (octet *)BIN_PTR(rc);
+  GR_FILL(r, q, in.sz);
+  p = in.p; n = in.sz; while (n--) *q++ ^= *p++;
   return (rc);
 }
 
@@ -253,12 +251,12 @@ static void grand_pydealloc(PyObject *me)
 }
 
 static PyObject *grget_name(PyObject *me, void *hunoz)
-  { return (grand_check(me) ? 0 : PyString_FromString(GRAND_R(me)->ops->name)); }
+  { return (grand_check(me) ? 0 : TEXT_FROMSTR(GRAND_R(me)->ops->name)); }
 
 static PyObject *grget_cryptop(PyObject *me, void *hunoz)
   { return (grand_check(me) ? 0 : getbool(GRAND_R(me)->ops->f & GRAND_CRYPTO)); }
 
-static PyGetSetDef grand_pygetset[] = {
+static const PyGetSetDef grand_pygetset[] = {
 #define GETSETNAME(op, name) gr##op##_##name
   GET	(name,		"R.name -> name of this kind of generator")
   GET	(cryptop,	"R.cryptop -> flag: cryptographically strong?")
@@ -266,10 +264,10 @@ static PyGetSetDef grand_pygetset[] = {
   { 0 }
 };
 
-static PyMethodDef grand_pymethods[] = {
+static const PyMethodDef grand_pymethods[] = {
 #define METHNAME(name) grmeth_##name
-  METH	(byte,		"R.byte() -> BYTE")
-  METH	(word,		"R.word() -> WORD")
+  NAMETH(byte,		"R.byte() -> BYTE")
+  NAMETH(word,		"R.word() -> WORD")
   METH	(block,		"R.block(N) -> STRING")
   KWMETH(mp,		"R.mp(bits, [or = 0]) -> MP")
   METH	(range,		"R.range(MAX) -> INT")
@@ -283,8 +281,8 @@ static PyMethodDef grand_pymethods[] = {
   { 0 }
 };
 
-static PyTypeObject grand_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject grand_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GRand",				/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -308,7 +306,7 @@ static PyTypeObject grand_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Generic random number source.",
+  "Generic random number source.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -316,9 +314,9 @@ static PyTypeObject grand_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  grand_pymethods,			/* @tp_methods@ */
+  PYMETHODS(grand),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  grand_pygetset,			/* @tp_getset@ */
+  PYGETSET(grand),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -340,8 +338,8 @@ static PyObject *lcrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw)
   return (grand_dopywrap(lcrand_pytype, lcrand_create(n), f_freeme));
 }
 
-static PyTypeObject lcrand_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject lcrand_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "LCRand",				/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -365,7 +363,7 @@ static PyTypeObject lcrand_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"LCRand([seed = 0]): linear congruential generator.",
+  "LCRand([seed = 0]): linear congruential generator.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -397,8 +395,8 @@ static PyObject *fibrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw)
   return (grand_dopywrap(fibrand_pytype, fibrand_create(n), f_freeme));
 }
 
-static PyTypeObject fibrand_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject fibrand_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "FibRand",				/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -422,7 +420,7 @@ static PyTypeObject fibrand_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"FibRand([seed = 0]): Fibonacci generator.",
+  "FibRand([seed = 0]): Fibonacci generator.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -447,38 +445,28 @@ static PyTypeObject fibrand_pytype_skel = {
 
 /*----- True random generator ---------------------------------------------*/
 
-static PyObject *trmeth_gate(PyObject *me, PyObject *arg)
-{
-  grand *r = GRAND_R(me);
-  if (!PyArg_ParseTuple(arg, ":gate")) return (0);
-  r->ops->misc(r, RAND_GATE);
-  RETURN_ME;
-}
+static PyObject *trmeth_gate(PyObject *me)
+  { grand *r = GRAND_R(me); r->ops->misc(GRAND_R(me), RAND_GATE); RETURN_ME; }
 
-static PyObject *trmeth_stretch(PyObject *me, PyObject *arg)
-{
-  grand *r = GRAND_R(me);
-  if (!PyArg_ParseTuple(arg, ":stretch")) return (0);
-  r->ops->misc(r, RAND_STRETCH);
-  RETURN_ME;
-}
+static PyObject *trmeth_stretch(PyObject *me)
+  { grand *r = GRAND_R(me); r->ops->misc(r, RAND_STRETCH); RETURN_ME; }
 
 static PyObject *trmeth_add(PyObject *me, PyObject *arg)
 {
   grand *r = GRAND_R(me);
-  char *p; Py_ssize_t n; unsigned goodbits;
-  if (!PyArg_ParseTuple(arg, "s#O&:add", &p, &n, convuint, &goodbits))
+  struct bin in; unsigned goodbits;
+  if (!PyArg_ParseTuple(arg, "O&O&:add", convbin, &in, convuint, &goodbits))
     return (0);
-  r->ops->misc(r, RAND_ADD, p, (size_t)n, goodbits);
+  r->ops->misc(r, RAND_ADD, in.p, (size_t)in.sz, goodbits);
   RETURN_ME;
 }
 
 static PyObject *trmeth_key(PyObject *me, PyObject *arg)
 {
   grand *r = GRAND_R(me);
-  char *p; Py_ssize_t n;
-  if (!PyArg_ParseTuple(arg, "s#:key", &p, &n)) return (0);
-  r->ops->misc(r, RAND_KEY, p, (size_t)n);
+  struct bin k;
+  if (!PyArg_ParseTuple(arg, "O&:key", convbin, &k)) return (0);
+  r->ops->misc(r, RAND_KEY, k.p, (size_t)k.sz);
   RETURN_ME;
 }
 
@@ -494,13 +482,8 @@ end:
   return (0);
 }
 
-static PyObject *trmeth_timer(PyObject *me, PyObject *arg)
-{
-  grand *r = GRAND_R(me);
-  if (!PyArg_ParseTuple(arg, ":timer")) return (0);
-  r->ops->misc(r, RAND_TIMER);
-  RETURN_ME;
-}
+static PyObject *trmeth_timer(PyObject *me)
+  { grand *r = GRAND_R(me); r->ops->misc(r, RAND_TIMER); RETURN_ME; }
 
 static PyObject *truerand_pynew(PyTypeObject *ty,
 				PyObject *arg, PyObject *kw)
@@ -508,7 +491,7 @@ static PyObject *truerand_pynew(PyTypeObject *ty,
   static const char *const kwlist[] = { 0 };
   grand *r;
   PyObject *rc = 0;
-  if (PyArg_ParseTupleAndKeywords(arg, kw, ":new", KWLIST)) goto end;
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, ":new", KWLIST)) goto end;
   r = rand_create();
   r->ops->misc(r, RAND_NOISESRC, &noise_source);
   r->ops->misc(r, RAND_SEED, 160);
@@ -517,14 +500,14 @@ end:
   return (rc);
 }
 
-static PyMethodDef truerand_pymethods[] = {
+static const PyMethodDef truerand_pymethods[] = {
 #define METHNAME(name) trmeth_##name
-  METH	(gate,		"R.gate()")
-  METH	(stretch,	"R.stretch()")
+  NAMETH(gate,		"R.gate()")
+  NAMETH(stretch,	"R.stretch()")
   METH	(key,		"R.key(BYTES)")
   METH	(seed,		"R.seed(NBITS)")
   METH	(add,		"R.add(BYTES, GOODBITS")
-  METH	(timer,		"R.timer()")
+  NAMETH(timer,		"R.timer()")
 #undef METHNAME
   { 0 }
 };
@@ -535,15 +518,15 @@ static PyObject *trget_goodbits(PyObject *me, void *hunoz)
   return (PyInt_FromLong(r->ops->misc(r, RAND_GOODBITS)));
 }
 
-static PyGetSetDef truerand_pygetset[] = {
+static const PyGetSetDef truerand_pygetset[] = {
 #define GETSETNAME(op, name) tr##op##_##name
   GET	(goodbits,	"R.goodbits -> good bits of entropy remaining")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyTypeObject truerand_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject truerand_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "TrueRand",				/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -567,7 +550,7 @@ static PyTypeObject truerand_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"TrueRand(): true random number source.",
+  "TrueRand(): true random number source.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -575,9 +558,9 @@ static PyTypeObject truerand_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  truerand_pymethods,			/* @tp_methods@ */
+  PYMETHODS(truerand),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  truerand_pygetset,			/* @tp_getset@ */
+  PYGETSET(truerand),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -642,13 +625,12 @@ static PyObject *gcrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
   const gccrand_info *info = GCCRAND_INFO(ty);
   static const char *const kwlist[] = { "key", 0 };
-  char *k;
-  Py_ssize_t n;
+  struct bin k;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &n))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST,  convbin, &k))
     goto end;
-  if (keysz(n, info->keysz) != n) VALERR("bad key length");
-  return (grand_dopywrap(ty, info->func(k, n), f_freeme));
+  if (keysz(k.sz, info->keysz) != k.sz) VALERR("bad key length");
+  return (grand_dopywrap(ty, info->func(k.p, k.sz), f_freeme));
 end:
   return (0);
 }
@@ -658,15 +640,14 @@ static PyObject *gcirand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   const gccrand_info *info = GCCRAND_INFO(ty);
   uint32 i = 0;
   static const char *const kwlist[] = { "key", "i", 0 };
-  char *k;
-  Py_ssize_t n;
+  struct bin k;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#O&:new", KWLIST,
-				   &k, &n, convu32, &i))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new", KWLIST,
+				   convbin, &k, convu32, &i))
     goto end;
-  if (keysz(n, info->keysz) != n) VALERR("bad key length");
+  if (keysz(k.sz, info->keysz) != k.sz) VALERR("bad key length");
   return (grand_dopywrap(ty,
-			 ((gcirand_func *)info->func)(k, n, i),
+			 ((gcirand_func *)info->func)(k.p, k.sz, i),
 			 f_freeme));
 end:
   return (0);
@@ -676,16 +657,17 @@ static PyObject *gcnrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
   const gccrand_info *info = GCCRAND_INFO(ty);
   static const char *const kwlist[] = { "key", "nonce", 0 };
-  char *k, *n;
-  Py_ssize_t ksz, nsz;
+  static const octet zn[24] = { 0 };
+  struct bin k, n;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#:new", KWLIST,
-				   &k, &ksz, &n, &nsz))
+  n.p = zn; n.sz = info->noncesz; assert(info->noncesz <= sizeof(zn));
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new", KWLIST,
+				   convbin, &k, convbin, &n))
     goto end;
-  if (keysz(ksz, info->keysz) != ksz) VALERR("bad key length");
-  if (nsz != info->noncesz) VALERR("bad nonce length");
+  if (keysz(k.sz, info->keysz) != k.sz) VALERR("bad key length");
+  if (n.sz != info->noncesz) VALERR("bad nonce length");
   return (grand_dopywrap(ty,
-			 ((gcnrand_func *)info->func)(k, ksz, n),
+			 ((gcnrand_func *)info->func)(k.p, k.sz, n.p),
 			 f_freeme));
 end:
   return (0);
@@ -698,25 +680,25 @@ static PyObject *gcshakyrand_pynew(PyTypeObject *ty,
   static const char
     *const kwlist_shake[] = { "key", "func", "perso", 0 },
     *const kwlist_func[] = { "key", "perso", 0 };
-  char *k, *f = 0, *p = 0;
-  Py_ssize_t ksz, fsz = 0, psz = 0;
+  struct bin k, f = { 0, 0 }, p = { 0, 0 };
 
   if ((info->f&RNGF_MASK) == RNG_SHAKE
-	? !PyArg_ParseTupleAndKeywords(arg, kw, "s#|s#s#:new",
+	? !PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&O&:new",
 				       (/*unconst*/ char **)kwlist_shake,
-				       &k, &ksz, &f, &fsz, &p, &psz)
-	: !PyArg_ParseTupleAndKeywords(arg, kw, "s#|s#:new",
+				       convbin, &k,
+				       convbin, &f, convbin, &p)
+	: !PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new",
 				       (/*unconst*/ char **)kwlist_func,
-				       &k, &ksz, &p, &psz))
+				       convbin, &k, convbin, &p))
     goto end;
-  if (keysz(ksz, info->keysz) != ksz) VALERR("bad key length");
+  if (keysz(k.sz, info->keysz) != k.sz) VALERR("bad key length");
   return (grand_dopywrap(ty,
 			 (info->f&RNGF_MASK) == RNG_SHAKE
-			   ? ((gcshakerand_func *)info->func)(f, fsz,
-							      p, psz,
-							      k, ksz)
-			   : ((gcshafuncrand_func *)info->func)(p, psz,
-								k, ksz),
+			   ? ((gcshakerand_func *)info->func)(f.p, f.sz,
+							      p.p, p.sz,
+							      k.p, k.sz)
+			   : ((gcshafuncrand_func *)info->func)(p.p, p.sz,
+								k.p, k.sz),
 			 f_freeme));
 end:
   return (0);
@@ -749,17 +731,16 @@ static PyObject *gccrand_pywrap(const gccrand_info *info)
 }
 
 static PyObject *gccrget_name(PyObject *me, void *hunoz)
-  { return (PyString_FromString(GCCRAND_INFO(me)->name)); }
+  { return (TEXT_FROMSTR(GCCRAND_INFO(me)->name)); }
 static PyObject *gccrget_keysz(PyObject *me, void *hunoz)
   { return (keysz_pywrap(GCCRAND_INFO(me)->keysz)); }
 
-static PyObject *gclrmeth_tell(PyObject *me, PyObject *arg)
+static PyObject *gclrmeth_tell(PyObject *me)
 {
   grand *r = GRAND_R(me);
   PyObject *rc = 0;
   kludge64 off;
 
-  if (!PyArg_ParseTuple(arg, ":tell")) return (0);
   r->ops->misc(r, SALSA20_TELLU64, &off);
   rc = getk64(off);
   return (rc);
@@ -775,24 +756,24 @@ static PyObject *gclrmeth_seek(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
-static PyGetSetDef gccrand_pygetset[] = {
+static const PyGetSetDef gccrand_pygetset[] = {
 #define GETSETNAME(op, name) gccr##op##_##name
-  GET	(keysz,			"CR.keysz -> acceptable key sizes")
-  GET	(name,			"CR.name -> name of this kind of generator")
+  GET	(keysz,		"CR.keysz -> acceptable key sizes")
+  GET	(name,		"CR.name -> name of this kind of generator")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyMethodDef gclatinrand_pymethods[] = {
+static const PyMethodDef gclatinrand_pymethods[] = {
 #define METHNAME(name) gclrmeth_##name
-  METH	(tell,		"R.tell() -> OFF")
+  NAMETH(tell,		"R.tell() -> OFF")
   METH	(seek,		"R.seek(OFF)")
 #undef METHNAME
   { 0 }
 };
 
-static PyTypeObject gccrand_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gccrand_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GCCRand",				/* @tp_name@ */
   sizeof(gccrand_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -816,7 +797,7 @@ static PyTypeObject gccrand_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Metaclass for symmetric crypto-based generators.",
+  "Metaclass for symmetric crypto-based generators.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -826,7 +807,7 @@ static PyTypeObject gccrand_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  gccrand_pygetset,			/* @tp_getset@ */
+  PYGETSET(gccrand),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -839,8 +820,8 @@ static PyTypeObject gccrand_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gcrand_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gcrand_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GCRand",				/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -864,7 +845,7 @@ static PyTypeObject gcrand_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Abstract base class for symmetric crypto-based generators.",
+  "Abstract base class for symmetric crypto-based generators.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -887,8 +868,8 @@ static PyTypeObject gcrand_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject gclatinrand_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject gclatinrand_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "GCLatinRand",			/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -912,7 +893,7 @@ static PyTypeObject gclatinrand_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Abstract base class for symmetric crypto-based generators.",
+  "Abstract base class for symmetric crypto-based generators.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -920,7 +901,7 @@ static PyTypeObject gclatinrand_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  gclatinrand_pymethods,		/* @tp_methods@ */
+  PYMETHODS(gclatinrand),		/* @tp_methods@ */
   0,					/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
@@ -939,57 +920,56 @@ static PyTypeObject gclatinrand_pytype_skel = {
 
 static PyObject *sslprf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
-  char *k, *s;
-  int ksz, ssz;
+  struct bin k, s;
   const gchash *hco = &md5, *hci = &sha;
   PyObject *rc = 0;
   static const char *const kwlist[] = { "key", "seed", "ohash", "ihash", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|O&O&:new", KWLIST,
-				   &k, &ksz, &s, &ssz,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&|O&O&:new", KWLIST,
+				   convbin, &k, convbin, &s,
 				   convgchash, &hco, convgchash, &hci))
     goto end;
-  rc = grand_dopywrap(ty, sslprf_rand(hco, hci, k, ksz, s, ssz), f_freeme);
+  rc = grand_dopywrap(ty, sslprf_rand(hco, hci, k.p, k.sz, s.p, s.sz),
+		      f_freeme);
 end:
   return (rc);
 }
 
 static PyObject *tlsdx_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
-  char *k, *s;
-  int ksz, ssz;
+  struct bin k, s;
   const gcmac *mc = &sha_hmac;
   PyObject *rc = 0;
   static const char *const kwlist[] = { "key", "seed", "mac", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|O&:new", KWLIST,
-				   &k, &ksz, &s, &ssz,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&|O&:new", KWLIST,
+				   convbin, &k, convbin, &s,
 				   convgcmac, &mc))
     goto end;
-  rc = grand_dopywrap(ty, tlsdx_rand(mc, k, ksz, s, ssz), f_freeme);
+  rc = grand_dopywrap(ty, tlsdx_rand(mc, k.p, k.sz, s.p, s.sz), f_freeme);
 end:
   return (rc);
 }
 
 static PyObject *tlsprf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
-  char *k, *s;
-  int ksz, ssz;
+  struct bin k, s;
   const gcmac *mcl = &md5_hmac, *mcr = &sha_hmac;
   PyObject *rc = 0;
   static const char *const kwlist[] = { "key", "seed", "lmac", "rmac", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|O&O&:new", KWLIST,
-				   &k, &ksz, &s, &ssz,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&|O&O&:new", KWLIST,
+				   convbin, &k, convbin, &s,
 				   convgcmac, &mcl, convgcmac, &mcr))
     goto end;
-  rc = grand_dopywrap(ty, tlsprf_rand(mcl, mcr, k, ksz, s, ssz), f_freeme);
+  rc = grand_dopywrap(ty, tlsprf_rand(mcl, mcr, k.p, k.sz, s.p, s.sz),
+		      f_freeme);
 end:
   return (rc);
 }
 
-static PyTypeObject sslprf_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject sslprf_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "SSLRand",				/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1013,8 +993,8 @@ static PyTypeObject sslprf_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"SSLRand(KEY, SEED, [ohash = md5], [ihash = sha]):\n\
-  RNG for SSL master secret.",
+  "SSLRand(KEY, SEED, [ohash = md5], [ihash = sha]):\n"
+  "  RNG for SSL master secret.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1037,8 +1017,8 @@ static PyTypeObject sslprf_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject tlsdx_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject tlsdx_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "TLSDataExpansion",			/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1062,8 +1042,8 @@ static PyTypeObject tlsdx_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"TLSDataExpansion(KEY, SEED, [mac = sha_hmac]):\n\
-  TLS data expansion function.",
+  "TLSDataExpansion(KEY, SEED, [mac = sha_hmac]):\n"
+  "  TLS data expansion function.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1086,8 +1066,8 @@ static PyTypeObject tlsdx_pytype_skel = {
   0					/* @tp_is_gc@ */
 };
 
-static PyTypeObject tlsprf_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject tlsprf_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "TLSPRF",				/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1111,8 +1091,8 @@ static PyTypeObject tlsprf_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"TLSPRF(KEY, SEED, [lmac = md5_hmac], [rmac = sha_hmac]):\n\
-  TLS pseudorandom function.",
+  "TLSPRF(KEY, SEED, [lmac = md5_hmac], [rmac = sha_hmac]):\n"
+  "  TLS pseudorandom function.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1139,14 +1119,19 @@ static PyTypeObject tlsprf_pytype_skel = {
 
 static PyObject *dsarand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
 {
-  char *p;
-  int sz;
+  struct bin in;
+  unsigned passes = 1;
+  grand *r;
   PyObject *rc = 0;
-  static const char *const kwlist[] = { "seed", 0 };
+  static const char *const kwlist[] = { "seed", "passes", 0 };
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &p, &sz))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new", KWLIST,
+				   convbin, &in, convuint, &passes))
     goto end;
-  rc = grand_dopywrap(ty, dsarand_create(p, sz), f_freeme);
+  if (!passes) VALERR("must be positive");
+  r = dsarand_create(in.p, in.sz);
+  if (passes != 1) r->ops->misc(r, DSARAND_PASSES, passes);
+  rc = grand_dopywrap(ty, r, f_freeme);
 end:
   return (rc);
 }
@@ -1156,19 +1141,42 @@ static PyObject *drget_seed(PyObject *me, void *hunoz)
   grand *r = GRAND_R(me);
   int n = r->ops->misc(r, DSARAND_SEEDSZ);
   PyObject *rc = bytestring_pywrap(0, n);
-  r->ops->misc(r, DSARAND_GETSEED, PyString_AS_STRING(rc));
+  r->ops->misc(r, DSARAND_GETSEED, BIN_PTR(rc));
   return (rc);
 }
 
-static PyGetSetDef dsarand_pygetset[] = {
+static PyObject *drget_passes(PyObject *me, void *hunoz)
+{
+  grand *r = GRAND_R(me);
+  return (PyInt_FromLong(r->ops->misc(r, DSARAND_PASSES, 0)));
+}
+
+static int drset_passes(PyObject *me, PyObject *val, void *hunoz)
+{
+  grand *r = GRAND_R(me);
+  long n;
+  int rc = -1;
+
+  if (!val) NIERR("__del__");
+  n = PyInt_AsLong(val); if (n == -1 && PyErr_Occurred()) goto end;
+  if (n <= 0) VALERR("must be positive");
+  if (n > ULONG_MAX) VALERR("out of range");
+  r->ops->misc(r, DSARAND_PASSES, (unsigned)n);
+  rc = 0;
+end:
+  return (rc);
+}
+
+static const PyGetSetDef dsarand_pygetset[] = {
 #define GETSETNAME(op, name) dr##op##_##name
   GET	(seed,		"R.seed -> current generator seed")
+  GETSET(passes,	"R.passes -> number of passes to create output")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyTypeObject dsarand_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject dsarand_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "DSARand",				/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1192,7 +1200,7 @@ static PyTypeObject dsarand_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"DSARand(SEED): pseudorandom number generator for DSA parameters.",
+  "DSARand(SEED): pseudorandom number generator for DSA parameters.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1202,7 +1210,7 @@ static PyTypeObject dsarand_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   0,					/* @tp_members@ */
-  dsarand_pygetset,			/* @tp_getset@ */
+  PYGETSET(dsarand),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1233,11 +1241,8 @@ end:
   return (rc);
 }
 
-static PyObject *bbsmeth_step(PyObject *me, PyObject *arg)
-{
-  grand *r = GRAND_R(me); if (!PyArg_ParseTuple(arg, ":step")) return (0);
-  r->ops->misc(r, BBS_STEP); RETURN_ME;
-}
+static PyObject *bbsmeth_step(PyObject *me)
+  { grand *r = GRAND_R(me); r->ops->misc(r, BBS_STEP); RETURN_ME; }
 
 static PyObject *bbsmeth_bits(PyObject *me, PyObject *arg)
 {
@@ -1249,11 +1254,8 @@ end:
   return (0);
 }
 
-static PyObject *bbsmeth_wrap(PyObject *me, PyObject *arg)
-{
-  grand *r = GRAND_R(me); if (!PyArg_ParseTuple(arg, ":wrap")) return (0);
-  r->ops->misc(r, BBS_WRAP); RETURN_ME;
-}
+static PyObject *bbsmeth_wrap(PyObject *me)
+  { grand *r = GRAND_R(me); r->ops->misc(r, BBS_WRAP); RETURN_ME; }
 
 static PyObject *bbsget_n(PyObject *me, void *hunoz)
 {
@@ -1269,7 +1271,7 @@ static PyObject *bbsget_x(PyObject *me, void *hunoz)
 
 static int bbsset_x(PyObject *me, PyObject *val, void *hunoz)
 {
-  mp *x = 0; grand *r = GRAND_R(me); int rc = -1; if (!x) NIERR("__del__");
+  mp *x = 0; grand *r = GRAND_R(me); int rc = -1; if (!val) NIERR("__del__");
   if ((x = getmp(val)) == 0) goto end;
   r->ops->misc(r, BBS_SET, x); rc = 0;
   end: mp_drop(x); return (rc);
@@ -1281,16 +1283,16 @@ static PyObject *bbsget_stepsz(PyObject *me, void *hunoz)
   return (PyInt_FromLong(r->ops->misc(r, BBS_STEPSZ)));
 }
 
-static PyMethodDef bbs_pymethods[] = {
+static const PyMethodDef bbs_pymethods[] = {
 #define METHNAME(name) bbsmeth_##name
-  METH	(step,	"R.step(): steps the generator (not useful)")
-  METH	(bits,	"R.bits(N) -> W: returns N bits (<= 32) from the generator")
-  METH	(wrap,	"R.wrap(): flushes unused bits in internal buffer")
+  NAMETH(step,		"R.step(): steps the generator (not useful)")
+  METH	(bits,	 "R.bits(N) -> W: returns N bits (<= 32) from the generator")
+  NAMETH(wrap,		"R.wrap(): flushes unused bits in internal buffer")
 #undef METHNAME
   { 0 }
 };
 
-static PyGetSetDef bbs_pygetset[] = {
+static const PyGetSetDef bbs_pygetset[] = {
 #define GETSETNAME(op, name) bbs##op##_##name
   GET	(n,		"R.n -> Blum modulus")
   GETSET(x,		"R.x -> current seed value")
@@ -1299,8 +1301,8 @@ static PyGetSetDef bbs_pygetset[] = {
   { 0 }
 };
 
-static PyTypeObject bbs_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject bbs_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "BlumBlumShub",			/* @tp_name@ */
   sizeof(grand_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1324,7 +1326,7 @@ static PyTypeObject bbs_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"BlumBlumShub(N, [x = 2]): Blum-Blum-Shub pseudorandom number generator.",
+  "BlumBlumShub(N, [x = 2]): Blum-Blum-Shub pseudorandom number generator.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1332,9 +1334,9 @@ static PyTypeObject bbs_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  bbs_pymethods,			/* @tp_methods@ */
+  PYMETHODS(bbs),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  bbs_pygetset,				/* @tp_getset@ */
+  PYGETSET(bbs),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1380,24 +1382,25 @@ end:
   return ((PyObject *)rc);
 }
 
-static PyObject *meth__BBSPriv_generate(PyObject *me,
-					PyObject *arg, PyObject *kw)
+static PyObject *bpmeth_generate(PyObject *me, PyObject *arg, PyObject *kw)
 {
   bbs_priv bp = { 0 };
   mp *x = MP_TWO;
-  pgev evt = { 0 };
+  struct excinfo exc = EXCINFO_INIT;
+  pypgev evt = { { 0 } };
   unsigned nbits, n = 0;
   grand *r = &rand_global;
   static const char *const kwlist[] =
-    { "class", "nbits", "event", "rng", "nsteps", "seed", 0 };
+    { "nbits", "event", "rng", "nsteps", "seed", 0 };
   bbspriv_pyobj *rc = 0;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&|O&O&O&O&:generate", KWLIST,
-				   &me, convuint, &nbits, convpgev, &evt,
+  evt.exc = &exc;
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&O&O&O&:generate", KWLIST,
+				   convuint, &nbits, convpgev, &evt,
 				   convgrand, &r, convuint, &n, convmp, &x))
     goto end;
-  if (bbs_gen(&bp, nbits, r, n, evt.proc, evt.ctx))
-    VALERR("prime genration failed");
+  if (bbs_gen(&bp, nbits, r, n, evt.ev.proc, evt.ev.ctx))
+    PGENERR(&exc);
   rc = PyObject_New(bbspriv_pyobj, bbspriv_pytype);
   rc->gr.r = bbs_rand(bp.n, x);
   rc->gr.f = f_freeme;
@@ -1441,15 +1444,17 @@ static PyObject *bpget_p(PyObject *me, void *hunoz)
 static PyObject *bpget_q(PyObject *me, void *hunoz)
   { return (mp_pywrap(MP_COPY(BBSPRIV_BP(me)->q))); }
 
-static PyMethodDef bbspriv_pymethods[] = {
+static const PyMethodDef bbspriv_pymethods[] = {
 #define METHNAME(name) bpmeth_##name
-  METH	(ff,			"R.ff(N): fast-forward N places")
-  METH	(rew,			"R.rew(N): rewind N places")
+  METH	(ff,		"R.ff(N): fast-forward N places")
+  METH	(rew,		"R.rew(N): rewind N places")
+  KWSMTH(generate,	"generate(NBITS, [event = pgen_nullev], "
+			      "[rng = rand], [nsteps = 0], [seed = 2]) -> R")
 #undef METHNAME
   { 0 }
 };
 
-static PyGetSetDef bbspriv_pygetset[] = {
+static const PyGetSetDef bbspriv_pygetset[] = {
 #define GETSETNAME(op, name) bp##op##_##name
   GET	(n,		"R.n -> Blum modulus")
   GET	(p,		"R.p -> one of the factors of the modulus")
@@ -1458,8 +1463,8 @@ static PyGetSetDef bbspriv_pygetset[] = {
   { 0 }
 };
 
-static PyTypeObject bbspriv_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+static const PyTypeObject bbspriv_pytype_skel = {
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "BBSPriv",				/* @tp_name@ */
   sizeof(bbspriv_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1483,8 +1488,8 @@ static PyTypeObject bbspriv_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"BBSPriv(..., seed = 2]): Blum-Blum-Shub, with private key.\n\
-  Keywords: n, p, q; must provide at least two",
+  "BBSPriv(..., [seed = 2]): Blum-Blum-Shub, with private key.\n"
+  "  Keywords: n, p, q; must provide at least two",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1492,9 +1497,9 @@ static PyTypeObject bbspriv_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  bbspriv_pymethods,			/* @tp_methods@ */
+  PYMETHODS(bbspriv),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  bbspriv_pygetset,			/* @tp_getset@ */
+  PYGETSET(bbspriv),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1509,11 +1514,8 @@ static PyTypeObject bbspriv_pytype_skel = {
 
 /*----- Global stuff ------------------------------------------------------*/
 
-static PyMethodDef methods[] = {
-#define METHNAME(name) meth_##name
-  KWMETH(_BBSPriv_generate,		"\
-generate(NBITS, [event = pgen_nullev, rng = rand, nsteps = 0, seed = 2])")
-#undef METHNAME
+static const struct nameval consts[] = {
+  CONST(RAND_IBITS),
   { 0 }
 };
 
@@ -1534,11 +1536,12 @@ void rand_pyinit(void)
   INITTYPE(gclatinrand, gcrand);
   rand_noisesrc(RAND_GLOBAL, &noise_source);
   rand_seed(RAND_GLOBAL, 160);
-  addmethods(methods);
 }
 
-#define gccrand gccrand_info
-GEN(gccrands, crand)
+static const char *crand_namefn(const void *p)
+  { const gccrand_info *const *cls = p; return (*cls ? (*cls)->name : 0); }
+static PyObject *crand_valfn(const void *p)
+  { const gccrand_info *const *cls = p; return (gccrand_pywrap(*cls)); }
 
 void rand_pyinsert(PyObject *mod)
 {
@@ -1556,9 +1559,11 @@ void rand_pyinsert(PyObject *mod)
   INSERT("GCRand", gcrand_pytype);
   INSERT("GCLatinRand", gclatinrand_pytype);
   rand_pyobj = grand_pywrap(&rand_global, 0); Py_INCREF(rand_pyobj);
-  gccrands_dict = gccrands(); Py_INCREF(gccrands_dict);
-  INSERT("gccrands", gccrands_dict);
+  gccrands_dict = make_algtab(gcrandtab, sizeof(gccrand_info *),
+			      crand_namefn, crand_valfn);
+  INSERT("gccrands", gccrands_dict); Py_INCREF(gccrands_dict);
   INSERT("rand", rand_pyobj);
+  setconstants(mod, consts);
 }
 
 /*----- That's all, folks -------------------------------------------------*/