X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/6640e0603eee8955e49e64574266b37a804a0924..ef783f91d10008e1859fc52de1fb66a5cd292320:/rand.c

diff --git a/rand.c b/rand.c
index 15a0788..12ba834 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;
@@ -56,14 +57,14 @@ PyObject *grand_pywrap(grand *r, unsigned f)
   PyTypeObject *ty = grand_pytype;
   PyObject *ob;
 
-  if (strcmp(r->ops->name, "rand") == 0) ty = truerand_pytype;
-  else if (strcmp(r->ops->name, "lcrand") == 0) ty = lcrand_pytype;
-  else if (strcmp(r->ops->name, "fibrand") == 0) ty = fibrand_pytype;
-  else if (strcmp(r->ops->name, "dsarand") == 0) ty = dsarand_pytype;
-  else if (strcmp(r->ops->name, "bbs") == 0) ty = bbs_pytype;
-  else if (strcmp(r->ops->name, "sslprf") == 0) ty = sslprf_pytype;
-  else if (strcmp(r->ops->name, "tlsdx") == 0) ty = tlsdx_pytype;
-  else if (strcmp(r->ops->name, "tlsprf") == 0) ty = tlsprf_pytype;
+  if (STRCMP(r->ops->name, ==, "rand")) ty = truerand_pytype;
+  else if (STRCMP(r->ops->name, ==, "lcrand")) ty = lcrand_pytype;
+  else if (STRCMP(r->ops->name, ==, "fibrand")) ty = fibrand_pytype;
+  else if (STRCMP(r->ops->name, ==, "dsarand")) ty = dsarand_pytype;
+  else if (STRCMP(r->ops->name, ==, "bbs")) ty = bbs_pytype;
+  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)
     ty = (PyTypeObject *)ob;
   return (grand_dopywrap(ty, r, f));
@@ -308,7 +309,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@ */
@@ -365,7 +366,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@ */
@@ -422,7 +423,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@ */
@@ -508,7 +509,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);
@@ -567,7 +568,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@ */
@@ -777,8 +778,8 @@ static PyObject *gclrmeth_seek(PyObject *me, PyObject *arg)
 
 static 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 }
 };
@@ -816,7 +817,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@ */
@@ -864,7 +865,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@ */
@@ -912,7 +913,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@ */
@@ -1013,8 +1014,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@ */
@@ -1062,8 +1063,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@ */
@@ -1111,8 +1112,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@ */
@@ -1192,7 +1193,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@ */
@@ -1269,7 +1270,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);
@@ -1283,9 +1284,9 @@ static PyObject *bbsget_stepsz(PyObject *me, void *hunoz)
 
 static 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")
+  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")
 #undef METHNAME
   { 0 }
 };
@@ -1324,7 +1325,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@ */
@@ -1385,19 +1386,21 @@ static PyObject *meth__BBSPriv_generate(PyObject *me,
 {
   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 };
   bbspriv_pyobj *rc = 0;
 
+  evt.exc = &exc;
   if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&|O&O&O&O&:generate", KWLIST,
 				   &me, 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;
@@ -1443,8 +1446,8 @@ static PyObject *bpget_q(PyObject *me, void *hunoz)
 
 static 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")
 #undef METHNAME
   { 0 }
 };
@@ -1483,8 +1486,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@ */
@@ -1511,8 +1514,8 @@ static PyTypeObject bbspriv_pytype_skel = {
 
 static PyMethodDef methods[] = {
 #define METHNAME(name) meth_##name
-  KWMETH(_BBSPriv_generate,		"\
-generate(NBITS, [event = pgen_nullev, rng = rand, nsteps = 0, seed = 2])")
+  KWMETH(_BBSPriv_generate, "generate(NBITS, [event = pgen_nullev], "
+			      "[rng = rand], [nsteps = 0], [seed = 2]) -> R")
 #undef METHNAME
   { 0 }
 };