X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/d96c882ed6f1852a266fd1a2b61bbc906cc805bb..a157093f4bbc3066fea2f77078b99489c76e62f8:/group.c diff --git a/group.c b/group.c index 3a4b05b..254f8ce 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,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; @@ -205,12 +201,12 @@ static PyObject *meth__DHInfo_gendsa(PyObject *me, 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, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&s#|O&O&:gendsa", KWLIST, + convuint, &pl, convuint, &ql, &k, &ksz, convpgev, &evt, convuint, &steps)) goto end; @@ -258,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); @@ -266,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, @@ -280,29 +276,28 @@ 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") #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") @@ -310,7 +305,30 @@ static PyGetSetDef dhinfo_pygetset[] = { { 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") @@ -319,6 +337,14 @@ static PyGetSetDef bindhinfo_pygetset[] = { { 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@ */ @@ -354,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@ */ @@ -400,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@ */ @@ -448,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@ */ @@ -846,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; @@ -854,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; @@ -875,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; @@ -896,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); @@ -911,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); @@ -969,14 +987,14 @@ 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") @@ -986,11 +1004,14 @@ static PyMethodDef ge_pymethods[] = { "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@ */ @@ -1045,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@ */ @@ -1067,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@ */ @@ -1082,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") @@ -1094,10 +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([rng = rand]): check group is good") + SMTH (parse, "parse(STR) -> G, REST") #undef METHNAME { 0 } }; @@ -1135,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@ */ @@ -1160,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 @@ -1214,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@ */ @@ -1237,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 @@ -1291,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@ */ @@ -1313,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 @@ -1369,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@ */ @@ -1384,35 +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); @@ -1423,7 +1416,6 @@ void group_pyinit(void) INITTYPE(primegroup, group); INITTYPE(bingroup, group); INITTYPE(ecgroup, group); - addmethods(methods); } void group_pyinsert(PyObject *mod)