ec.c (ecpt_pyrichcompare): Fix point comparisons.

Previously we'd just reject comparisons of points with different curves.
Instead, support comparing curveless points with curvy ones by just
comparing the points coordinatewise.

Unfortunately, to make equality be transitive, this means permitting
comparisons between points on different curves, which is unpleasant.

diff --git a/ec.c b/ec.c
index 1bf24cf4733ac498d67568646c93ceec66ae6ad4..cfe785a1119e6ee0d160c5d05ad4c8ff9de6430b 100644 (file)
--- a/ec.c
+++ b/ec.c
@@ -206,15 +206,13 @@ static long ecpt_pyhash(PyObject *me)
 
 static PyObject *ecpt_pyrichcompare(PyObject *x, PyObject *y, int op)
 {
 
 static PyObject *ecpt_pyrichcompare(PyObject *x, PyObject *y, int op)
 {

-  ec_curve *c;
-  PyObject *cobj;

   ec p = EC_INIT, q = EC_INIT;
   int b;
   PyObject *rc = 0;
 
   ec p = EC_INIT, q = EC_INIT;
   int b;
   PyObject *rc = 0;
 

-  if (ecbinop(x, y, &c, &cobj, &p, &q)) RETURN_NOTIMPL;
-  EC_OUT(c, &p, &p);
-  EC_OUT(c, &q, &q);
+  if (!ECPT_PYCHECK(y)) RETURN_NOTIMPL;
+  getecptout(&p, x);
+  getecptout(&q, y);

   switch (op) {
     case Py_EQ: b = EC_EQ(&p, &q); break;
     case Py_NE: b = !EC_EQ(&p, &q); break;
   switch (op) {
     case Py_EQ: b = EC_EQ(&p, &q); break;
     case Py_NE: b = !EC_EQ(&p, &q); break;