X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/0284190a2e6c467ae21148c545e2596aa58e56c7..183e9cd31b1ac2f14b86c5de6ac2643b8a4364a2:/key.c

diff --git a/key.c b/key.c
index 597407b..c5b0ac0 100644
--- a/key.c
+++ b/key.c
@@ -1,6 +1,4 @@
 /* -*-c-*-
- *
- * $Id$
  *
  * Key files and data
  *
@@ -106,7 +104,7 @@ static PyMethodDef keyexc_pymethods[] = {
 
 static void keyexc_raise(int err)
 {
-  PyObject *arg = Py_BuildValue("(i)", err);
+  PyObject *arg = Py_BuildValue("(is)", err, key_strerror(err));
   if (arg) PyErr_SetObject(keyexc, arg);
   Py_XDECREF(arg);
 }
@@ -416,7 +414,7 @@ end:
 static PyObject *kdmeth_lock(PyObject *me, PyObject *arg)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   PyObject *rc = 0;
   key_data *kd;
 
@@ -447,7 +445,7 @@ end:
 static PyObject *meth__KeyData_decode(PyObject *me, PyObject *arg)
 {
   const char *p;
-  int n;
+  Py_ssize_t n;
   key_data *kd;
   PyObject *rc = 0;
 
@@ -469,7 +467,7 @@ static PyMethodDef keydata_pymethods[] = {
   METH	(split,			"KD.split()")
   KWMETH(write,			"KD.write(filter = <any>) -> STRING")
   KWMETH(encode,		"KD.encode(filter = <any>) -> BYTES")
-  KWMETH(copy,			"KD.encode(filter = <any>) -> KD")
+  KWMETH(copy,			"KD.copy(filter = <any>) -> KD")
   METH	(plock,			"KD.plock(TAG) -> ENCRYPTED-KD")
   METH	(lock,			"KD.lock(KEY) -> ENCRYPTED-KD")
 #undef METHNAME
@@ -485,7 +483,7 @@ static PyGetSetDef keydata_pygetset[] = {
 
 static PyTypeObject keydata_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyData",			/* @tp_name@ */
+  "KeyData",				/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -535,7 +533,7 @@ static PyObject *keydatabin_pynew(PyTypeObject *ty,
 				  PyObject *arg, PyObject *kw)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   unsigned f = 0;
   keydata_pyobj *me = 0;
   static char *kwlist[] = { "key", "flags", 0 };
@@ -562,7 +560,7 @@ static PyGetSetDef keydatabin_pygetset[] = {
 
 static PyTypeObject keydatabin_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataBinary",		/* @tp_name@ */
+  "KeyDataBinary",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -585,7 +583,7 @@ static PyTypeObject keydatabin_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Key data for binary keys.",
+"KeyDataBinary(KEY, [flags = 0]): key data for binary keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -612,7 +610,7 @@ static PyObject *keydataenc_pynew(PyTypeObject *ty,
 				  PyObject *arg, PyObject *kw)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   unsigned f = 0;
   keydata_pyobj *me = 0;
   static char *kwlist[] = { "key", "flags", 0 };
