X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/24b3d57bcf320d9d7a90a40d5f6176b1f087ab3e..278e43d0c27875a1355ebaf3bef6d0f5df739626:/group.c diff --git a/group.c b/group.c index fe05f15..cc8bbc1 100644 --- a/group.c +++ b/group.c @@ -1,13 +1,11 @@ /* -*-c-*- - * - * $Id$ * * Abstract group inteface * * (c) 2004 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to Catacomb. * @@ -15,12 +13,12 @@ * 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. @@ -186,7 +184,7 @@ static PyObject *meth__DHInfo_gendsa(PyObject *me, unsigned steps = 0; dsa_seed ds; char *k; - int ksz; + Py_ssize_t ksz; pgev evt = { 0 }; char *kwlist[] = { "class", "pbits", "qbits", "seed", "event", "nsteps", 0 }; @@ -227,11 +225,11 @@ static PyObject *namedgroups(const pentry *pp, int *ne) } c = PyInt_FromLong(i); found: - PyDict_SetItemString(d, (/*unconst*/ char *)pp[i].name, c); + PyDict_SetItemString(d, (/*unconst*/ char *)p, c); Py_DECREF(c); } *ne = i; - return (d); + return (d); } static PyObject *meth__groupn(PyObject *me, PyObject *arg, @@ -266,10 +264,10 @@ static PyObject *meth__parse(PyObject *me, PyObject *arg, PyTypeObject *ty, if (!PyArg_ParseTuple(arg, "Os:parse", &me, &p)) goto end; qd.p = p; qd.e = 0; - if (parse(&qd, &gp)) SYNERR(qd.e); + if (parse(&qd, &gp)) VALERR(qd.e); rc = fginfo_pywrap(&gp, ty); end: - return (rc); + return (rc); } static PyObject *meth__DHInfo_parse(PyObject *me, PyObject *arg) @@ -304,7 +302,7 @@ static PyGetSetDef bindhinfo_pygetset[] = { static PyTypeObject fginfo_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.FGInfo", /* @tp_name@ */ + "FGInfo", /* @tp_name@ */ sizeof(fginfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -352,7 +350,7 @@ static PyTypeObject fginfo_pytype_skel = { static PyTypeObject dhinfo_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.DHInfo", /* @tp_name@ */ + "DHInfo", /* @tp_name@ */ sizeof(fginfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -400,7 +398,7 @@ static PyTypeObject dhinfo_pytype_skel = { static PyTypeObject bindhinfo_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BinDHInfo", /* @tp_name@ */ + "BinDHInfo", /* @tp_name@ */ sizeof(fginfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -468,7 +466,7 @@ group *group_copy(group *g) gb.p = gc->r.p; gb.q = gc->g.r; g = group_binary(&gb); - MP_DROP(gb.g); + MP_DROP(gb.g); } else if (strcmp(G_NAME(g), "ec") == 0) { gctx_ec *gc = (gctx_ec *)g; ec_info ei; @@ -519,7 +517,7 @@ static PyObject *ge_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) sc.buf = PyString_AS_STRING(x); sc.lim = sc.buf + PyString_GET_SIZE(x); if (G_READ(g, xx, &mptext_stringops, &sc) || sc.buf < sc.lim) - SYNERR("malformed group element string"); + VALERR("malformed group element string"); } else TYERR("can't convert to group element"); return (ge_pywrap((PyObject *)ty, xx)); @@ -544,7 +542,7 @@ static PyObject *group_dopywrap(PyTypeObject *ty, group *g) gobj->ty.ht_type.tp_alloc = PyType_GenericAlloc; gobj->ty.ht_type.tp_free = 0; gobj->ty.ht_type.tp_new = ge_pynew; - PyType_Ready(&gobj->ty.ht_type); + typeready(&gobj->ty.ht_type); return ((PyObject *)gobj); } @@ -697,8 +695,8 @@ static PyObject *ge_pyint(PyObject *me) if ((x = G_TOINT(GE_G(me), MP_NEW, GE_X(me))) == 0) TYERR("can't convert to integer"); - if (mp_tolong_checked(x, &l)) goto end; - rc = PyInt_FromLong(l); + if (!mp_tolong_checked(x, &l, 0)) rc = PyInt_FromLong(l); + else rc = mp_topylong(x); end: mp_drop(x); return (rc); @@ -719,18 +717,34 @@ end: static PyObject *gemeth_toec(PyObject *me, PyObject *arg, PyObject *kw) { char *kwlist[] = { "curve", 0 }; - PyTypeObject *cty = ecpt_pytype; + PyTypeObject *cty = 0; + PyObject *rc = 0; + group *g; + ec_curve *c; ec p = EC_INIT; if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O:toec", kwlist, &cty)) goto end; - if (!PyType_Check(cty) || !PyType_IsSubtype(cty, ecpt_pytype)) - TYERR("want subtype of catacomb.ECPt"); - if (G_TOEC(GE_G(me), &p, GE_X(me))) + 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) { + c = eccurve_copy(((gctx_ec *)g)->ei.c); + cty = (PyTypeObject *)eccurve_pywrap(0, c); + } else { + cty = ecpt_pytype; + Py_INCREF((PyObject *)cty); + } + if (G_TOEC(GE_G(me), &p, GE_X(me))) { + Py_DECREF((PyObject *)cty); TYERR("can't convert to ec point"); - return (ecpt_pywrapout(cty, &p)); + } + rc = ecpt_pywrapout(cty, &p); + Py_DECREF((PyObject *)cty); end: - return (0); + return (rc); } static PyObject *gemeth_tobuf(PyObject *me, PyObject *arg) @@ -784,13 +798,13 @@ static PyObject *gmeth_mexp(PyObject *me, PyObject *arg) gmexp_id, gmexp_fill, gmexp_exp, gmexp_drop)); } -static PyObject *gmeth_check(PyObject *me, PyObject *arg, PyObject *kw) +static PyObject *gmeth_checkgroup(PyObject *me, PyObject *arg, PyObject *kw) { char *kwlist[] = { "rng", 0 }; grand *r = &rand_global; const char *p; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:check", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:checkgroup", kwlist, convgrand, &r)) goto end; if ((p = G_CHECK(GROUP_G(me), r)) != 0) @@ -817,7 +831,7 @@ static PyObject *meth__GE_frombuf(PyObject *me, PyObject *arg) { buf b; char *p; - int n; + Py_ssize_t n; group *g; ge *x = 0; @@ -838,7 +852,7 @@ static PyObject *meth__GE_fromraw(PyObject *me, PyObject *arg) { buf b; char *p; - int n; + Py_ssize_t n; group *g; ge *x = 0; @@ -859,7 +873,7 @@ static PyObject *meth__GE_fromstring(PyObject *me, PyObject *arg) { mptext_stringctx sc; char *p; - int n; + Py_ssize_t n; group *g; ge *x = 0; @@ -870,9 +884,9 @@ static PyObject *meth__GE_fromstring(PyObject *me, PyObject *arg) g = GROUP_G(me); x = G_CREATE(g); if (G_READ(g, x, &mptext_stringops, &sc)) - SYNERR("bad group element string"); + VALERR("bad group element string"); return (Py_BuildValue("(Ns#)", ge_pywrap(me, x), - sc.buf, (int)(sc.lim - sc.buf))); + sc.buf, (Py_ssize_t)(sc.lim - sc.buf))); end: if (x) G_DESTROY(g, x); return (0); @@ -889,7 +903,7 @@ static PyObject *meth__Group_parse(PyObject *me, PyObject *arg) qd.p = p; qd.e = 0; if ((g = group_parse(&qd)) == 0) - SYNERR(qd.e); + VALERR(qd.e); return (group_pywrap(g)); end: return (0); @@ -916,6 +930,20 @@ 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) +{ + buf b; + size_t sz = GE_G(me)->noctets + 4; + uint32 h = 0xf672c776 + GE_G(me)->ops->ty; + octet *p = xmalloc(sz); + buf_init(&b, p, sz); + G_TOBUF(GE_G(me), &b, GE_X(me)); + assert(BOK(&b)); + h = unihash_hash(&unihash_global, h, BBASE(&b), BLEN(&b)); + xfree(p); + return (h % LONG_MAX); +} + static PyObject *gget_r(PyObject *me, void *hunoz) { return (mp_pywrap(MP_COPY(GROUP_G(me)->r))); } @@ -988,7 +1016,7 @@ static PyNumberMethods ge_pynumber = { static PyTypeObject ge_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.GE", /* @tp_name@ */ + "GE", /* @tp_name@ */ sizeof(ge_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1001,7 +1029,7 @@ static PyTypeObject ge_pytype_skel = { &ge_pynumber, /* @tp_as_number@ */ 0, /* @tp_as_sequence@ */ 0, /* @tp_as_mapping@ */ - 0, /* @tp_hash@ */ + ge_pyhash, /* @tp_hash@ */ 0, /* @tp_call@ */ ge_pystr, /* @tp_str@ */ 0, /* @tp_getattro@ */ @@ -1051,14 +1079,14 @@ static PyMethodDef group_pymethods[] = { #define METHNAME(name) gmeth_##name METH (mexp, "\ G.mexp([(X0, N0), (X1, N1), ...]) -> X0^N0 X1^N1 ...") - KWMETH(check, "G.check(rand = random): check group is good") + KWMETH(checkgroup, "G.checkgroup(rand = random): check group is good") #undef METHNAME { 0 } }; static PyTypeObject group_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.Group", /* @tp_name@ */ + "Group", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1110,7 +1138,7 @@ static PyObject *pgget_info(PyObject *me, void *hunoz) gctx_prime *gg = (gctx_prime *)GROUP_G(me); dp.p = MP_COPY(gg->mm.m); dp.q = MP_COPY(gg->g.r); - dp.g = mpmont_reduce(&gg->mm, MP_NEW, gg->gen); + dp.g = mpmont_reduce(&gg->mm, MP_NEW, gg->gen.x); return (fginfo_pywrap(&dp, dhinfo_pytype)); } @@ -1135,7 +1163,7 @@ static PyObject *primegroup_pynew(PyTypeObject *ty, static PyTypeObject primegroup_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.PrimeGroup", /* @tp_name@ */ + "PrimeGroup", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1187,7 +1215,7 @@ static PyObject *bgget_info(PyObject *me, void *hunoz) gctx_bin *gg = (gctx_bin *)GROUP_G(me); dp.p = MP_COPY(gg->r.p); dp.q = MP_COPY(gg->g.r); - dp.g = MP_COPY(gg->gen); + dp.g = MP_COPY(gg->gen.x); return (fginfo_pywrap(&dp, bindhinfo_pytype)); } @@ -1212,7 +1240,7 @@ static PyObject *bingroup_pynew(PyTypeObject *ty, static PyTypeObject bingroup_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.BinGroup", /* @tp_name@ */ + "BinGroup", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1290,7 +1318,7 @@ static PyObject *ecgroup_pynew(PyTypeObject *ty, static PyTypeObject ecgroup_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECGroup", /* @tp_name@ */ + "ECGroup", /* @tp_name@ */ sizeof(group_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1350,10 +1378,10 @@ static PyMethodDef methods[] = { METH (_BinDHInfo__groupn, 0) KWMETH(_DHInfo_generate, "\ generate(PBITS, [qbits = 0, event = pgen_nullev,\n\ - rng = rand, nsteps = 0]) -> D") + 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, ...])") + rng = rand, nsteps = 0, subgroupp = True]) -> (D, [Q, ...])") KWMETH(_DHInfo_gendsa, "\ gendsa(PBITS, QBITS, SEED, [event = pgen_nullev, nsteps = 0])\n\ -> (D, SEED, COUNT)")