ec.c: Reject strings with trailing junk in the curve-point constructor.

[catacomb-python] / mp.c

diff --git a/mp.c b/mp.c
index c47b011..3abbcd5 100644 (file)
--- a/mp.c
+++ b/mp.c
@@ -289,24 +289,27 @@ int convgf(PyObject *o, void *p)
 
 mp *implicitmp(PyObject *o)
 {
-  if (!o ||
-      GF_PYCHECK(o) ||
-      ECPT_PYCHECK(o) ||
-      FE_PYCHECK(o) ||
-      GE_PYCHECK(o))
-    return (0);
-  return (tomp(o));
+  PyObject *l;
+
+  if (!o || GF_PYCHECK(o) || FE_PYCHECK(o)) return (0);
+  else if (MP_PYCHECK(o)) return (MP_COPY(MP_X(o)));
+  else if (PFILT_PYCHECK(o)) return (MP_COPY(PFILT_F(o)->m));
+#ifdef PY2
+  else if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o)));
+#endif
+  else if ((l = PyNumber_Index(o)) != 0) {
+#ifdef PY2
+    if (PyInt_Check(o)) return (mp_fromlong(MP_NEW, PyInt_AS_LONG(o)));
+#endif
+    if (PyLong_Check(o)) return (mp_frompylong(o));
+  }
+  PyErr_Clear(); return (0);
 }
 
 mp *implicitgf(PyObject *o)
 {
-  if (!o ||
-      MP_PYCHECK(o) ||
-      ECPT_PYCHECK(o) ||
-      FE_PYCHECK(o) ||
-      GE_PYCHECK(o))
-    return (0);
-  return (tomp(o));
+  if (GF_PYCHECK(o)) return (MP_COPY(MP_X(o)));
+  return (0);
 }
 
 static int mpbinop(PyObject *x, PyObject *y, mp **xx, mp **yy)
@@ -546,7 +549,7 @@ static PyObject *mp_pyfloat(PyObject *x)
       Py_INCREF(*x); Py_INCREF(*y);                                    \
       return (0);                                                      \
     }                                                                  \
-    if ((z = tomp(*y)) != 0) {                                         \
+    if ((z = implicit##pre(*y)) != 0) {                                        \
       Py_INCREF(*x);                                                   \
       *y = pre##_pywrap(z);                                            \
       return (0);                                                      \
@@ -600,6 +603,22 @@ end:
   return ((PyObject *)zz);
 }
 
+#define IMPLICIT(pre)                                                  \
+  static PyObject *pre##meth__implicit(PyObject *me, PyObject *arg)    \
+  {                                                                    \
+    PyObject *x, *rc = 0;                                              \
+    mp *y = MP_NEW;                                                    \
+    if (!PyArg_ParseTuple(arg, "O:_implicit", &x)) goto end;           \
+    y = implicit##pre(x);                                              \
+    if (!y) TYERR("can't convert implicitly to " #pre);                        \
+    rc = pre##_pywrap(y);                                              \
+  end:                                                                 \
+    return (rc);                                                       \
+  }
+IMPLICIT(mp)
+IMPLICIT(gf)
+#undef IMPLICIT
+
 Py_hash_t mphash(mp *x)
 {
   PyObject *l = mp_topylong(x);
@@ -928,6 +947,7 @@ static const PyMethodDef mp_pymethods[] = {
     "  Parse STR as a large integer, according to RADIX.  If RADIX is\n"
     "  zero, read a prefix from STR to decide radix: allow `0b' for binary,\n"
     "  `0' or `0o' for octal, `0x' for hex, or `R_' for other radix R.")
+  SMTH (_implicit,     0)
   SMTH (factorial,     "factorial(I) -> I!: compute factorial")
   SMTH (fibonacci,     "fibonacci(I) -> F(I): compute Fibonacci number")
   SMTH (loadl,         "loadl(STR) -> X: read little-endian bytes")
@@ -2120,6 +2140,7 @@ static const PyMethodDef gf_pymethods[] = {
     "  Parse STR as a binary polynomial, according to RADIX.  If RADIX is\n"
     "  zero, read a prefix from STR to decide radix: allow `0b' for binary,\n"
     "  `0' or `0o' for octal, `0x' for hex, or `R_' for other radix R.")
+  SMTH (_implicit,     0)
   SMTH (loadl,         "loadl(STR) -> X: read little-endian bytes")
   SMTH (loadb,         "loadb(STR) -> X: read big-endian bytes")
   SMTH (frombuf,       "frombuf(STR) -> (X, REST): read buffer format")