X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/827f89d7920979b763e228970132c3624a921b13..be631e83aad0076384867bc2da685ae846f887a8:/group.c diff --git a/group.c b/group.c index b5a1815..3a4b05b 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; @@ -92,18 +101,20 @@ static PyObject *meth__DHInfo_generate(PyObject *me, unsigned ql = 0, pl; unsigned steps = 0; grand *r = &rand_global; - pgev evt = { 0 }; + struct excinfo exc = EXCINFO_INIT; + pypgev evt = { { 0 } }; static const char *const kwlist[] = { "class", "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, 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); @@ -117,7 +128,8 @@ static PyObject *meth__DHInfo_genlimlee(PyObject *me, 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; static const char *const kwlist[] = { @@ -128,6 +140,7 @@ static PyObject *meth__DHInfo_genlimlee(PyObject *me, 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, @@ -137,11 +150,11 @@ static PyObject *meth__DHInfo_genlimlee(PyObject *me, 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: @@ -156,19 +169,21 @@ static PyObject *meth__DHInfo_genkcdsa(PyObject *me, unsigned ql, pl; unsigned steps = 0; grand *r = &rand_global; - pgev evt = { 0 }; + struct excinfo exc = EXCINFO_INIT; + pypgev evt = { { 0 } }; static const char *const kwlist[] = { "class", "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, 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), @@ -187,18 +202,20 @@ static PyObject *meth__DHInfo_gendsa(PyObject *me, dsa_seed ds; char *k; Py_ssize_t ksz; - pgev evt = { 0 }; + struct excinfo exc = EXCINFO_INIT; + pypgev evt = { { 0 } }; static const char *const kwlist[] = { "class", "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)) 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); @@ -280,24 +297,24 @@ static PyObject *meth__BinDHInfo_parse(PyObject *me, PyObject *arg) static 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[] = { #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[] = { #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 } }; @@ -327,7 +344,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@ */ @@ -375,7 +392,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@ */ @@ -423,7 +440,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@ */ @@ -449,11 +466,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); @@ -461,7 +478,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); @@ -469,7 +486,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) @@ -552,9 +569,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)); } @@ -732,7 +749,7 @@ static PyObject *gemeth_toec(PyObject *me, PyObject *arg, PyObject *kw) 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 { @@ -965,8 +982,8 @@ static PyMethodDef ge_pymethods[] = { 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") #undef METHNAME @@ -1042,7 +1059,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@ */ @@ -1079,9 +1096,8 @@ static PyGetSetDef group_pygetset[] = { static 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") #undef METHNAME { 0 } }; @@ -1111,7 +1127,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@ */ @@ -1188,7 +1204,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@ */ @@ -1265,7 +1281,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@ */ @@ -1343,7 +1359,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@ */ @@ -1370,26 +1386,29 @@ static PyTypeObject ecgroup_pytype_skel = { 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)") + 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 } };