/* -*-c-*-
*
- * $Id$
- *
* Elliptic curves
*
* (c) 2004 Straylight/Edgeware
*/
-/*----- Licensing notice --------------------------------------------------*
+/*----- Licensing notice --------------------------------------------------*
*
* This file is part of the Python interface to Catacomb.
*
* 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.
{
EC_DESTROY(ECPT_P(x));
Py_DECREF(ECPT_COBJ(x));
- PyObject_DEL(x);
+ FREEOBJ(x);
}
static PyObject *ecpt_pymul(PyObject *x, PyObject *y)
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)
return (ecptxl_1(c, p, x));
}
-static int ecpt_fromobjects(PyObject *cc, ec *p,
- PyObject *x, PyObject *y, PyObject *z)
-{
- ec_curve *c = 0;
-
- if (cc && PyType_IsSubtype((PyTypeObject *)cc, ecptcurve_pytype))
- c = ECCURVE_C(cc);
- return (ecptxl(c, p, x, y, z));
-}
-
static PyObject *ecptnc_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
PyObject *x = 0, *y = 0, *z = 0;
PyObject *rc = 0;
if (EC_ATINF(ECPT_P(me))) VALERR("point at infinity");
getecptout(&p, me);
- rc = (PyObject *)mp_topylong(p.x);
+ rc = mp_topylong(p.x);
end:
EC_DESTROY(&p);
return (rc);
};
static PyTypeObject ecpt_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.ECPt", /* @tp_name@ */
sizeof(ecpt_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
ecpt_pyrichcompare, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
ecptnc_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
ecptnc_pygetset, /* @tp_getset@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
ecptnc_pynew, /* @tp_new@ */
- _PyObject_Del, /* @tp_free@ */
+ 0, /* @tp_free@ */
0 /* @tp_is_gc@ */
};
#define METHNAME(func) epmeth_##func
METH (toraw, "X.toraw() -> BIN")
METH (dbl, "X.dbl() -> X + X")
+ METH (oncurvep, "X.oncurvep() -> BOOL")
#undef METHNAME
{ 0 }
};
};
static PyTypeObject ecptcurve_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.ECPtCurve", /* @tp_name@ */
sizeof(ecpt_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
ecpt_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
ecpt_pygetset, /* @tp_getset@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
abstract_pynew, /* @tp_new@ */
- _PyObject_Del, /* @tp_free@ */
+ 0, /* @tp_free@ */
0 /* @tp_is_gc@ */
};
{
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);
}
static PyObject *eccurve_dopywrap(PyTypeObject *ty,
PyObject *fobj, ec_curve *c)
{
- eccurve_pyobj *cobj = newtype(ty, 0);
+ eccurve_pyobj *cobj = newtype(ty, 0, c->ops->name);
cobj->c = c;
cobj->fobj = fobj;
- cobj->ty.tp_name = (/*unconst*/ char *)c->ops->name;
- cobj->ty.tp_basicsize = sizeof(ecpt_pyobj);
- cobj->ty.tp_base = ecptcurve_pytype;
+ cobj->ty.ht_type.tp_basicsize = sizeof(ecpt_pyobj);
+ cobj->ty.ht_type.tp_base = ecptcurve_pytype;
Py_INCREF(ecptcurve_pytype);
- cobj->ty.tp_flags = (Py_TPFLAGS_DEFAULT |
- Py_TPFLAGS_BASETYPE |
- Py_TPFLAGS_CHECKTYPES |
- Py_TPFLAGS_HEAPTYPE);
- cobj->ty.tp_alloc = PyType_GenericAlloc;
- cobj->ty.tp_free =_PyObject_Del;
- cobj->ty.tp_new = ecpt_pynew;
- PyType_Ready(&cobj->ty);
+ cobj->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
+ Py_TPFLAGS_BASETYPE |
+ Py_TPFLAGS_CHECKTYPES |
+ Py_TPFLAGS_HEAPTYPE);
+ 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);
return ((PyObject *)cobj);
}
char *kwlist[] = { "field", "a", "b", 0 };
mp *aa = 0, *bb = 0;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!OO", kwlist,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O&O&", kwlist,
field_pytype, &fobj,
convmp, &aa, convmp, &bb))
goto end;
ec_curve *c;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "Os", &me, &p))
+ if (!PyArg_ParseTuple(arg, "Os:parse", &me, &p))
goto end;
qd.p = p;
qd.e = 0;
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)
GET (inf, "E.inf -> point at infinity of this curve")
#undef GETSETNAME
{ 0 }
-};
+};
static PyMethodDef eccurve_pymethods[] = {
#define METHNAME(name) ecmeth_##name
};
static PyTypeObject eccurve_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.ECCurve", /* @tp_name@ */
sizeof(eccurve_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
eccurve_pyrichcompare, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
eccurve_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
eccurve_pygetset, /* @tp_getset@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
abstract_pynew, /* @tp_new@ */
- _PyObject_Del, /* @tp_free@ */
+ 0, /* @tp_free@ */
0 /* @tp_is_gc@ */
};
}
static PyTypeObject ecprimecurve_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.ECPrimeCurve", /* @tp_name@ */
sizeof(eccurve_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
eccurve_pyrichcompare, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
ecprimecurve_pynew, /* @tp_new@ */
- _PyObject_Del, /* @tp_free@ */
+ 0, /* @tp_free@ */
0 /* @tp_is_gc@ */
};
}
static PyTypeObject ecprimeprojcurve_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.ECPrimeProjCurve", /* @tp_name@ */
sizeof(eccurve_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
eccurve_pyrichcompare, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
ecprimeprojcurve_pynew, /* @tp_new@ */
- _PyObject_Del, /* @tp_free@ */
+ 0, /* @tp_free@ */
0 /* @tp_is_gc@ */
};
}
static PyTypeObject ecbincurve_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.ECBinCurve", /* @tp_name@ */
sizeof(eccurve_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
eccurve_pyrichcompare, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
ecbincurve_pynew, /* @tp_new@ */
- _PyObject_Del, /* @tp_free@ */
+ 0, /* @tp_free@ */
0 /* @tp_is_gc@ */
};
}
static PyTypeObject ecbinprojcurve_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.ECBinProjCurve", /* @tp_name@ */
sizeof(eccurve_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
eccurve_pyrichcompare, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
0, /* @tp_methods@ */
0, /* @tp_members@ */
0, /* @tp_getset@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
ecbinprojcurve_pynew, /* @tp_new@ */
- _PyObject_Del, /* @tp_free@ */
+ 0, /* @tp_free@ */
0 /* @tp_is_gc@ */
};
MP_DROP(ei->r);
MP_DROP(ei->h);
Py_DECREF(ECINFO_COBJ(me));
- PyObject_DEL(me);
+ FREEOBJ(me);
}
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;
};
static PyTypeObject ecinfo_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.ECInfo", /* @tp_name@ */
sizeof(ecinfo_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
ecinfo_pyrichcompare, /* @tp_richcompare@ */
0, /* @tp_weaklistoffset@ */
0, /* @tp_iter@ */
- 0, /* @tp_iternexr@ */
+ 0, /* @tp_iternext@ */
ecinfo_pymethods, /* @tp_methods@ */
0, /* @tp_members@ */
ecinfo_pygetset, /* @tp_getset@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
ecinfo_pynew, /* @tp_new@ */
- _PyObject_Del, /* @tp_free@ */
+ 0, /* @tp_free@ */
0 /* @tp_is_gc@ */
};
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)")
+ 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 }
};
}
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;