X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/06cd26e87f5b839d40f0e7b57e38aea6c231b385..a157093f4bbc3066fea2f77078b99489c76e62f8:/group.c diff --git a/group.c b/group.c index b3c8b6a..254f8ce 100644 --- a/group.c +++ b/group.c @@ -30,7 +30,16 @@ /*----- DH and binary group infos -----------------------------------------*/ -PyObject *fginfo_pywrap(gprime_param *dp, PyTypeObject *ty) +static PyTypeObject *fginfo_pytype, *dhinfo_pytype, *bindhinfo_pytype; + +typedef struct fginfo_pyobj { + PyObject_HEAD + gprime_param dp; +} fginfo_pyobj; + +#define FGINFO_DP(fg) (&((fginfo_pyobj *)(fg))->dp) + +static PyObject *fginfo_pywrap(gprime_param *dp, PyTypeObject *ty) { fginfo_pyobj *z = PyObject_New(fginfo_pyobj, ty); z->dp = *dp; @@ -40,11 +49,11 @@ PyObject *fginfo_pywrap(gprime_param *dp, PyTypeObject *ty) static PyObject *fginfo_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { - char *kwlist[] = { "p", "r", "g", 0 }; + static const char *const kwlist[] = { "p", "r", "g", 0 }; gprime_param dp = { 0 }; fginfo_pyobj *z = 0; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&O&:new", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&O&:new", KWLIST, convmp, &dp.p, convmp, &dp.q, convmp, &dp.g)) @@ -85,61 +94,65 @@ 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; unsigned steps = 0; grand *r = &rand_global; - pgev evt = { 0 }; - char *kwlist[] = - { "class", "pbits", "qbits", "event", "rng", "nsteps", 0 }; + struct excinfo exc = EXCINFO_INIT; + pypgev evt = { { 0 } }; + static const char *const kwlist[] = + { "pbits", "qbits", "event", "rng", "nsteps", 0 }; PyObject *rc = 0; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&|O&O&O&O&:generate", kwlist, - &me, convuint, &pl, convuint, &ql, + evt.exc = &exc; + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&O&O&O&:generate", KWLIST, + convuint, &pl, convuint, &ql, convpgev, &evt, convgrand, &r, convuint, &steps)) goto end; - if (dh_gen(&dp, ql, pl, steps, r, evt.proc, evt.ctx)) - PGENERR; + if (dh_gen(&dp, ql, pl, steps, r, evt.ev.proc, evt.ev.ctx)) + PGENERR(&exc); rc = fginfo_pywrap(&dp, dhinfo_pytype); end: droppgev(&evt); 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; unsigned steps = 0; grand *r = &rand_global; - pgev oe = { 0 }, ie = { 0 }; + struct excinfo exc = EXCINFO_INIT; + pypgev oe = { { 0 } }, ie = { { 0 } }; int subgroupp = 1; unsigned f = 0; - char *kwlist[] = { "class", "pbits", "qbits", "event", "ievent", - "rng", "nsteps", "subgroupp", 0 }; + static const char *const kwlist[] = { + "pbits", "qbits", "event", "ievent", + "rng", "nsteps", "subgroupp", 0 + }; size_t i, nf; mp **v = 0; PyObject *rc = 0, *vec = 0; + 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)) goto end; if (subgroupp) f |= DH_SUBGROUP; if (dh_limlee(&dp, ql, pl, f, steps, r, - oe.proc, oe.ctx, ie.proc, ie.ctx, &nf, &v)) - PGENERR; + oe.ev.proc, oe.ev.ctx, ie.ev.proc, ie.ev.ctx, &nf, &v)) + PGENERR(&exc); vec = PyList_New(nf); for (i = 0; i < nf; i++) - PyList_SetItem(vec, i, mp_pywrap(v[i])); + PyList_SET_ITEM(vec, i, mp_pywrap(v[i])); xfree(v); rc = Py_BuildValue("(NN)", fginfo_pywrap(&dp, dhinfo_pytype), vec); end: @@ -147,26 +160,27 @@ 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; unsigned steps = 0; grand *r = &rand_global; - pgev evt = { 0 }; - char *kwlist[] = { "class", "pbits", "qbits", - "event", "rng", "nsteps", 0 }; + struct excinfo exc = EXCINFO_INIT; + pypgev evt = { { 0 } }; + static const char *const kwlist[] = + { "pbits", "qbits", "event", "rng", "nsteps", 0 }; mp *v = MP_NEW; PyObject *rc = 0; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&O&|O&O&O&:genkcdsa", kwlist, - &me, convuint, &pl, convuint, &ql, + evt.exc = &exc; + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&|O&O&O&:genkcdsa", KWLIST, + convuint, &pl, convuint, &ql, convpgev, &evt, convgrand, &r, convuint, &steps)) goto end; - if (dh_kcdsagen(&dp, ql, pl, 0, steps, r, evt.proc, evt.ctx)) - PGENERR; + if (dh_kcdsagen(&dp, ql, pl, 0, steps, r, evt.ev.proc, evt.ev.ctx)) + PGENERR(&exc); mp_div(&v, 0, dp.p, dp.q); v = mp_lsr(v, v, 1); rc = Py_BuildValue("(NN)", fginfo_pywrap(&dp, dhinfo_pytype), @@ -176,8 +190,7 @@ 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; @@ -185,18 +198,20 @@ static PyObject *meth__DHInfo_gendsa(PyObject *me, dsa_seed ds; char *k; Py_ssize_t ksz; - pgev evt = { 0 }; - char *kwlist[] = - { "class", "pbits", "qbits", "seed", "event", "nsteps", 0 }; + struct excinfo exc = EXCINFO_INIT; + pypgev evt = { { 0 } }; + static const char *const kwlist[] = + { "pbits", "qbits", "seed", "event", "nsteps", 0 }; PyObject *rc = 0; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&O&s#|O&O&:gendsa", kwlist, - &me, convuint, &pl, convuint, &ql, + evt.exc = &exc; + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&s#|O&O&:gendsa", KWLIST, + convuint, &pl, convuint, &ql, &k, &ksz, convpgev, &evt, convuint, &steps)) goto end; - if (dsa_gen(&dp, ql, pl, steps, k, ksz, &ds, evt.proc, evt.ctx)) - PGENERR; + if (dsa_gen(&dp, ql, pl, steps, k, ksz, &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); xfree(ds.p); @@ -239,7 +254,7 @@ static PyObject *meth__groupn(PyObject *me, PyObject *arg, gprime_param gp; PyObject *rc = 0; - if (!PyArg_ParseTuple(arg, "Oi:_groupn", &me, &i)) goto end; + if (!PyArg_ParseTuple(arg, "i:_groupn", &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); @@ -247,10 +262,10 @@ end: return (rc); } -static PyObject *meth__DHInfo__groupn(PyObject *me, PyObject *arg) +static PyObject *dimeth__groupn(PyObject *me, PyObject *arg) { return (meth__groupn(me, arg, dhinfo_pytype, ptab, npgroups)); } -static PyObject *meth__BinDHInfo__groupn(PyObject *me, PyObject *arg) +static PyObject *bimeth__groupn(PyObject *me, PyObject *arg) { return (meth__groupn(me, arg, bindhinfo_pytype, bintab, nbingroups)); } static PyObject *meth__parse(PyObject *me, PyObject *arg, PyTypeObject *ty, @@ -261,45 +276,75 @@ 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; - qd.p = p; - qd.e = 0; + 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); 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 PyGetSetDef fginfo_pygetset[] = { +static const PyGetSetDef fginfo_pygetset[] = { #define GETSETNAME(op, name) fi##op##_##name - GET (r, "I.r -> group order") + GET (r, "I.r -> group order") #undef GETSETNAME { 0 } }; -static PyGetSetDef dhinfo_pygetset[] = { +static const PyGetSetDef dhinfo_pygetset[] = { #define GETSETNAME(op, name) di##op##_##name - GET (p, "I.p -> prime") - GET (g, "I.g -> generator") + GET (p, "I.p -> prime") + GET (g, "I.g -> generator") #undef GETSETNAME { 0 } }; -static PyGetSetDef bindhinfo_pygetset[] = { +static const PyMethodDef dhinfo_pymethods[] = { +#define METHNAME(name) dimeth_##name + SMTH (parse, "parse(STR) -> D, REST") + SMTH (_groupn, 0) + 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") - GET (m, "I.m -> degree of polynomial") - GET (g, "I.g -> generator") + GET (p, "I.p -> irreducible polynomial") + GET (m, "I.m -> degree of polynomial") + GET (g, "I.g -> generator") #undef GETSETNAME { 0 } }; +static const PyMethodDef bindhinfo_pymethods[] = { +#define METHNAME(name) bimeth_##name + SMTH (parse, "parse(STR) -> D, REST") + SMTH (_groupn, 0) +#undef METHNAME + { 0 } +}; + static PyTypeObject fginfo_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ "FGInfo", /* @tp_name@ */ @@ -325,7 +370,7 @@ static PyTypeObject fginfo_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"Abstract base class for field-group information objects.", + "Abstract base class for field-group information objects.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -335,7 +380,7 @@ static PyTypeObject fginfo_pytype_skel = { 0, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ - fginfo_pygetset, /* @tp_getset@ */ + PYGETSET(fginfo), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -373,7 +418,7 @@ static PyTypeObject dhinfo_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"DHInfo(P, R, G): standard (integer) Diffie-Hellman group information.", + "DHInfo(P, R, G): standard (integer) Diffie-Hellman group information.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -381,9 +426,9 @@ static PyTypeObject dhinfo_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - 0, /* @tp_methods@ */ + PYMETHODS(dhinfo), /* @tp_methods@ */ 0, /* @tp_members@ */ - dhinfo_pygetset, /* @tp_getset@ */ + PYGETSET(dhinfo), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -421,7 +466,7 @@ static PyTypeObject bindhinfo_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"BinDHInfo(P, R, G): binary-field Diffie-Hellman group information.", + "BinDHInfo(P, R, G): binary-field Diffie-Hellman group information.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -429,9 +474,9 @@ static PyTypeObject bindhinfo_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - 0, /* @tp_methods@ */ + PYMETHODS(bindhinfo), /* @tp_methods@ */ 0, /* @tp_members@ */ - bindhinfo_pygetset, /* @tp_getset@ */ + PYGETSET(bindhinfo), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -447,11 +492,11 @@ static PyTypeObject bindhinfo_pytype_skel = { /*----- General utilities -------------------------------------------------*/ PyTypeObject *ge_pytype, *group_pytype; -PyTypeObject *primegroup_pytype, *bingroup_pytype, *ecgroup_pytype; +static PyTypeObject *primegroup_pytype, *bingroup_pytype, *ecgroup_pytype; group *group_copy(group *g) { - if (strcmp(G_NAME(g), "prime") == 0) { + if (STRCMP(G_NAME(g), ==, "prime")) { gctx_prime *gc = (gctx_prime *)g; gprime_param gp; gp.g = G_TOINT(g, MP_NEW, g->g); @@ -459,7 +504,7 @@ group *group_copy(group *g) gp.q = gc->g.r; g = group_prime(&gp); MP_DROP(gp.g); - } else if (strcmp(G_NAME(g), "bin") == 0) { + } else if (STRCMP(G_NAME(g), ==, "bin")) { gctx_bin *gc = (gctx_bin *)g; gbin_param gb; gb.g = G_TOINT(g, MP_NEW, g->g); @@ -467,7 +512,7 @@ group *group_copy(group *g) gb.q = gc->g.r; g = group_binary(&gb); MP_DROP(gb.g); - } else if (strcmp(G_NAME(g), "ec") == 0) { + } else if (STRCMP(G_NAME(g), ==, "ec")) { gctx_ec *gc = (gctx_ec *)g; ec_info ei; if ((ei.c = eccurve_copy(gc->ei.c)) == 0) @@ -493,7 +538,7 @@ PyObject *ge_pywrap(PyObject *gobj, ge *x) static PyObject *ge_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { - char *kwlist[] = { "x", 0 }; + static const char *const kwlist[] = { "x", 0 }; PyObject *x; group *g; ec p = EC_INIT; @@ -502,7 +547,7 @@ static PyObject *ge_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) mptext_stringctx sc; g = GROUP_G(ty); - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O:new", kwlist, &x)) goto end; + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O:new", KWLIST, &x)) goto end; xx = G_CREATE(g); if (ECPT_PYCHECK(x)) { getecptout(&p, x); @@ -550,9 +595,9 @@ PyObject *group_pywrap(group *g) { PyTypeObject *ty; - if (strcmp(G_NAME(g), "prime") == 0) ty = primegroup_pytype; - else if (strcmp(G_NAME(g), "bin") == 0) ty = bingroup_pytype; - else if (strcmp(G_NAME(g), "ec") == 0) ty = ecgroup_pytype; + if (STRCMP(G_NAME(g), ==, "prime")) ty = primegroup_pytype; + else if (STRCMP(G_NAME(g), ==, "bin")) ty = bingroup_pytype; + else if (STRCMP(G_NAME(g), ==, "ec")) ty = ecgroup_pytype; else abort(); return (group_dopywrap(ty, g)); } @@ -716,21 +761,21 @@ end: static PyObject *gemeth_toec(PyObject *me, PyObject *arg, PyObject *kw) { - char *kwlist[] = { "curve", 0 }; + static const char *const kwlist[] = { "curve", 0 }; PyTypeObject *cty = 0; PyObject *rc = 0; group *g; ec_curve *c; ec p = EC_INIT; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O:toec", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O:toec", KWLIST, &cty)) goto end; g = GROUP_G(GE_GOBJ(me)); if (cty) { if (!PyType_Check(cty) || !PyType_IsSubtype(cty, ecpt_pytype)) TYERR("want subtype of catacomb.ECPt"); Py_INCREF((PyObject *)cty); - } else if (strcmp(G_NAME(g), "ec") == 0) { + } else if (STRCMP(G_NAME(g), ==, "ec")) { c = eccurve_copy(((gctx_ec *)g)->ei.c); cty = (PyTypeObject *)eccurve_pywrap(0, c); } else { @@ -800,11 +845,11 @@ static PyObject *gmeth_mexp(PyObject *me, PyObject *arg) static PyObject *gmeth_checkgroup(PyObject *me, PyObject *arg, PyObject *kw) { - char *kwlist[] = { "rng", 0 }; + static const char *const kwlist[] = { "rng", 0 }; grand *r = &rand_global; const char *p; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:checkgroup", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:checkgroup", KWLIST, convgrand, &r)) goto end; if ((p = G_CHECK(GROUP_G(me), r)) != 0) @@ -827,7 +872,7 @@ end: return (0); } -static PyObject *meth__GE_frombuf(PyObject *me, PyObject *arg) +static PyObject *gemeth_frombuf(PyObject *me, PyObject *arg) { buf b; char *p; @@ -835,20 +880,18 @@ static PyObject *meth__GE_frombuf(PyObject *me, PyObject *arg) group *g; ge *x = 0; - if (!PyArg_ParseTuple(arg, "Os#:frombuf", &me, &p, &n)) - return (0); + if (!PyArg_ParseTuple(arg, "s#:frombuf", &p, &n)) return (0); g = GROUP_G(me); buf_init(&b, p, n); x = G_CREATE(g); - if (G_FROMBUF(g, &b, x)) - VALERR("invalid data"); + if (G_FROMBUF(g, &b, x)) VALERR("invalid data"); return (Py_BuildValue("(NN)", ge_pywrap(me, x), bytestring_pywrapbuf(&b))); end: if (x) G_DESTROY(g, x); return (0); } -static PyObject *meth__GE_fromraw(PyObject *me, PyObject *arg) +static PyObject *gemeth_fromraw(PyObject *me, PyObject *arg) { buf b; char *p; @@ -856,20 +899,18 @@ static PyObject *meth__GE_fromraw(PyObject *me, PyObject *arg) group *g; ge *x = 0; - if (!PyArg_ParseTuple(arg, "Os#:fromraw", &me, &p, &n)) - return (0); + if (!PyArg_ParseTuple(arg, "s#:fromraw", &p, &n)) return (0); g = GROUP_G(me); buf_init(&b, p, n); x = G_CREATE(g); - if (G_FROMRAW(g, &b, x)) - VALERR("invalid data"); + if (G_FROMRAW(g, &b, x)) VALERR("invalid data"); return (Py_BuildValue("(NN)", ge_pywrap(me, x), bytestring_pywrapbuf(&b))); end: if (x) G_DESTROY(g, x); return (0); } -static PyObject *meth__GE_fromstring(PyObject *me, PyObject *arg) +static PyObject *gemeth_fromstring(PyObject *me, PyObject *arg) { mptext_stringctx sc; char *p; @@ -877,8 +918,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); @@ -892,18 +932,15 @@ 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; - qd.p = p; - qd.e = 0; - if ((g = group_parse(&qd)) == 0) - VALERR(qd.e); + 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)); end: return (0); @@ -950,28 +987,31 @@ static PyObject *gget_r(PyObject *me, void *hunoz) static PyObject *gget_h(PyObject *me, void *hunoz) { return (mp_pywrap(MP_COPY(GROUP_G(me)->h))); } -static PyGetSetDef ge_pygetset[] = { +static const PyGetSetDef ge_pygetset[] = { #define GETSETNAME(op, name) ge##op##_##name GET (group, "X.group -> group containing X") #undef GETSETNAME { 0 } }; -static PyMethodDef ge_pymethods[] = { +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") - KWMETH(toec, "\ -X.toec(curve = ecpt) -> X converted to elliptic curve point") + 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") + CMTH (frombuf, "frombuf(BUF) -> X, REST") + CMTH (fromraw, "fromraw(BUF) -> X, REST") + CMTH (fromstring, "fromstring(STR) -> X, REST") #undef METHNAME { 0 } }; -static PyNumberMethods ge_pynumber = { +static const PyNumberMethods ge_pynumber = { 0, /* @nb_add@ */ 0, /* @nb_subtract@ */ ge_pymul, /* @nb_multiply@ */ @@ -1026,7 +1066,7 @@ static PyTypeObject ge_pytype_skel = { 0, /* @tp_setattr@ */ 0, /* @tp_compare@ */ 0, /* @tp_repr@ */ - &ge_pynumber, /* @tp_as_number@ */ + PYNUMBER(ge), /* @tp_as_number@ */ 0, /* @tp_as_sequence@ */ 0, /* @tp_as_mapping@ */ ge_pyhash, /* @tp_hash@ */ @@ -1040,7 +1080,7 @@ static PyTypeObject ge_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"Group elements, abstract base class.", + "Group elements, abstract base class.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1048,9 +1088,9 @@ static PyTypeObject ge_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - ge_pymethods, /* @tp_methods@ */ + PYMETHODS(ge), /* @tp_methods@ */ 0, /* @tp_members@ */ - ge_pygetset, /* @tp_getset@ */ + PYGETSET(ge), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1063,7 +1103,7 @@ static PyTypeObject ge_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyGetSetDef group_pygetset[] = { +static const PyGetSetDef group_pygetset[] = { #define GETSETNAME(op, name) g##op##_##name GET (noctets, "G.noctets -> size in octets of element") GET (nbits, "G.nbits -> size in bits of element") @@ -1075,11 +1115,11 @@ static PyGetSetDef group_pygetset[] = { { 0 } }; -static PyMethodDef group_pymethods[] = { +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(rand = random): check group is good") + 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 } }; @@ -1109,7 +1149,7 @@ static PyTypeObject group_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"Abstract base class for groups.", + "Abstract base class for groups.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1117,9 +1157,9 @@ static PyTypeObject group_pytype_skel = { 0, /* @tp_weaklistoffset@ */ 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ - group_pymethods, /* @tp_methods@ */ + PYMETHODS(group), /* @tp_methods@ */ 0, /* @tp_members@ */ - group_pygetset, /* @tp_getset@ */ + PYGETSET(group), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1142,7 +1182,7 @@ static PyObject *pgget_info(PyObject *me, void *hunoz) return (fginfo_pywrap(&dp, dhinfo_pytype)); } -static PyGetSetDef primegroup_pygetset[] = { +static const PyGetSetDef primegroup_pygetset[] = { #define GETSETNAME(op, name) pg##op##_##name GET (info, "G.info -> information about the group") #undef GETSETNAME @@ -1153,9 +1193,9 @@ static PyObject *primegroup_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { PyObject *i; - char *kwlist[] = { "info", 0 }; + static const char *const kwlist[] = { "info", 0 }; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!:new", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!:new", KWLIST, dhinfo_pytype, &i)) return (0); return (group_dopywrap(ty, group_prime(FGINFO_DP(i)))); @@ -1186,7 +1226,7 @@ static PyTypeObject primegroup_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"PrimeGroup(INFO): subgroups of prime fields.", + "PrimeGroup(INFO): subgroups of prime fields.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1196,7 +1236,7 @@ static PyTypeObject primegroup_pytype_skel = { 0, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ - primegroup_pygetset, /* @tp_getset@ */ + PYGETSET(primegroup), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1219,7 +1259,7 @@ static PyObject *bgget_info(PyObject *me, void *hunoz) return (fginfo_pywrap(&dp, bindhinfo_pytype)); } -static PyGetSetDef bingroup_pygetset[] = { +static const PyGetSetDef bingroup_pygetset[] = { #define GETSETNAME(op, name) bg##op##_##name GET (info, "G.info -> information about the group") #undef GETSETNAME @@ -1230,9 +1270,9 @@ static PyObject *bingroup_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) { PyObject *i; - char *kwlist[] = { "info", 0 }; + static const char *const kwlist[] = { "info", 0 }; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!:new", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!:new", KWLIST, bindhinfo_pytype, &i)) return (0); return (group_dopywrap(ty, group_binary(FGINFO_DP(i)))); @@ -1263,7 +1303,7 @@ static PyTypeObject bingroup_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"BinGroup(INFO): subgroups of binary fields.", + "BinGroup(INFO): subgroups of binary fields.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1273,7 +1313,7 @@ static PyTypeObject bingroup_pytype_skel = { 0, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ - bingroup_pygetset, /* @tp_getset@ */ + PYGETSET(bingroup), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1295,7 +1335,7 @@ static PyObject *egget_info(PyObject *me, void *hunoz) return (ecinfo_pywrap(&ei)); } -static PyGetSetDef ecgroup_pygetset[] = { +static const PyGetSetDef ecgroup_pygetset[] = { #define GETSETNAME(op, name) eg##op##_##name GET (info, "G.info -> information about the group") #undef GETSETNAME @@ -1307,9 +1347,9 @@ static PyObject *ecgroup_pynew(PyTypeObject *ty, { PyObject *i; ec_info ei; - char *kwlist[] = { "info", 0 }; + static const char *const kwlist[] = { "info", 0 }; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!:new", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!:new", KWLIST, ecinfo_pytype, &i)) return (0); ecinfo_copy(&ei, ECINFO_EI(i)); @@ -1341,7 +1381,7 @@ static PyTypeObject ecgroup_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"ECGroup(INFO): elliptic curve groups.", + "ECGroup(INFO): elliptic curve groups.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1351,7 +1391,7 @@ static PyTypeObject ecgroup_pytype_skel = { 0, /* @tp_iternext@ */ 0, /* @tp_methods@ */ 0, /* @tp_members@ */ - ecgroup_pygetset, /* @tp_getset@ */ + PYGETSET(ecgroup), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -1366,32 +1406,6 @@ static PyTypeObject ecgroup_pytype_skel = { /*----- Global stuff ------------------------------------------------------*/ -static 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); @@ -1402,7 +1416,6 @@ void group_pyinit(void) INITTYPE(primegroup, group); INITTYPE(bingroup, group); INITTYPE(ecgroup, group); - addmethods(methods); } void group_pyinsert(PyObject *mod)