build: Use mdwsetup.py from new CFD. Announce 1.0.2.

[catacomb-python] / ec.c

diff --git a/ec.c b/ec.c
index 985e94d8b150a2745af4fb54a5dc24be2ee52a9c..9946205994dd33f1d8994146bc1e390956b2e34c 100644 (file)
--- a/ec.c
+++ b/ec.c
@@ -7,7 +7,7 @@
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of the Python interface to Catacomb.
  *
@@ -15,12 +15,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.
@@ -233,7 +233,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)
@@ -507,7 +508,7 @@ static PyObject *ecpt_pylong(PyObject *me)
   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);
@@ -621,7 +622,7 @@ static PyTypeObject ecpt_pytype_skel = {
   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@ */
@@ -735,7 +736,7 @@ static PyTypeObject ecptcurve_pytype_skel = {
   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@ */
@@ -773,10 +774,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);
 }
 
@@ -903,17 +904,17 @@ static PyObject *eccurve_dopywrap(PyTypeObject *ty,
   eccurve_pyobj *cobj = newtype(ty, 0, c->ops->name);
   cobj->c = c;
   cobj->fobj = fobj;
-  cobj->ty.type.tp_basicsize = sizeof(ecpt_pyobj);
-  cobj->ty.type.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.type.tp_flags = (Py_TPFLAGS_DEFAULT |
-                           Py_TPFLAGS_BASETYPE |
-                           Py_TPFLAGS_CHECKTYPES |
-                           Py_TPFLAGS_HEAPTYPE);
-  cobj->ty.type.tp_alloc = PyType_GenericAlloc;
-  cobj->ty.type.tp_free = 0;
-  cobj->ty.type.tp_new = ecpt_pynew;
-  PyType_Ready(&cobj->ty.type);
+  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);
 }
 
@@ -948,7 +949,7 @@ static PyObject *eccurve_pynew(PyTypeObject *ty,
   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;
@@ -967,7 +968,7 @@ static PyObject *meth__ECCurve_parse(PyObject *me, PyObject *arg)
   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;
@@ -984,7 +985,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 +1003,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
@@ -1046,7 +1047,7 @@ static PyTypeObject eccurve_pytype_skel = {
   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@ */
@@ -1100,7 +1101,7 @@ static PyTypeObject ecprimecurve_pytype_skel = {
   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@ */
@@ -1154,7 +1155,7 @@ static PyTypeObject ecprimeprojcurve_pytype_skel = {
   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@ */
@@ -1208,7 +1209,7 @@ static PyTypeObject ecbincurve_pytype_skel = {
   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@ */
@@ -1262,7 +1263,7 @@ static PyTypeObject ecbinprojcurve_pytype_skel = {
   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@ */
@@ -1327,7 +1328,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;
@@ -1467,7 +1468,7 @@ static PyTypeObject ecinfo_pytype_skel = {
   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@ */
@@ -1487,12 +1488,12 @@ 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)")
+  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 }
 };