catacomb/__init__.py: Import `sys' as a whole.

[catacomb-python] / ec.c

diff --git a/ec.c b/ec.c
index 4ee4d05ea4259e1d06c961ac91b9bcd8d22ce3c0..e18cbb862e9c181f82e046c2163b1ac3c71b9a2f 100644 (file)
--- a/ec.c
+++ b/ec.c
@@ -195,32 +195,24 @@ static PyObject *ecpt_pymul(PyObject *x, PyObject *y)
 static long ecpt_pyhash(PyObject *me)
 {
   uint32 h;
 static long ecpt_pyhash(PyObject *me)
 {
   uint32 h;

-  buf b;

   ec p = EC_INIT;
   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));
-  ec_putraw(ECPT_C(me), &b, &p);
+  getecptout(&p, me);
+  if (EC_ATINF(&p)) h = 0x81d81a94;
+  else h = 0xe0fdd039 ^ (2*mphash(p.x)) ^ (3*mphash(p.y));

   EC_DESTROY(&p);
   EC_DESTROY(&p);

-  h = unihash_hash(&unihash_global, h, BBASE(&b), BLEN(&b));
-  xfree(q);
-  return (h % LONG_MAX);
+  return (h%LONG_MAX);

 }
 
 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;


@@ -1071,7 +1063,7 @@ static PyMethodDef eccurve_pymethods[] = {
   METH (mmul,          "\
 E.mmul([(P0, N0), (P1, N1), ...]) = N0 P0 + N1 P1 + ...")
   METH (find,          "E.find(X) -> P")
   METH (mmul,          "\
 E.mmul([(P0, N0), (P1, N1), ...]) = N0 P0 + N1 P1 + ...")
   METH (find,          "E.find(X) -> P")

-  KWMETH(rand,         "E.rand(rng = rand) ->P")
+  KWMETH(rand,         "E.rand([rng = rand]) -> P")

 #undef METHNAME
   { 0 }
 };
 #undef METHNAME
   { 0 }
 };


@@ -1492,7 +1484,7 @@ static PyGetSetDef ecinfo_pygetset[] = {
 
 static PyMethodDef ecinfo_pymethods[] = {
 #define METHNAME(name) eimeth_##name
 
 static PyMethodDef ecinfo_pymethods[] = {
 #define METHNAME(name) eimeth_##name

-  KWMETH(check,                "I.check() -> None")
+  KWMETH(check,                "I.check([rng = rand]) -> None")

 #undef METHNAME
   { 0 }
 };
 #undef METHNAME
   { 0 }
 };