/* -*-c-*-
- *
- * $Id$
*
* Random-number generators
*
* (c) 2004 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of the Python interface to Catacomb.
*
* 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.
/*----- Header files ------------------------------------------------------*/
#include "catacomb-python.h"
+#include "algorithms.h"
/*----- Main code ---------------------------------------------------------*/
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;
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));
}
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)
};
static PyTypeObject grand_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.GRand", /* @tp_name@ */
sizeof(grand_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
grand_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
grand_pygetset, /* @tp_getset@ */
}
static PyTypeObject lcrand_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.LCRand", /* @tp_name@ */
sizeof(grand_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
}
static PyTypeObject fibrand_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.FibRand", /* @tp_name@ */
sizeof(grand_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
RETURN_ME;
}
+static PyObject *trmeth_add(PyObject *me, PyObject *arg)
+{
+ grand *r = GRAND_R(me);
+ char *p; int 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;
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;
}
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 }
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(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.TrueRand", /* @tp_name@ */
sizeof(grand_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
truerand_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
truerand_pygetset, /* @tp_getset@ */
0 /* @tp_is_gc@ */
};
+/*----- Generators from symmetric encryption algorithms -------------------*/
+
+static PyTypeObject *gccrand_pytype, *gcrand_pytype;
+
+typedef grand *gcrand_func(const void *, size_t sz);
+typedef grand *gcirand_func(const void *, size_t sz, uint32);
+typedef struct gccrand_info {
+ const char *name;
+ const octet *keysz;
+ unsigned f;
+ gcrand_func *func;
+} gccrand_info;
+
+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) \
+ static const gccrand_info func##_info = \
+ { name, ksz, f, (gcrand_func *)func };
+RNGS(GCCRAND_DEF)
+
+static const gccrand_info *const gcrandtab[] = {
+#define GCCRAND_ENTRY(name, ksz, func, f) &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;
+ int 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;
+ int 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 *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);
+ g->ty.ht_type.tp_base = gcrand_pytype;
+ Py_INCREF(gcrand_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;
+ if (info->f & RNGF_INT)
+ g->ty.ht_type.tp_new = gcirand_pynew;
+ else
+ g->ty.ht_type.tp_new = gcrand_pynew;
+ PyType_Ready(&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 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 PyTypeObject gccrand_pytype_skel = {
+ PyObject_HEAD_INIT(0) 0, /* Header */
+ "catacomb.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 */
+ "catacomb.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@ */
+};
+
/*----- SSL and TLS generators --------------------------------------------*/
static PyObject *sslprf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
}
static PyTypeObject sslprf_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.SSLRand", /* @tp_name@ */
sizeof(grand_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
};
static PyTypeObject tlsdx_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.TLSDataExpansion", /* @tp_name@ */
sizeof(grand_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
};
static PyTypeObject tlsprf_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.TLSPRF", /* @tp_name@ */
sizeof(grand_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
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)
};
static PyTypeObject dsarand_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.DSARand", /* @tp_name@ */
sizeof(grand_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
dsarand_pygetset, /* @tp_getset@ */
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);
}
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);
}
};
static PyTypeObject bbs_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.BlumBlumShub", /* @tp_name@ */
sizeof(grand_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
bbs_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
bbs_pygetset, /* @tp_getset@ */
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)
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(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.BBSPriv", /* @tp_name@ */
sizeof(bbspriv_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
bbspriv_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
bbspriv_pygetset, /* @tp_getset@ */
INITTYPE(sslprf, grand);
INITTYPE(tlsdx, grand);
INITTYPE(tlsprf, grand);
+ INITTYPE(gccrand, type);
+ INITTYPE(gcrand, grand);
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);
INSERT("DSARand", dsarand_pytype);
INSERT("BlumBlumShub", bbs_pytype);
INSERT("BBSPriv", bbspriv_pytype);
+ INSERT("GCCRand", gccrand_pytype);
+ INSERT("GCRand", gcrand_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);
}