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

[catacomb-python] / key.c

diff --git a/key.c b/key.c
index 704466f..0707edc 100644 (file)
--- a/key.c
+++ b/key.c
@@ -1299,6 +1299,21 @@ static void key_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
+static Py_hash_t key_pyhash(PyObject *me)
+  { return ((Py_hash_t)KEY_K(me)); }
+
+static PyObject *key_pyrichcompare(PyObject *me, PyObject *you, int op)
+{
+  if (!KEY_PYCHECK(you)) RETURN_NOTIMPL;
+  switch (op) {
+    case Py_EQ: return (getbool(KEY_K(me) == KEY_K(you)));
+    case Py_NE: return (getbool(KEY_K(me) == KEY_K(you)));
+    default: TYERR("ordering makes no sense");
+  }
+end:
+  return (0);
+}
+
 static PyObject *kmeth_delete(PyObject *me)
 {
   int err;
@@ -1331,27 +1346,21 @@ end:
   return (0);
 }
 
-static PyObject *kmeth_extract(PyObject *me, PyObject *arg, PyObject *kw)
+static PyObject *kmeth_extractline(PyObject *me, PyObject *arg, PyObject *kw)
 {
   key_filter f = { 0, 0 };
-  PyObject *file;
-  PyObject *nameobj;
-  char *name;
-  FILE *fp;
-  static const char *const kwlist[] = { "file", "filter", 0 };
-
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O&:extract", KWLIST,
-                                  &PyFile_Type, &file,
-                                  convfilter, &f) ||
-      (fp = PyFile_AsFile(file)) == 0 ||
-      (nameobj = PyFile_Name(file)) == 0 ||
-      (name = TEXT_STR(nameobj)) == 0)
+  dstr d = DSTR_INIT;
+  PyObject *rc = 0;
+  static const char *const kwlist[] = { "filter", 0 };
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:extract", KWLIST,
+                                  convfilter, &f))
     goto end;
-  if (key_extract(KEY_KF(me), KEY_K(me), fp, &f))
-    OSERR(name);
-  RETURN_ME;
+  key_extractline(KEY_KF(me), KEY_K(me), &d, &f);
+  rc = TEXT_FROMSTRLEN(d.buf, d.len);
 end:
-  return (0);
+  dstr_destroy(&d);
+  return (rc);
 }
 
 static PyObject *kmeth_fingerprint(PyObject *me,
@@ -1489,7 +1498,7 @@ static const PyMethodDef key_pymethods[] = {
   NAMETH(delete,       "KEY.delete()")
   NAMETH(expire,       "KEY.expire()")
   METH (used,          "KEY.used(TIME)")
-  KWMETH(extract,      "KEY.extract(FILE, [filter = <any>])")
+  KWMETH(extractline,  "KEY.extractline([filter = <any>])")
   KWMETH(fingerprint,  "KEY.fingerprint(HASH, [filter = '-secret'])")
 #undef METHNAME
   { 0 }
@@ -1527,7 +1536,7 @@ static const PyTypeObject key_pytype_skel = {
   0,                                   /* @tp_as_number@ */
   0,                                   /* @tp_as_sequence@ */
   0,                                   /* @tp_as_mapping@ */
-  0,                                   /* @tp_hash@ */
+  key_pyhash,                          /* @tp_hash@ */
   0,                                   /* @tp_call@ */
   0,                                   /* @tp_str@ */
   0,                                   /* @tp_getattro@ */
@@ -1541,7 +1550,7 @@ static const PyTypeObject key_pytype_skel = {
 
   0,                                   /* @tp_traverse@ */
   0,                                   /* @tp_clear@ */
-  0,                                   /* @tp_richcompare@ */
+  key_pyrichcompare,                   /* @tp_richcompare@ */
   0,                                   /* @tp_weaklistoffset@ */
   0,                                   /* @tp_iter@ */
   0,                                   /* @tp_iternext@ */
@@ -1619,7 +1628,7 @@ static void pythonreporter(const char *file, int line,
 
   if (ri->stop)
     return;
-  if (!ri->func)
+  if (ri->func == Py_None)
     key_moan(file, line, msg, 0);
   else if ((res = PyObject_CallFunction(ri->func, "sis",
                                        file, line, msg)) == 0)
@@ -1631,7 +1640,7 @@ static void pythonreporter(const char *file, int line,
 static PyObject *keyfile_pynew(PyTypeObject *ty,
                               PyObject *arg, PyObject *kw)
 {
-  struct reportinfo ri = { 0, 0 };
+  struct reportinfo ri = { Py_None, 0 };
   char *file = 0;
   unsigned how = KOPEN_READ;
   keyfile_pyobj *rc = 0;
@@ -1641,7 +1650,7 @@ static PyObject *keyfile_pynew(PyTypeObject *ty,
   if (!PyArg_ParseTupleAndKeywords(arg, kw, "s|iO:new", KWLIST,
                                   &file, &how, &ri.func))
     goto end;
-  if (ri.func && !PyCallable_Check(ri.func))
+  if (ri.func != Py_None && !PyCallable_Check(ri.func))
     TYERR("reporter function not callable");
   if ((rc = (keyfile_pyobj *)ty->tp_alloc(ty, 0)) == 0)
     goto end;
@@ -1686,27 +1695,20 @@ end:
   return (0);
 }
 
-static PyObject *kfmeth_merge(PyObject *me, PyObject *arg, PyObject *kw)
+static PyObject *kfmeth_mergeline(PyObject *me, PyObject *arg, PyObject *kw)
 {
-  struct reportinfo ri = { 0, 0 };
-  char *name;
-  PyObject *x = 0;
-  FILE *fp = 0;
-  int rc;
-  static const char *const kwlist[] = { "file", "report", 0 };
+  struct reportinfo ri = { Py_None, 0 };
+  const char *file, *line;
+  int lno, rc;
+  static const char *const kwlist[] = { "name", "lno", "line", "report", 0 };
 
   Py_XINCREF(arg); Py_XINCREF(kw);
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O:merge", KWLIST,
-                                  &PyFile_Type, &x, &ri.func))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "sis|O:merge", KWLIST,
+                                  &file, &lno, &line, &ri.func))
     goto end;
-  if (ri.func && !PyCallable_Check(ri.func))
+  if (ri.func != Py_None && !PyCallable_Check(ri.func))
     TYERR("reporter function not callable");
-  if ((fp = PyFile_AsFile(x)) == 0)
-    goto end;
-  x = PyFile_Name(x);
-  if ((name = TEXT_STR(x)) == 0)
-    goto end;
-  rc = key_merge(KEYFILE_KF(me), name, fp, pythonreporter, &ri);
+  rc = key_mergeline(KEYFILE_KF(me), file, lno, line, pythonreporter, &ri);
   if (ri.stop)
     goto end;
   if (rc != 0)
@@ -1817,7 +1819,8 @@ static PyObject *kfget_filep(PyObject *me, void *hunoz)
 static const PyMethodDef keyfile_pymethods[] = {
 #define METHNAME(func) kfmeth_##func
   NAMETH(save,         "KF.save()")
-  KWMETH(merge,                "KF.merge(FILE, [report = <built-in-reporter>])")
+  KWMETH(mergeline,    "KF.mergeline(NAME, LNO, LINE, "
+                                          "[report = <built-in-reporter>])")
   KWMETH(newkey,       "KF.newkey(ID, TYPE, [exptime = KEXP_FOREVER]) "
                                                                    "-> KEY")
   METH (byid,          "KF.byid(KEYID) -> KEY|None")