X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/24b3d57bcf320d9d7a90a40d5f6176b1f087ab3e..183e9cd31b1ac2f14b86c5de6ac2643b8a4364a2:/ec.c diff --git a/ec.c b/ec.c index 5173356..da4cc34 100644 --- a/ec.c +++ b/ec.c @@ -1,13 +1,11 @@ /* -*-c-*- - * - * $Id$ * * Elliptic curves * * (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. @@ -195,16 +193,20 @@ static PyObject *ecpt_pymul(PyObject *x, PyObject *y) static long ecpt_pyhash(PyObject *me) { - long i; + uint32 h; + buf b; ec p = EC_INIT; + size_t sz = 2*ECPT_C(me)->f->noctets + 1; + octet *q = xmalloc(sz); + h = 0xe0fdd039 + ECPT_C(me)->f->ops->ty; + buf_init(&b, q, sz); EC_OUT(ECPT_C(me), &p, ECPT_P(me)); - i = 0xe0fdd039; /* random perturbance */ - if (p.x) i ^= mp_tolong(p.x); - if (p.y) i ^= mp_tolong(p.y); - if (i == -1) i = -2; + ec_putraw(ECPT_C(me), &b, &p); EC_DESTROY(&p); - return (i); + h = unihash_hash(&unihash_global, h, BBASE(&b), BLEN(&b)); + xfree(q); + return (h % LONG_MAX); } static PyObject *ecpt_pyrichcompare(PyObject *x, PyObject *y, int op) @@ -233,7 +235,8 @@ end: static PyObject *epmeth_oncurvep(PyObject *me, PyObject *arg) { if (!PyArg_ParseTuple(arg, ":oncurvep")) return (0); - return (getbool(!ec_check(ECPT_C(me), ECPT_P(me)))); + return (getbool(EC_ATINF(ECPT_P(me)) || + !EC_CHECK(ECPT_C(me), ECPT_P(me)))); } static PyObject *epmeth_dbl(PyObject *me, PyObject *arg) @@ -287,6 +290,34 @@ static PyObject *epmeth_toraw(PyObject *me, PyObject *arg) return (rc); } +static PyObject *epmeth_ec2osp(PyObject *me, PyObject *arg, PyObject *kw) +{ + buf b; + PyObject *rc; + char *p; + ec_curve *c = ECPT_C(me); + ec pp = EC_INIT; + int f = EC_EXPLY; + int len; + char *kwlist[] = { "flags", 0 }; + + if (!PyArg_ParseTupleAndKeywords(arg, kw, "|i:ectosp", kwlist, &f)) + return (0); + len = c->f->noctets * 2 + 1; + rc = bytestring_pywrap(0, len); + p = PyString_AS_STRING(rc); + buf_init(&b, p, len); + EC_OUT(c, &pp, ECPT_P(me)); + if (ec_ec2osp(c, f, &b, &pp)) { + Py_DECREF(rc); rc = 0; + VALERR("invalid flags"); + } + EC_DESTROY(&pp); + _PyString_Resize(&rc, BLEN(&b)); +end: + return (rc); +} + static PyObject *epget_curve(PyObject *me, void *hunoz) { RETURN_OBJ(ECPT_COBJ(me)); } @@ -433,7 +464,7 @@ static int ecptxl_1(ec_curve *c, ec *p, PyObject *x) qd.p = q; qd.e = 0; if (!ec_ptparse(&qd, p)) - SYNERR(qd.e); + VALERR(qd.e); goto fix; } else if (c && (xx = tomp(x)) != 0) { xx = F_IN(c->f, xx, xx); @@ -494,8 +525,8 @@ static PyObject *ecpt_pyint(PyObject *me) PyObject *rc = 0; if (EC_ATINF(ECPT_P(me))) VALERR("point at infinity"); getecptout(&p, me); - if (mp_tolong_checked(p.x, &l)) goto end; - rc = PyInt_FromLong(l); + if (!mp_tolong_checked(p.x, &l, 0)) rc = PyInt_FromLong(l); + else rc = mp_topylong(p.x); end: EC_DESTROY(&p); return (rc); @@ -590,7 +621,7 @@ static PyNumberMethods ecpt_pynumber = { static PyTypeObject ecpt_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECPt", /* @tp_name@ */ + "ECPt", /* @tp_name@ */ sizeof(ecpt_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -614,7 +645,9 @@ static PyTypeObject ecpt_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ -"Elliptic curve points, not associated with any curve.", +"ECPt([X, [Y]]): elliptic curve points, not associated with any curve.\n\ + X alone may be None, an existing point, a string 'X, Y', an\n\ + x-coordinate, or a pair (X, Y); X and Y should be a coordinate pair.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -653,6 +686,7 @@ static PyGetSetDef ecpt_pygetset[] = { static PyMethodDef ecpt_pymethods[] = { #define METHNAME(func) epmeth_##func METH (toraw, "X.toraw() -> BIN") + KWMETH(ec2osp, "X.ec2osp([flags = EC_EXPLY]) -> BIN") METH (dbl, "X.dbl() -> X + X") METH (oncurvep, "X.oncurvep() -> BOOL") #undef METHNAME @@ -704,7 +738,7 @@ static PyNumberMethods ecptcurve_pynumber = { static PyTypeObject ecptcurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECPtCurve", /* @tp_name@ */ + "ECPtCurve", /* @tp_name@ */ sizeof(ecpt_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -773,10 +807,10 @@ static int ecmmul_fill(void *pp, PyObject *me, PyObject *x, PyObject *m) { ec_mulfactor *f = pp; + EC_CREATE(&f->base); if (getecpt(ECCURVE_C(me), &f->base, x) || (f->exp = getmp(m)) == 0) return (-1); - f->base = *ECPT_P(x); return (0); } @@ -803,7 +837,7 @@ static PyObject *ecmeth_mmul(PyObject *me, PyObject *arg) static PyObject *meth__ECPtCurve_fromraw(PyObject *me, PyObject *arg) { char *p; - int len; + Py_ssize_t len; buf b; PyObject *rc = 0; ec_curve *cc; @@ -814,7 +848,31 @@ static PyObject *meth__ECPtCurve_fromraw(PyObject *me, PyObject *arg) buf_init(&b, p, len); cc = ECCURVE_C(me); if (ec_getraw(cc, &b, &pp)) - SYNERR("bad point"); + VALERR("bad point"); + EC_IN(cc, &pp, &pp); + rc = Py_BuildValue("(NN)", ecpt_pywrap(me, &pp), bytestring_pywrapbuf(&b)); +end: + return (rc); +} + +static PyObject *meth__ECPtCurve_os2ecp(PyObject *me, + PyObject *arg, PyObject *kw) +{ + char *p; + Py_ssize_t len; + buf b; + PyObject *rc = 0; + ec_curve *cc; + int f = EC_XONLY | EC_LSB | EC_SORT | EC_EXPLY; + ec pp = EC_INIT; + char *kwlist[] = { "buf", "flags", 0 }; + + if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|f:os2ecp", kwlist, + &me, &p, &len, &f)) + return (0); + buf_init(&b, p, len); + cc = ECCURVE_C(me); + if (ec_os2ecp(cc, f, &b, &pp)) VALERR("bad point"); EC_IN(cc, &pp, &pp); rc = Py_BuildValue("(NN)", ecpt_pywrap(me, &pp), bytestring_pywrapbuf(&b)); end: @@ -825,7 +883,7 @@ static PyObject *meth__ECPt_frombuf(PyObject *me, PyObject *arg) { buf b; char *p; - int sz; + Py_ssize_t sz; PyObject *rc = 0; ec pp = EC_INIT; @@ -848,7 +906,7 @@ static PyObject *meth__ECPt_parse(PyObject *me, PyObject *arg) if (!PyArg_ParseTuple(arg, "Os:parse", &me, &p)) goto end; qd.p = p; qd.e = 0; - if (!ec_ptparse(&qd, &pp)) SYNERR(qd.e); + if (!ec_ptparse(&qd, &pp)) VALERR(qd.e); rc = Py_BuildValue("(Ns)", ecpt_pywrapout(me, &pp), qd.p); end: return (rc); @@ -913,7 +971,7 @@ static PyObject *eccurve_dopywrap(PyTypeObject *ty, cobj->ty.ht_type.tp_alloc = PyType_GenericAlloc; cobj->ty.ht_type.tp_free = 0; cobj->ty.ht_type.tp_new = ecpt_pynew; - PyType_Ready(&cobj->ty.ht_type); + typeready(&cobj->ty.ht_type); return ((PyObject *)cobj); } @@ -972,7 +1030,7 @@ static PyObject *meth__ECCurve_parse(PyObject *me, PyObject *arg) qd.p = p; qd.e = 0; if ((c = ec_curveparse(&qd)) == 0) - SYNERR(qd.e); + VALERR(qd.e); rc = eccurve_pywrap(0, c); end: return (rc); @@ -984,7 +1042,7 @@ static PyObject *ecget_name(PyObject *me, void *hunoz) static PyObject *ecget_a(PyObject *me, void *hunoz) { return (fe_pywrap(ECCURVE_FOBJ(me), MP_COPY(ECCURVE_C(me)->a))); } -static PyObject *ecget_b(PyObject *me, void *hunoz) +static PyObject *ecget_b(PyObject *me, void *hunoz) { return (fe_pywrap(ECCURVE_FOBJ(me), MP_COPY(ECCURVE_C(me)->b))); } static PyObject *ecget_field(PyObject *me, void *hunoz) @@ -1002,7 +1060,7 @@ static PyGetSetDef eccurve_pygetset[] = { GET (inf, "E.inf -> point at infinity of this curve") #undef GETSETNAME { 0 } -}; +}; static PyMethodDef eccurve_pymethods[] = { #define METHNAME(name) ecmeth_##name @@ -1016,7 +1074,7 @@ E.mmul([(P0, N0), (P1, N1), ...]) = N0 P0 + N1 P1 + ...") static PyTypeObject eccurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECCurve", /* @tp_name@ */ + "ECCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1039,7 +1097,7 @@ static PyTypeObject eccurve_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ - "An elliptic curve. Abstract class.", +"An elliptic curve. Abstract class.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1070,7 +1128,7 @@ static PyObject *ecprimecurve_pynew(PyTypeObject *ty, static PyTypeObject ecprimecurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECPrimeCurve", /* @tp_name@ */ + "ECPrimeCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1093,7 +1151,8 @@ static PyTypeObject ecprimecurve_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ - "An elliptic curve over a prime field. Use ecprimeprojcurve.", +"ECPrimeCurve(FIELD, A, B): an elliptic curve over a prime field.\n\ + Use ECPrimeProjCurve instead.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1124,7 +1183,7 @@ static PyObject *ecprimeprojcurve_pynew(PyTypeObject *ty, static PyTypeObject ecprimeprojcurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECPrimeProjCurve", /* @tp_name@ */ + "ECPrimeProjCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1147,7 +1206,8 @@ static PyTypeObject ecprimeprojcurve_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ - "An elliptic curve over a prime field, using projective coordinates.", +"ECPrimeProjCurve(FIELD, A, B): an elliptic curve over a prime field\n\ + using projective coordinates.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1178,7 +1238,7 @@ static PyObject *ecbincurve_pynew(PyTypeObject *ty, static PyTypeObject ecbincurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECBinCurve", /* @tp_name@ */ + "ECBinCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1201,7 +1261,8 @@ static PyTypeObject ecbincurve_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ - "An elliptic curve over a binary field. Use ecbinprojcurve.", +"ECBinCurve(FIELD, A, B): an elliptic curve over a binary field.\n\ + Use ECBinProjCurve instead.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1232,7 +1293,7 @@ static PyObject *ecbinprojcurve_pynew(PyTypeObject *ty, static PyTypeObject ecbinprojcurve_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECBinProjCurve", /* @tp_name@ */ + "ECBinProjCurve", /* @tp_name@ */ sizeof(eccurve_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1255,7 +1316,8 @@ static PyTypeObject ecbinprojcurve_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ - "An elliptic curve over a binary field, using projective coordinates.", +"ECBinProjCurve(FIELD, A, B): an elliptic curve over a binary field,\n\ + using projective coordinates.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1327,7 +1389,7 @@ static PyObject *ecinfo_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) TYERR("point not from this curve"); ei.c = ECCURVE_C(e); EC_CREATE(&ei.g); - EC_COPY(&ei.g, ECPT_P(g)); + EC_OUT(ei.c, &ei.g, ECPT_P(g)); rc = (ecinfo_pyobj *)ty->tp_alloc(ty, 0); rc->ei = ei; rc->cobj = e; @@ -1352,7 +1414,7 @@ static PyObject *meth__ECInfo_parse(PyObject *me, PyObject *arg) qd.p = p; qd.e = 0; if (ec_infoparse(&qd, &ei)) - SYNERR(qd.e); + VALERR(qd.e); rc = Py_BuildValue("(Ns)", ecinfo_pywrap(&ei), qd.p); end: return (rc); @@ -1437,7 +1499,7 @@ static PyMethodDef ecinfo_pymethods[] = { static PyTypeObject ecinfo_pytype_skel = { PyObject_HEAD_INIT(0) 0, /* Header */ - "catacomb.ECInfo", /* @tp_name@ */ + "ECInfo", /* @tp_name@ */ sizeof(ecinfo_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1460,7 +1522,7 @@ static PyTypeObject ecinfo_pytype_skel = { Py_TPFLAGS_BASETYPE, /* @tp_doc@ */ - "Elliptic curve domain parameters.", +"ECInfo(CURVE, G, R, H): elliptic curve domain parameters.", 0, /* @tp_traverse@ */ 0, /* @tp_clear@ */ @@ -1487,12 +1549,13 @@ static PyTypeObject ecinfo_pytype_skel = { static PyMethodDef methods[] = { #define METHNAME(func) meth_##func - METH (_ECPt_frombuf, "frombuf(E, STR) -> (P, REST)") - METH (_ECPtCurve_fromraw, "fromraw(E, STR) -> (P, REST)") - METH (_ECPt_parse, "parse(E, STR) -> (P, REST)") - METH (_ECCurve_parse, "parse(STR) -> (E, REST)") - METH (_ECInfo_parse, "parse(STR) -> (I, REST)") - METH (_ECInfo__curven, "_curven(N) -> I") + METH (_ECPt_frombuf, "frombuf(E, STR) -> (P, REST)") + METH (_ECPtCurve_fromraw, "fromraw(E, STR) -> (P, REST)") + KWMETH(_ECPtCurve_os2ecp, "os2ecp(E, STR, [flags = ...]) -> (P, REST)") + METH (_ECPt_parse, "parse(E, STR) -> (P, REST)") + METH (_ECCurve_parse, "parse(STR) -> (E, REST)") + METH (_ECInfo_parse, "parse(STR) -> (I, REST)") + METH (_ECInfo__curven, "_curven(N) -> I") #undef METHNAME { 0 } }; @@ -1528,7 +1591,7 @@ static PyObject *namedcurves(void) } c = PyInt_FromLong(i); found: - PyDict_SetItemString(d, (/*unconst*/ char *)ectab[i].name, c); + PyDict_SetItemString(d, (/*unconst*/ char *)p, c); Py_DECREF(c); } ncurves = i;