X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/963a61481edc7a83698b18b518bf20cd93d268a6..278e43d0c27875a1355ebaf3bef6d0f5df739626:/rand.c diff --git a/rand.c b/rand.c index a346e12..6fe78bc 100644 --- a/rand.c +++ b/rand.c @@ -1,13 +1,11 @@ /* -*-c-*- - * - * $Id$ * * Random-number generators * * (c) 2004 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to Catacomb. * @@ -15,12 +13,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * Catacomb/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with Catacomb/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -29,6 +27,7 @@ /*----- Header files ------------------------------------------------------*/ #include "catacomb-python.h" +#include "algorithms.h" /*----- Main code ---------------------------------------------------------*/ @@ -38,6 +37,8 @@ PyTypeObject *dsarand_pytype, *bbs_pytype, *bbspriv_pytype; PyTypeObject *sslprf_pytype, *tlsdx_pytype, *tlsprf_pytype; PyObject *rand_pyobj; +static PyObject *gccrands_dict; + static PyObject *grand_dopywrap(PyTypeObject *ty, grand *r, unsigned f) { grand_pyobj *g; @@ -51,12 +52,18 @@ static PyObject *grand_dopywrap(PyTypeObject *ty, grand *r, unsigned f) 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; + else if ((ob = PyDict_GetItemString(gccrands_dict, r->ops->name)) != 0) + ty = (PyTypeObject *)ob; return (grand_dopywrap(ty, r, f)); } @@ -71,7 +78,7 @@ static PyObject *grmeth_byte(PyObject *me, PyObject *arg) static PyObject *grmeth_word(PyObject *me, PyObject *arg) { if (!PyArg_ParseTuple(arg, ":word")) return (0); - return (getu32(grand_word(GRAND_R(me)))); + return (getulong(grand_word(GRAND_R(me)))); } static PyObject *grmeth_range(PyObject *me, PyObject *arg) @@ -83,20 +90,20 @@ static PyObject *grmeth_range(PyObject *me, PyObject *arg) if (!PyArg_ParseTuple(arg, "O:range", &m)) return (0); if (PyInt_Check(m)) { long mm = PyInt_AS_LONG(m); - if (mm < 0) - goto negative; + if (mm <= 0) + goto notpos; if (mm <= 0xffffffff) return (PyInt_FromLong(grand_range(GRAND_R(me), mm))); } if ((x = getmp(m)) == 0) goto end; - if (MP_NEGP(x)) - goto negative; + if (!MP_POSP(x)) + goto notpos; y = mprand_range(MP_NEW, x, GRAND_R(me), 0); MP_DROP(x); return (mp_pywrap(y)); -negative: - TYERR("range must be nonnegative"); +notpos: + VALERR("range must be strictly positive"); end: if (x) MP_DROP(x); return (0); @@ -105,12 +112,13 @@ end: static PyObject *grmeth_mp(PyObject *me, PyObject *arg, PyObject *kw) { size_t l; - mpw o; + mpw o = 0; char *kwlist[] = { "bits", "or", 0 }; if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:mp", kwlist, convszt, &l, convmpw, &o)) goto end; + if (l < MPW_BITS && (o >> l)) VALERR("or mask too large"); return (mp_pywrap(mprand(MP_NEW, l, GRAND_R(me), o))); end: return (0); @@ -165,7 +173,7 @@ end: static PyObject *grmeth_seedblock(PyObject *me, PyObject *arg) { char *p; - int n; + Py_ssize_t n; grand *r = GRAND_R(me); if (!PyArg_ParseTuple(arg, "s#:seedblock", &p, &n) || checkop(r, GRAND_SEEDBLOCK, "seedblock")) @@ -211,7 +219,7 @@ static PyObject *grmeth_mask(PyObject *me, PyObject *arg) { grand *r = GRAND_R(me); char *p, *q; - int sz; + Py_ssize_t sz; PyObject *rc; if (!PyArg_ParseTuple(arg, "s#:mask", &p, &sz)) return (0); @@ -249,7 +257,7 @@ static PyMethodDef grand_pymethods[] = { METH (byte, "R.byte() -> BYTE") METH (word, "R.word() -> WORD") METH (block, "R.block(N) -> STRING") - KWMETH(mp, "R.mp(bits, or = 0) -> MP") + KWMETH(mp, "R.mp(bits, [or = 0]) -> MP") METH (range, "R.range(MAX) -> INT") METH (mask, "R.mask(STR) -> STR") METH (seedint, "R.seedint(I)") @@ -263,7 +271,7 @@ static PyMethodDef grand_pymethods[] = { static PyTypeObject grand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GRand", /* @tp_name@ */ + "GRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -320,7 +328,7 @@ static PyObject *lcrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw) static PyTypeObject lcrand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.LCRand", /* @tp_name@ */ + "LCRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -377,7 +385,7 @@ static PyObject *fibrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw) static PyTypeObject fibrand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.FibRand", /* @tp_name@ */ + "FibRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -441,12 +449,22 @@ static PyObject *trmeth_stretch(PyObject *me, PyObject *arg) 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)) + return (0); + r->ops->misc(r, RAND_ADD, p, (size_t)n, goodbits); + RETURN_ME; +} + static PyObject *trmeth_key(PyObject *me, PyObject *arg) { grand *r = GRAND_R(me); - char *p; int n; + char *p; Py_ssize_t n; if (!PyArg_ParseTuple(arg, "s#:key", &p, &n)) return (0); - r->ops->misc(r, RAND_KEY, p, n); + r->ops->misc(r, RAND_KEY, p, (size_t)n); RETURN_ME; } @@ -491,6 +509,7 @@ static PyMethodDef truerand_pymethods[] = { METH (stretch, "R.stretch()") METH (key, "R.key(BYTES)") METH (seed, "R.seed(NBITS)") + METH (add, "R.add(BYTES, GOODBITS") METH (timer, "R.timer()") #undef METHNAME { 0 } @@ -504,14 +523,14 @@ static PyObject *trget_goodbits(PyObject *me, void *hunoz) static PyGetSetDef truerand_pygetset[] = { #define GETSETNAME(op, name) tr##op##_##name - GET (goodbits, "R.goodbits -> good bits of entropy remaining") + GET (goodbits, "R.goodbits -> good bits of entropy remaining") #undef GETSETNAME { 0 } }; static PyTypeObject truerand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.TrueRand", /* @tp_name@ */ + "TrueRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -557,6 +576,348 @@ static PyTypeObject truerand_pytype_skel = { 0 /* @tp_is_gc@ */ }; +/*----- Generators from symmetric encryption algorithms -------------------*/ + +static PyTypeObject *gccrand_pytype, *gcrand_pytype, *gclatinrand_pytype; + +typedef grand *gcrand_func(const void *, size_t sz); +typedef grand *gcirand_func(const void *, size_t sz, uint32); +typedef grand *gcnrand_func(const void *, size_t sz, const void *); +typedef grand *gcshakerand_func(const void *, size_t, + const void *, size_t, + const void *, size_t); +typedef grand *gcshafuncrand_func(const void *, size_t, + const void *, size_t); +typedef grand *gckmacrand_func(const void *, size_t, const void *, size_t); +typedef struct gccrand_info { + const char *name; + const octet *keysz; + unsigned f; + size_t noncesz; + gcrand_func *func; +} gccrand_info; + +#define RNGF_MASK 255u + +enum { + RNG_PLAIN = 0, + RNG_SEAL, + RNG_LATIN, + RNG_SHAKE, + RNG_KMAC +}; + +typedef struct gccrand_pyobj { + PyHeapTypeObject ty; + const gccrand_info *info; +} gccrand_pyobj; +#define GCCRAND_INFO(o) (((gccrand_pyobj *)(o))->info) + +#define GCCRAND_DEF(name, ksz, func, f, nsz) \ + static const gccrand_info func##_info = \ + { name, ksz, f, nsz, (gcrand_func *)func }; +RNGS(GCCRAND_DEF) + +static const gccrand_info *const gcrandtab[] = { +#define GCCRAND_ENTRY(name, ksz, func, f, nsz) &func##_info, + RNGS(GCCRAND_ENTRY) + 0 +}; + +static PyObject *gcrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) +{ + const gccrand_info *info = GCCRAND_INFO(ty); + static char *kwlist[] = { "key", 0 }; + char *k; + Py_ssize_t n; + + if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", kwlist, &k, &n)) + goto end; + if (keysz(n, info->keysz) != n) VALERR("bad key length"); + return (grand_dopywrap(ty, info->func(k, n), f_freeme)); +end: + return (0); +} + +static PyObject *gcirand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) +{ + const gccrand_info *info = GCCRAND_INFO(ty); + uint32 i = 0; + static char *kwlist[] = { "key", "i", 0 }; + char *k; + Py_ssize_t n; + + if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#O&:new", kwlist, + &k, &n, convu32, &i)) + goto end; + if (keysz(n, info->keysz) != n) VALERR("bad key length"); + return (grand_dopywrap(ty, + ((gcirand_func *)info->func)(k, n, i), + f_freeme)); +end: + return (0); +} + +static PyObject *gcnrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) +{ + const gccrand_info *info = GCCRAND_INFO(ty); + static char *kwlist[] = { "key", "nonce", 0 }; + char *k, *n; + Py_ssize_t ksz, nsz; + + if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#:new", kwlist, + &k, &ksz, &n, &nsz)) + goto end; + if (keysz(ksz, info->keysz) != ksz) VALERR("bad key length"); + if (nsz != info->noncesz) VALERR("bad nonce length"); + return (grand_dopywrap(ty, + ((gcnrand_func *)info->func)(k, ksz, n), + f_freeme)); +end: + return (0); +} + +static PyObject *gcshakyrand_pynew(PyTypeObject *ty, + PyObject *arg, PyObject *kw) +{ + const gccrand_info *info = GCCRAND_INFO(ty); + static char *kwlist_shake[] = { "key", "func", "perso", 0 }; + static char *kwlist_func[] = { "key", "perso", 0 }; + char *k, *f = 0, *p = 0; + Py_ssize_t ksz, fsz = 0, psz = 0; + + if ((info->f&RNGF_MASK) == RNG_SHAKE + ? !PyArg_ParseTupleAndKeywords(arg, kw, "s#|s#s#:new", kwlist_shake, + &k, &ksz, &f, &fsz, &p, &psz) + : !PyArg_ParseTupleAndKeywords(arg, kw, "s#|s#:new", kwlist_func, + &k, &ksz, &p, &psz)) + goto end; + if (keysz(ksz, info->keysz) != ksz) 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), + f_freeme)); +end: + return (0); +} + +static PyObject *gccrand_pywrap(const gccrand_info *info) +{ + gccrand_pyobj *g = newtype(gccrand_pytype, 0, info->name); + g->info = info; + g->ty.ht_type.tp_basicsize = sizeof(grand_pyobj); + switch (info->f&RNGF_MASK) { + case RNG_LATIN: g->ty.ht_type.tp_base = gclatinrand_pytype; break; + default: g->ty.ht_type.tp_base = gcrand_pytype; break; + } + Py_INCREF(g->ty.ht_type.tp_base); + 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; + switch (info->f&RNGF_MASK) { + case RNG_LATIN: g->ty.ht_type.tp_new = gcnrand_pynew; break; + case RNG_SEAL: g->ty.ht_type.tp_new = gcirand_pynew; break; + case RNG_SHAKE: case RNG_KMAC: + g->ty.ht_type.tp_new = gcshakyrand_pynew; break; + default: g->ty.ht_type.tp_new = gcrand_pynew; break; + } + typeready(&g->ty.ht_type); + return ((PyObject *)g); +} + +static PyObject *gccrget_name(PyObject *me, void *hunoz) + { return (PyString_FromString(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) +{ + 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); +} + +static PyObject *gclrmeth_seek(PyObject *me, PyObject *arg) +{ + grand *r = GRAND_R(me); + kludge64 off; + + if (!PyArg_ParseTuple(arg, "O&:seek", convk64, &off)) return (0); + r->ops->misc(r, SALSA20_SEEKU64, off); + RETURN_ME; +} + +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") +#undef GETSETNAME + { 0 } +}; + +static PyMethodDef gclatinrand_pymethods[] = { +#define METHNAME(name) gclrmeth_##name + METH (tell, "R.tell() -> OFF") + METH (seek, "R.seek(OFF)") +#undef METHNAME + { 0 } +}; + +static PyTypeObject gccrand_pytype_skel = { + PyObject_HEAD_INIT(0) 0, /* Header */ + "GCCRand", /* @tp_name@ */ + sizeof(gccrand_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@ */ +"Metaclass for symmetric crypto-based generators.", + + 0, /* @tp_traverse@ */ + 0, /* @tp_clear@ */ + 0, /* @tp_richcompare@ */ + 0, /* @tp_weaklistoffset@ */ + 0, /* @tp_iter@ */ + 0, /* @tp_iternext@ */ + 0, /* @tp_methods@ */ + 0, /* @tp_members@ */ + gccrand_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 gcrand_pytype_skel = { + PyObject_HEAD_INIT(0) 0, /* Header */ + "GCRand", /* @tp_name@ */ + sizeof(grand_pyobj), /* @tp_basicsize@ */ + 0, /* @tp_itemsize@ */ + + grand_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@ */ +"Abstract base class for symmetric crypto-based generators.", + + 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 gclatinrand_pytype_skel = { + PyObject_HEAD_INIT(0) 0, /* Header */ + "GCLatinRand", /* @tp_name@ */ + sizeof(grand_pyobj), /* @tp_basicsize@ */ + 0, /* @tp_itemsize@ */ + + grand_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@ */ +"Abstract base class for symmetric crypto-based generators.", + + 0, /* @tp_traverse@ */ + 0, /* @tp_clear@ */ + 0, /* @tp_richcompare@ */ + 0, /* @tp_weaklistoffset@ */ + 0, /* @tp_iter@ */ + 0, /* @tp_iternext@ */ + gclatinrand_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@ */ +}; + /*----- SSL and TLS generators --------------------------------------------*/ static PyObject *sslprf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) @@ -612,7 +973,7 @@ end: static PyTypeObject sslprf_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.SSLRand", /* @tp_name@ */ + "SSLRand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -660,7 +1021,7 @@ static PyTypeObject sslprf_pytype_skel = { static PyTypeObject tlsdx_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.TLSDataExpansion", /* @tp_name@ */ + "TLSDataExpansion", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -708,7 +1069,7 @@ static PyTypeObject tlsdx_pytype_skel = { static PyTypeObject tlsprf_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.TLSPRF", /* @tp_name@ */ + "TLSPRF", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -767,7 +1128,7 @@ static PyObject *dsarand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) goto end; rc = grand_dopywrap(ty, dsarand_create(p, sz), f_freeme); end: - return (0); + return (rc); } static PyObject *drget_seed(PyObject *me, void *hunoz) @@ -788,7 +1149,7 @@ static PyGetSetDef dsarand_pygetset[] = { static PyTypeObject dsarand_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.DSARand", /* @tp_name@ */ + "DSARand", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -863,7 +1224,7 @@ static PyObject *bbsmeth_bits(PyObject *me, PyObject *arg) grand *r = GRAND_R(me); unsigned n; uint32 w; if (!PyArg_ParseTuple(arg, "O&:bits", convuint, &n)) goto end; if (n > 32) VALERR("can't get more than 32 bits"); - r->ops->misc(r, BBS_BITS, n, &w); return (getu32(w)); + r->ops->misc(r, BBS_BITS, n, &w); return (getulong(w)); end: return (0); } @@ -888,7 +1249,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; + mp *x = 0; grand *r = GRAND_R(me); int rc = -1; if (!x) NIERR("__del__"); if ((x = getmp(val)) == 0) goto end; r->ops->misc(r, BBS_SET, x); rc = 0; end: mp_drop(x); return (rc); } @@ -919,7 +1280,7 @@ static PyGetSetDef bbs_pygetset[] = { static PyTypeObject bbs_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BlumBlumShub", /* @tp_name@ */ + "BlumBlumShub", /* @tp_name@ */ sizeof(grand_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1023,7 +1384,7 @@ static PyObject *meth__BBSPriv_generate(PyObject *me, rc->bp.n = MP_COPY(bp.n); end: mp_drop(bp.p); mp_drop(bp.q); mp_drop(bp.n); mp_drop(x); - return ((PyObject *)rc); + return ((PyObject *)rc); } static void bbspriv_pydealloc(PyObject *me) @@ -1068,16 +1429,16 @@ static PyMethodDef bbspriv_pymethods[] = { static 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") - GET (q, "R.q -> one of the factors of the modulus") + GET (n, "R.n -> Blum modulus") + GET (p, "R.p -> one of the factors of the modulus") + GET (q, "R.q -> one of the factors of the modulus") #undef GETSETNAME { 0 } }; static PyTypeObject bbspriv_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BBSPriv", /* @tp_name@ */ + "BBSPriv", /* @tp_name@ */ sizeof(bbspriv_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1145,11 +1506,17 @@ void rand_pyinit(void) INITTYPE(sslprf, grand); INITTYPE(tlsdx, grand); INITTYPE(tlsprf, grand); + INITTYPE(gccrand, type); + INITTYPE(gcrand, grand); + INITTYPE(gclatinrand, gcrand); rand_noisesrc(RAND_GLOBAL, &noise_source); rand_seed(RAND_GLOBAL, 160); addmethods(methods); } +#define gccrand gccrand_info +GEN(gccrands, crand) + void rand_pyinsert(PyObject *mod) { INSERT("GRand", grand_pytype); @@ -1162,7 +1529,12 @@ void rand_pyinsert(PyObject *mod) INSERT("DSARand", dsarand_pytype); INSERT("BlumBlumShub", bbs_pytype); INSERT("BBSPriv", bbspriv_pytype); + INSERT("GCCRand", gccrand_pytype); + 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); INSERT("rand", rand_pyobj); }