@@ -638,7 +636,7 @@ end:
 static PyObject *kdemeth_lock(PyObject *me, PyObject *arg)
 {
   char *hunoz;
-  int hukairz;
+  Py_ssize_t hukairz;
   if (!PyArg_ParseTuple(arg, "s#:lock", &hunoz, &hukairz)) goto end;
   KEYERR(KERR_WRONGTYPE);
 end:
@@ -664,7 +662,7 @@ end:
 static PyObject *kdemeth_unlock(PyObject *me, PyObject *arg)
 {
   char *p;
-  int n;
+  Py_ssize_t n;
   int err;
   PyObject *rc = 0;
   key_data *kd;
@@ -699,7 +697,7 @@ static PyGetSetDef keydataenc_pygetset[] = {
 
 static PyTypeObject keydataenc_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataEncrypted",		/* @tp_name@ */
+  "KeyDataEncrypted",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -722,7 +720,7 @@ static PyTypeObject keydataenc_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Key data for encrypted keys.",
+"KeyDataEncrypted(KEY, [flags = 0]): key data for encrypted keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -775,7 +773,7 @@ static PyGetSetDef keydatamp_pygetset[] = {
 
 static PyTypeObject keydatamp_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataMP",			/* @tp_name@ */
+  "KeyDataMP",				/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -798,7 +796,7 @@ static PyTypeObject keydatamp_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Key data for large-integer keys.",
+"KeyDataMP(KEY, [flags = 0]): key data for large-integer keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -850,7 +848,7 @@ static PyGetSetDef keydatastr_pygetset[] = {
 
 static PyTypeObject keydatastr_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataString",		/* @tp_name@ */
+  "KeyDataString",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -873,7 +871,7 @@ static PyTypeObject keydatastr_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Key data for string keys.",
+"KeyDataString(KEY, [flags = 0]): key data for string keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -930,7 +928,7 @@ static PyGetSetDef keydataec_pygetset[] = {
 
 static PyTypeObject keydataec_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataECPt",		/* @tp_name@ */
+  "KeyDataECPt",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -953,7 +951,7 @@ static PyTypeObject keydataec_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Key data for elliptic-curve keys.",
+"KeyDataECPt(KEY, [flags = 0]): key data for elliptic-curve keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1001,7 +999,7 @@ static void subkeyiter_pydealloc(PyObject *me)
 
 static PyTypeObject subkeyiter_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.SubKeyIter",		/* @tp_name@ */
+  "SubKeyIter",				/* @tp_name@ */
   sizeof(subkeyiter_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1136,7 +1134,7 @@ static PyMappingMethods keydatastruct_pymapping = {
 
 static PyTypeObject keydatastruct_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyDataStructured",		/* @tp_name@ */
+  "KeyDataStructured",			/* @tp_name@ */
   sizeof(keydata_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1159,7 +1157,7 @@ static PyTypeObject keydatastruct_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Key data for structured keys.",
+"KeyDataStructured([subkeys = []]): key data for structured keys.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1212,7 +1210,7 @@ static void keyattriter_pydealloc(PyObject *me)
 
 static PyTypeObject keyattriter_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyAttributeIter",		/* @tp_name@ */
+  "KeyAttributeIter",			/* @tp_name@ */
   sizeof(keyattriter_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1322,7 +1320,7 @@ static PyMappingMethods keyattrs_pymapping = {
 
 static PyTypeObject keyattrs_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyAttributes",		/* @tp_name@ */
+  "KeyAttributes",			/* @tp_name@ */
   sizeof(keyattrs_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1387,16 +1385,16 @@ static PyObject *key_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   PyObject *kfobj;
   uint32 id;
   char *type;
-  long exptime = KEXP_FOREVER;
+  unsigned long exptime = KEXP_FOREVER;
   static char *kwlist[] = { "keyfile", "id", "type", "exptime", 0 };
   key *k;
   int err;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O&sl:new", kwlist,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O&s|O&:new", kwlist,
 				   keyfile_pytype, &kfobj, convu32, &id,
-				   &type, &exptime))
+				   &type, convulong, &exptime))
     goto end;
-  if ((err = key_new(KEYFILE_KF(kfobj), id, type, exptime, &k)) == 0)
+  if ((err = key_new(KEYFILE_KF(kfobj), id, type, exptime, &k)) != 0)
     KEYERR(err);
   return (key_dowrap(ty, kfobj, k));
 end:
@@ -1624,7 +1622,7 @@ static PyGetSetDef key_pygetset[] = {
 
 static PyTypeObject key_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.Key",			/* @tp_name@ */
+  "Key",				/* @tp_name@ */
   sizeof(key_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1647,7 +1645,7 @@ static PyTypeObject key_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Key object.",
+"Key(KF, ID, TYPE, [exptime = KEXP_FOREVER]): key object.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -1698,7 +1696,7 @@ static void keyiter_pydealloc(PyObject *me)
 
 static PyTypeObject keyiter_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyFileIter",		/* @tp_name@ */
+  "KeyFileIter",			/* @tp_name@ */
   sizeof(keyiter_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -1971,7 +1969,7 @@ static PyObject *kfmeth_qtag(PyObject *me, PyObject *arg, PyObject *kw)
   }
   key_incref(*kd);
   rc = Py_BuildValue("(s#NN)",
-		     d.buf, d.len,
+		     d.buf, (Py_ssize_t)d.len,
 		     key_pywrap(me, k),
 		     keydata_pywrap(okd));
 end:
@@ -2019,7 +2017,7 @@ static PyMappingMethods keyfile_pymapping = {
 
 static PyTypeObject keyfile_pytype_skel = {
   PyObject_HEAD_INIT(0) 0,		/* Header */
-  "catacomb.KeyFile",			/* @tp_name@ */
+  "KeyFile",				/* @tp_name@ */
   sizeof(keyfile_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
 
@@ -2042,7 +2040,8 @@ static PyTypeObject keyfile_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"Keyring file.",
+"KeyFile(FILE, [how = KOPEN_READ], [report = ?]): Keyring file.\n\
+   calls REPORT(FILE, LINE, MSG) on problems",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -2083,7 +2082,7 @@ static PyMethodDef methods[] = {
 	   "KeyData.readflags(STRING) -> (FLAGS, MASK, REST)")
   METH	(_KeyData_writeflags,	"KeyData.writeflags(FLAGS) -> STRING")
   METH	(_KeyData_read,		"KeyData.read(STRING) -> (KD, REST)")
-  METH	(_KeyData_decode,	"KeyData.read(BYTES) -> KD")
+  METH	(_KeyData_decode,	"KeyData.decode(BYTES) -> KD")
   METH	(barf,			"barf(ERR)")
 #undef METHNAME
   { 0 }