X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/f281293ca70de172b275ecb3224ea36839f2f830..467c26194641b0134c3231fdb7f361d72a426d33:/group.c diff --git a/group.c b/group.c index 727e0b0..b51cb6a 100644 --- a/group.c +++ b/group.c @@ -94,8 +94,7 @@ static void fginfo_pydealloc(PyObject *me) FREEOBJ(me); } -static PyObject *meth__DHInfo_generate(PyObject *me, - PyObject *arg, PyObject *kw) +static PyObject *dimeth_generate(PyObject *me, PyObject *arg, PyObject *kw) { dh_param dp; unsigned ql = 0, pl; @@ -104,12 +103,12 @@ static PyObject *meth__DHInfo_generate(PyObject *me, struct excinfo exc = EXCINFO_INIT; pypgev evt = { { 0 } }; static const char *const kwlist[] = - { "class", "pbits", "qbits", "event", "rng", "nsteps", 0 }; + { "pbits", "qbits", "event", "rng", "nsteps", 0 }; PyObject *rc = 0; evt.exc = &exc; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&|O&O&O&O&:generate", KWLIST, - &me, convuint, &pl, convuint, &ql, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&O&O&O&:generate", KWLIST, + convuint, &pl, convuint, &ql, convpgev, &evt, convgrand, &r, convuint, &steps)) goto end; @@ -121,8 +120,7 @@ end: return (rc); } -static PyObject *meth__DHInfo_genlimlee(PyObject *me, - PyObject *arg, PyObject *kw) +static PyObject *dimeth_genlimlee(PyObject *me, PyObject *arg, PyObject *kw) { dh_param dp; unsigned ql, pl; @@ -133,7 +131,7 @@ static PyObject *meth__DHInfo_genlimlee(PyObject *me, int subgroupp = 1; unsigned f = 0; static const char *const kwlist[] = { - "class", "pbits", "qbits", "event", "ievent", + "pbits", "qbits", "event", "ievent", "rng", "nsteps", "subgroupp", 0 }; size_t i, nf; @@ -142,8 +140,8 @@ static PyObject *meth__DHInfo_genlimlee(PyObject *me, oe.exc = ie.exc = &exc; if (!PyArg_ParseTupleAndKeywords(arg, kw, - "OO&O&|O&O&O&O&O&:genlimlee", KWLIST, - &me, convuint, &pl, convuint, &ql, + "O&O&|O&O&O&O&O&:genlimlee", KWLIST, + convuint, &pl, convuint, &ql, convpgev, &oe, convpgev, &ie, convgrand, &r, convuint, &steps, convbool, &subgroupp)) @@ -162,8 +160,7 @@ end: return (rc); } -static PyObject *meth__DHInfo_genkcdsa(PyObject *me, - PyObject *arg, PyObject *kw) +static PyObject *dimeth_genkcdsa(PyObject *me, PyObject *arg, PyObject *kw) { dh_param dp; unsigned ql, pl; @@ -172,13 +169,13 @@ static PyObject *meth__DHInfo_genkcdsa(PyObject *me, struct excinfo exc = EXCINFO_INIT; pypgev evt = { { 0 } }; static const char *const kwlist[] = - { "class", "pbits", "qbits", "event", "rng", "nsteps", 0 }; + { "pbits", "qbits", "event", "rng", "nsteps", 0 }; mp *v = MP_NEW; PyObject *rc = 0; evt.exc = &exc; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&O&|O&O&O&:genkcdsa", KWLIST, - &me, convuint, &pl, convuint, &ql, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&|O&O&O&:genkcdsa", KWLIST, + convuint, &pl, convuint, &ql, convpgev, &evt, convgrand, &r, convuint, &steps)) goto end; @@ -193,28 +190,26 @@ end: return (rc); } -static PyObject *meth__DHInfo_gendsa(PyObject *me, - PyObject *arg, PyObject *kw) +static PyObject *dimeth_gendsa(PyObject *me, PyObject *arg, PyObject *kw) { dsa_param dp; unsigned ql, pl; unsigned steps = 0; dsa_seed ds; - char *k; - Py_ssize_t ksz; + struct bin k; struct excinfo exc = EXCINFO_INIT; pypgev evt = { { 0 } }; static const char *const kwlist[] = - { "class", "pbits", "qbits", "seed", "event", "nsteps", 0 }; + { "pbits", "qbits", "seed", "event", "nsteps", 0 }; PyObject *rc = 0; evt.exc = &exc; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&O&s#|O&O&:gendsa", KWLIST, - &me, convuint, &pl, convuint, &ql, - &k, &ksz, convpgev, &evt, - convuint, &steps)) + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&O&|O&O&:gendsa", KWLIST, + convuint, &pl, convuint, &ql, + convbin, &k, + convpgev, &evt, convuint, &steps)) goto end; - if (dsa_gen(&dp, ql, pl, steps, k, ksz, &ds, evt.ev.proc, evt.ev.ctx)) + if (dsa_gen(&dp, ql, pl, steps, k.p, k.sz, &ds, evt.ev.proc, evt.ev.ctx)) PGENERR(&exc); rc = Py_BuildValue("(NNl)", fginfo_pywrap(&dp, dhinfo_pytype), bytestring_pywrap(ds.p, ds.sz), (long)ds.count); @@ -224,54 +219,6 @@ end: return (rc); } -static int npgroups = -1, nbingroups = -1; - -static PyObject *namedgroups(const pentry *pp, int *ne) -{ - int i, j; - const char *p; - PyObject *d, *c; - - d = PyDict_New(); - for (i = 0; pp[i].name; i++) { - p = pp[i].name; - for (j = 0; j < i; j++) { - if (pp[i].data == pp[j].data) { - c = PyDict_GetItemString(d, (/*unconst*/ char *)pp[j].name); - Py_INCREF(c); - goto found; - } - } - c = PyInt_FromLong(i); - found: - PyDict_SetItemString(d, (/*unconst*/ char *)p, c); - Py_DECREF(c); - } - *ne = i; - return (d); -} - -static PyObject *meth__groupn(PyObject *me, PyObject *arg, - PyTypeObject *ty, const pentry *pp, int ne) -{ - int i; - gprime_param gp; - PyObject *rc = 0; - - if (!PyArg_ParseTuple(arg, "Oi:_groupn", &me, &i)) goto end; - if (i < 0 || i >= ne) VALERR("group index out of range"); - dh_infofromdata(&gp, pp[i].data); - rc = fginfo_pywrap(&gp, ty); -end: - return (rc); -} - -static PyObject *meth__DHInfo__groupn(PyObject *me, PyObject *arg) - { return (meth__groupn(me, arg, dhinfo_pytype, ptab, npgroups)); } - -static PyObject *meth__BinDHInfo__groupn(PyObject *me, PyObject *arg) - { return (meth__groupn(me, arg, bindhinfo_pytype, bintab, nbingroups)); } - static PyObject *meth__parse(PyObject *me, PyObject *arg, PyTypeObject *ty, int (*parse)(qd_parse *, gprime_param *)) { @@ -280,7 +227,7 @@ static PyObject *meth__parse(PyObject *me, PyObject *arg, PyTypeObject *ty, gprime_param gp; PyObject *rc = 0; - if (!PyArg_ParseTuple(arg, "Os:parse", &me, &p)) goto end; + if (!PyArg_ParseTuple(arg, "s:parse", &p)) goto end; qd.p = p; qd.e = 0; if (parse(&qd, &gp)) VALERR(qd.e); rc = fginfo_pywrap(&gp, ty); @@ -288,10 +235,10 @@ end: return (rc); } -static PyObject *meth__DHInfo_parse(PyObject *me, PyObject *arg) +static PyObject *dimeth_parse(PyObject *me, PyObject *arg) { return (meth__parse(me, arg, dhinfo_pytype, dh_parse)); } -static PyObject *meth__BinDHInfo_parse(PyObject *me, PyObject *arg) +static PyObject *bimeth_parse(PyObject *me, PyObject *arg) { return (meth__parse(me, arg, bindhinfo_pytype, dhbin_parse)); } static const PyGetSetDef fginfo_pygetset[] = { @@ -309,6 +256,28 @@ static const PyGetSetDef dhinfo_pygetset[] = { { 0 } }; +static const PyMethodDef dhinfo_pymethods[] = { +#define METHNAME(name) dimeth_##name + SMTH (parse, "parse(STR) -> D, REST") + KWSMTH(generate, + "generate(PBITS, [qbits = 0], [event = pgen_nullev],\n" + " [rng = rand], [nsteps = 0]) -> D") + KWSMTH(genlimlee, + "genlimlee(PBITS, QBITS, [event = pgen_nullev], " + "[ievent = pgen_nullev],\n" + " [rng = rand], [nsteps = 0], [subgroupp = True]) " + "-> (D, [Q, ...])") + KWSMTH(gendsa, + "gendsa(PBITS, QBITS, SEED, [event = pgen_nullev], [nsteps = 0])\n" + " -> (D, SEED, COUNT)") + KWSMTH(genkcdsa, + "gendsa(PBITS, QBITS, [event = pgen_nullev], " + "[rng = rand], [nsteps = 0])\n" + " -> (D, V)") +#undef METHNAME + { 0 } +}; + static const PyGetSetDef bindhinfo_pygetset[] = { #define GETSETNAME(op, name) bi##op##_##name GET (p, "I.p -> irreducible polynomial") @@ -318,8 +287,15 @@ static const PyGetSetDef bindhinfo_pygetset[] = { { 0 } }; -static PyTypeObject fginfo_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyMethodDef bindhinfo_pymethods[] = { +#define METHNAME(name) bimeth_##name + SMTH (parse, "parse(STR) -> D, REST") +#undef METHNAME + { 0 } +}; + +static const PyTypeObject fginfo_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "FGInfo", /* @tp_name@ */ sizeof(fginfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -366,8 +342,8 @@ static PyTypeObject fginfo_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject dhinfo_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject dhinfo_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "DHInfo", /* @tp_name@ */ sizeof(fginfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -399,7 +375,7 @@ static PyTypeObject dhinfo_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - 0, /* @tp_methods@ */ + PYMETHODS(dhinfo), /* @tp_methods@ */ 0, /* @tp_members@ */ PYGETSET(dhinfo), /* @tp_getset@ */ 0, /* @tp_base@ */ @@ -414,8 +390,8 @@ static PyTypeObject dhinfo_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject bindhinfo_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject bindhinfo_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "BinDHInfo", /* @tp_name@ */ sizeof(fginfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -447,7 +423,7 @@ static PyTypeObject bindhinfo_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - 0, /* @tp_methods@ */ + PYMETHODS(bindhinfo), /* @tp_methods@ */ 0, /* @tp_members@ */ PYGETSET(bindhinfo), /* @tp_getset@ */ 0, /* @tp_base@ */ @@ -517,6 +493,7 @@ static PyObject *ge_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) ec p = EC_INIT; mp *y = 0; ge *xx = 0; + size_t n; mptext_stringctx sc; g = GROUP_G(ty); @@ -531,9 +508,8 @@ static PyObject *ge_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) if (G_FROMINT(g, xx, y)) TYERR("can't convert from integer"); MP_DROP(y); - } else if (PyString_Check(x)) { - sc.buf = PyString_AS_STRING(x); - sc.lim = sc.buf + PyString_GET_SIZE(x); + } else if (TEXT_CHECK(x)) { + TEXT_PTRLEN(x, sc.buf, n); sc.lim = sc.buf + n; if (G_READ(g, xx, &mptext_stringops, &sc) || sc.buf < sc.lim) VALERR("malformed group element string"); } else @@ -595,11 +571,10 @@ BINOP(div) #undef BINOP #define UNOP(name) \ - static PyObject *gemeth_##name(PyObject *me, PyObject *arg) \ + static PyObject *gemeth_##name(PyObject *me) \ { \ group *g; \ ge *z; \ - if (!PyArg_ParseTuple(arg, ":" #name)) return (0); \ g = GE_G(me); \ z = G_CREATE(g); \ g->ops->name(g, z, GE_X(me)); \ @@ -669,9 +644,8 @@ end: return (rc); } -static PyObject *gemeth_check(PyObject *me, PyObject *arg) +static PyObject *gemeth_check(PyObject *me) { - if (!PyArg_ParseTuple(arg, ":check")) goto end; if (group_check(GE_G(me), GE_X(me))) VALERR("bad group element"); RETURN_OBJ(me); end: @@ -687,7 +661,7 @@ static PyObject *ge_pystr(PyObject *me) PyObject *rc; group_writedstr(GE_G(me), GE_X(me), &d); - rc = PyString_FromStringAndSize(d.buf, d.len); + rc = TEXT_FROMSTRLEN(d.buf, d.len); DDESTROY(&d); return (rc); } @@ -720,11 +694,10 @@ end: return (rc); } -static PyObject *gemeth_toint(PyObject *me, PyObject *arg) +static PyObject *gemeth_toint(PyObject *me) { mp *x; - if (!PyArg_ParseTuple(arg, ":toint")) goto end; if ((x = G_TOINT(GE_G(me), MP_NEW, GE_X(me))) == 0) TYERR("can't convert to integer"); return (mp_pywrap(x)); @@ -765,35 +738,33 @@ end: return (rc); } -static PyObject *gemeth_tobuf(PyObject *me, PyObject *arg) +static PyObject *gemeth_tobuf(PyObject *me) { buf b; PyObject *rc; size_t n; - if (!PyArg_ParseTuple(arg, ":tobuf")) return (0); n = GE_G(me)->noctets + 4; rc = bytestring_pywrap(0, n); - buf_init(&b, PyString_AS_STRING(rc), n); + buf_init(&b, BIN_PTR(rc), n); G_TOBUF(GE_G(me), &b, GE_X(me)); assert(BOK(&b)); - _PyString_Resize(&rc, BLEN(&b)); + BIN_SETLEN(rc, BLEN(&b)); return (rc); } -static PyObject *gemeth_toraw(PyObject *me, PyObject *arg) +static PyObject *gemeth_toraw(PyObject *me) { buf b; PyObject *rc; size_t n; - if (!PyArg_ParseTuple(arg, ":toraw")) return (0); n = GE_G(me)->noctets; rc = bytestring_pywrap(0, n); - buf_init(&b, PyString_AS_STRING(rc), n); + buf_init(&b, BIN_PTR(rc), n); G_TORAW(GE_G(me), &b, GE_X(me)); assert(BOK(&b)); - _PyString_Resize(&rc, BLEN(&b)); + BIN_SETLEN(rc, BLEN(&b)); return (rc); } @@ -845,17 +816,16 @@ end: return (0); } -static PyObject *meth__GE_frombuf(PyObject *me, PyObject *arg) +static PyObject *gemeth_frombuf(PyObject *me, PyObject *arg) { buf b; - char *p; - Py_ssize_t n; + struct bin in; group *g; ge *x = 0; - if (!PyArg_ParseTuple(arg, "Os#:frombuf", &me, &p, &n)) return (0); + if (!PyArg_ParseTuple(arg, "O&:frombuf", convbin, &in)) return (0); g = GROUP_G(me); - buf_init(&b, p, n); + buf_init(&b, (/*unconst*/ void *)in.p, in.sz); x = G_CREATE(g); if (G_FROMBUF(g, &b, x)) VALERR("invalid data"); return (Py_BuildValue("(NN)", ge_pywrap(me, x), bytestring_pywrapbuf(&b))); @@ -864,17 +834,16 @@ end: return (0); } -static PyObject *meth__GE_fromraw(PyObject *me, PyObject *arg) +static PyObject *gemeth_fromraw(PyObject *me, PyObject *arg) { buf b; - char *p; - Py_ssize_t n; + struct bin in; group *g; ge *x = 0; - if (!PyArg_ParseTuple(arg, "Os#:fromraw", &me, &p, &n)) return (0); + if (!PyArg_ParseTuple(arg, "O&:fromraw", convbin, &in)) return (0); g = GROUP_G(me); - buf_init(&b, p, n); + buf_init(&b, (/*unconst*/ void *)in.p, in.sz); x = G_CREATE(g); if (G_FROMRAW(g, &b, x)) VALERR("invalid data"); return (Py_BuildValue("(NN)", ge_pywrap(me, x), bytestring_pywrapbuf(&b))); @@ -883,7 +852,7 @@ end: return (0); } -static PyObject *meth__GE_fromstring(PyObject *me, PyObject *arg) +static PyObject *gemeth_fromstring(PyObject *me, PyObject *arg) { mptext_stringctx sc; char *p; @@ -891,7 +860,7 @@ static PyObject *meth__GE_fromstring(PyObject *me, PyObject *arg) group *g; ge *x = 0; - if (!PyArg_ParseTuple(arg, "Os#:fromstring", &me, &p, &n)) return (0); + if (!PyArg_ParseTuple(arg, "s#:fromstring", &p, &n)) return (0); sc.buf = p; sc.lim = sc.buf + n; g = GROUP_G(me); @@ -905,13 +874,13 @@ end: return (0); } -static PyObject *meth__Group_parse(PyObject *me, PyObject *arg) +static PyObject *gmeth_parse(PyObject *me, PyObject *arg) { char *p; qd_parse qd; group *g; - if (!PyArg_ParseTuple(arg, "Os:parse", &me, &p)) goto end; + if (!PyArg_ParseTuple(arg, "s:parse", &p)) goto end; qd.p = p; qd.e = 0; if ((g = group_parse(&qd)) == 0) VALERR(qd.e); return (group_pywrap(g)); @@ -940,7 +909,7 @@ static PyObject *gget_g(PyObject *me, void *hunoz) G_COPY(g, x, g->g); return (ge_pywrap(me, x)); } -static long ge_pyhash(PyObject *me) +static Py_hash_t ge_pyhash(PyObject *me) { buf b; size_t sz = GE_G(me)->noctets + 4; @@ -969,14 +938,17 @@ static const PyGetSetDef ge_pygetset[] = { static const PyMethodDef ge_pymethods[] = { #define METHNAME(name) gemeth_##name - METH (inv, "X.inv() -> inverse element of X") - METH (sqr, "X.sqr() -> X^2 = X * X") - METH (check, "X.check() -> check X really belongs to its group") - METH (toint, "X.toint() -> X converted to an integer") + NAMETH(inv, "X.inv() -> inverse element of X") + NAMETH(sqr, "X.sqr() -> X^2 = X * X") + NAMETH(check, "X.check() -> check X really belongs to its group") + NAMETH(toint, "X.toint() -> X converted to an integer") KWMETH(toec, "X.toec([curve = ECPt]) -> " "X converted to elliptic curve point") - METH (tobuf, "X.tobuf() -> X in buffer representation") - METH (toraw, "X.toraw() -> X in raw representation") + NAMETH(tobuf, "X.tobuf() -> X in buffer representation") + NAMETH(toraw, "X.toraw() -> X in raw representation") + CMTH (frombuf, "frombuf(BUF) -> X, REST") + CMTH (fromraw, "fromraw(BUF) -> X, REST") + CMTH (fromstring, "fromstring(STR) -> X, REST") #undef METHNAME { 0 } }; @@ -1024,8 +996,8 @@ static const PyNumberMethods ge_pynumber = { 0, /* @nb_inplace_true_divide@ */ }; -static PyTypeObject ge_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject ge_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GE", /* @tp_name@ */ sizeof(ge_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1089,12 +1061,13 @@ static const PyMethodDef group_pymethods[] = { #define METHNAME(name) gmeth_##name METH (mexp, "G.mexp([(X0, N0), (X1, N1), ...]) -> X0^N0 X1^N1 ...") KWMETH(checkgroup, "G.checkgroup([rng = rand]): check group is good") + SMTH (parse, "parse(STR) -> G, REST") #undef METHNAME { 0 } }; -static PyTypeObject group_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject group_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "Group", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1170,8 +1143,8 @@ static PyObject *primegroup_pynew(PyTypeObject *ty, return (group_dopywrap(ty, group_prime(FGINFO_DP(i)))); } -static PyTypeObject primegroup_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject primegroup_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "PrimeGroup", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1247,8 +1220,8 @@ static PyObject *bingroup_pynew(PyTypeObject *ty, return (group_dopywrap(ty, group_binary(FGINFO_DP(i)))); } -static PyTypeObject bingroup_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject bingroup_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "BinGroup", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1325,8 +1298,8 @@ static PyObject *ecgroup_pynew(PyTypeObject *ty, return (group_dopywrap(ty, group_ec(&ei))); } -static PyTypeObject ecgroup_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject ecgroup_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "ECGroup", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1375,35 +1348,6 @@ static PyTypeObject ecgroup_pytype_skel = { /*----- Global stuff ------------------------------------------------------*/ -static const PyMethodDef methods[] = { -#define METHNAME(name) meth_##name - METH (_GE_frombuf, "frombuf(BUF) -> X, REST") - METH (_GE_fromraw, "fromraw(BUF) -> X, REST") - METH (_GE_fromstring, "fromstring(STR) -> X, REST") - METH (_Group_parse, "parse(STR) -> G, REST") - METH (_DHInfo_parse, "parse(STR) -> D, REST") - METH (_BinDHInfo_parse, "parse(STR) -> D, REST") - METH (_DHInfo__groupn, 0) - METH (_BinDHInfo__groupn, 0) - KWMETH(_DHInfo_generate, - "generate(PBITS, [qbits = 0, event = pgen_nullev,\n" - " rng = rand, nsteps = 0]) -> D") - KWMETH(_DHInfo_genlimlee, - "genlimlee(PBITS, QBITS, [event = pgen_nullev], " - "[ievent = pgen_nullev],\n" - " [rng = rand], [nsteps = 0], [subgroupp = True]) " - "-> (D, [Q, ...])") - KWMETH(_DHInfo_gendsa, - "gendsa(PBITS, QBITS, SEED, [event = pgen_nullev], [nsteps = 0])\n" - " -> (D, SEED, COUNT)") - KWMETH(_DHInfo_genkcdsa, - "gendsa(PBITS, QBITS, [event = pgen_nullev], " - "[rng = rand], [nsteps = 0])\n" - " -> (D, V)") -#undef METHNAME - { 0 } -}; - void group_pyinit(void) { INITTYPE(fginfo, root); @@ -1414,9 +1358,34 @@ void group_pyinit(void) INITTYPE(primegroup, group); INITTYPE(bingroup, group); INITTYPE(ecgroup, group); - addmethods(methods); } +static const char *grp_namefn(const void *p) + { const pentry *pt = p; return (pt->name); } + +static int grp_ixfn(const pentry *tab, const pentry *pt) +{ + int i; + + for (i = 0; tab[i].name; i++) + if (tab[i].data == pt->data) return (i); + return (-1); +} +static int pgrp_ixfn(const void *p) { return (grp_ixfn(ptab, p)); } +static int bgrp_ixfn(const void *p) { return (grp_ixfn(bintab, p)); } + +static PyObject *grp_valfn(const pentry *tab, PyTypeObject *ty, int i) +{ + gprime_param gp; + + dh_infofromdata(&gp, tab[i].data); + return (fginfo_pywrap(&gp, ty)); +} +static PyObject *pgrp_valfn(int i) + { return (grp_valfn(ptab, dhinfo_pytype, i)); } +static PyObject *bgrp_valfn(int i) + { return (grp_valfn(bintab, bindhinfo_pytype, i)); } + void group_pyinsert(PyObject *mod) { INSERT("FGInfo", fginfo_pytype); @@ -1427,8 +1396,10 @@ void group_pyinsert(PyObject *mod) INSERT("PrimeGroup", primegroup_pytype); INSERT("BinGroup", bingroup_pytype); INSERT("ECGroup", ecgroup_pytype); - INSERT("_pgroups", namedgroups(ptab, &npgroups)); - INSERT("_bingroups", namedgroups(bintab, &nbingroups)); + INSERT("primegroups", make_grouptab(ptab, sizeof(*ptab), + grp_namefn, pgrp_ixfn, pgrp_valfn)); + INSERT("bingroups", make_grouptab(bintab, sizeof(*bintab), + grp_namefn, bgrp_ixfn, bgrp_valfn)); } /*----- That's all, folks -------------------------------------------------*/