X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/blobdiff_plain/61e45e9b848e9116203243251c44514050f02790..183e9cd31b1ac2f14b86c5de6ac2643b8a4364a2:/key.c diff --git a/key.c b/key.c index c0b9eb4..c5b0ac0 100644 --- a/key.c +++ b/key.c @@ -1,13 +1,11 @@ /* -*-c-*- - * - * $Id$ * * Key files and data * * (c) 2005 Straylight/Edgeware */ -/*----- Licensing notice --------------------------------------------------* +/*----- Licensing notice --------------------------------------------------* * * This file is part of the Python interface to Catacomb. * @@ -15,12 +13,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * Catacomb/Python is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with Catacomb/Python; if not, write to the Free Software Foundation, * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. @@ -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); } @@ -270,7 +268,7 @@ static int convflags(PyObject *x, void *p) rc = 1; goto end; tyerr: - TYERR("expected flag string or flag/mask pair"); + TYERR("expected flag string or integer bitfield"); end: return (rc); } @@ -336,7 +334,7 @@ static void keydata_pydealloc(PyObject *me) static PyObject *kdmeth_matchp(PyObject *me, PyObject *arg) { key_filter f; - + if (!PyArg_ParseTuple(arg, "O&:matchp", convfilter, &f)) return (0); return (getbool(KEY_MATCH(KEYDATA_KD(me), &f))); @@ -350,6 +348,21 @@ static PyObject *kdmeth_split(PyObject *me, PyObject *arg) RETURN_ME; } +static PyObject *kdmeth_copy(PyObject *me, PyObject *arg, PyObject *kw) +{ + key_filter f = { 0, 0 }; + static char *kwlist[] = { "filter", 0 }; + key_data *kd; + + if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:copy", kwlist, + convfilter, &f)) + return (0); + if ((kd = key_copydata(KEYDATA_KD(me), &f)) == 0) + RETURN_NONE; + else + return (keydata_pywrap(kd)); +} + static PyObject *kdmeth_write(PyObject *me, PyObject *arg, PyObject *kw) { key_filter f = { 0, 0 }; @@ -388,7 +401,7 @@ static PyObject *kdmeth_plock(PyObject *me, PyObject *arg) int err; PyObject *rc = 0; key_data *kd; - + if (!PyArg_ParseTuple(arg, "s:plock", &tag)) goto end; if ((err = key_plock(&kd, KEYDATA_KD(me), tag)) != 0) @@ -401,10 +414,10 @@ end: static PyObject *kdmeth_lock(PyObject *me, PyObject *arg) { char *p; - int n; + Py_ssize_t n; PyObject *rc = 0; key_data *kd; - + if (!PyArg_ParseTuple(arg, "s#:lock", &p, &n)) goto end; key_lock(&kd, KEYDATA_KD(me), p, n); @@ -432,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; @@ -440,7 +453,7 @@ static PyObject *meth__KeyData_decode(PyObject *me, PyObject *arg) goto end; if ((kd = key_decode(p, n)) == 0) KEYERR(KERR_MALFORMED); - rc = keydata_pywrap(kd); + rc = keydata_pywrap(kd); end: return (rc); } @@ -454,6 +467,7 @@ static PyMethodDef keydata_pymethods[] = { METH (split, "KD.split()") KWMETH(write, "KD.write(filter = ) -> STRING") KWMETH(encode, "KD.encode(filter = ) -> BYTES") + KWMETH(copy, "KD.copy(filter = ) -> KD") METH (plock, "KD.plock(TAG) -> ENCRYPTED-KD") METH (lock, "KD.lock(KEY) -> ENCRYPTED-KD") #undef METHNAME @@ -469,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@ */ @@ -519,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 }; @@ -546,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@ */ @@ -569,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@ */ @@ -596,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 }; @@ -622,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: @@ -635,7 +649,7 @@ static PyObject *kdemeth_punlock(PyObject *me, PyObject *arg) int err; PyObject *rc = 0; key_data *kd; - + if (!PyArg_ParseTuple(arg, "s:punlock", &tag)) goto end; if ((err = key_punlock(&kd, KEYDATA_KD(me), tag)) != 0) @@ -648,11 +662,11 @@ 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; - + if (!PyArg_ParseTuple(arg, "s#:unlock", &p, &n)) goto end; if ((err = key_unlock(&kd, KEYDATA_KD(me), p, n)) != 0) @@ -683,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@ */ @@ -706,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@ */ @@ -759,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@ */ @@ -782,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@ */ @@ -834,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@ */ @@ -857,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@ */ @@ -914,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@ */ @@ -937,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@ */ @@ -985,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@ */ @@ -1097,6 +1111,7 @@ static int keydatastruct_pystore(PyObject *me, if ((tag = PyString_AsString(key)) == 0) goto end; + key_split(&KEYDATA_KD(me)); if (value) { if (!KEYDATA_PYCHECK(value)) TYERR("expected KeyData value"); @@ -1119,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@ */ @@ -1142,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@ */ @@ -1195,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@ */ @@ -1305,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@ */ @@ -1370,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: @@ -1395,7 +1410,7 @@ static void key_pydealloc(PyObject *me) static PyObject *kmeth_delete(PyObject *me, PyObject *arg) { int err; - + if (!PyArg_ParseTuple(arg, ":delete")) goto end; if ((err = key_delete(KEY_KF(me), KEY_K(me))) != 0) KEYERR(err); RETURN_ME; @@ -1406,7 +1421,7 @@ end: static PyObject *kmeth_expire(PyObject *me, PyObject *arg) { int err; - + if (!PyArg_ParseTuple(arg, ":expire")) goto end; if ((err = key_expire(KEY_KF(me), KEY_K(me))) != 0) KEYERR(err); RETURN_ME; @@ -1418,7 +1433,7 @@ static PyObject *kmeth_used(PyObject *me, PyObject *arg) { long t; int err; - + if (!PyArg_ParseTuple(arg, "l:used", &t)) goto end; if ((err = key_used(KEY_KF(me), KEY_K(me), t)) != 0) KEYERR(err); RETURN_ME; @@ -1607,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@ */ @@ -1630,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@ */ @@ -1670,7 +1685,7 @@ static PyObject *keyiter_pynext(PyObject *me) if ((k = key_next(KEYITER_I(me))) == 0) return (0); - return (key_pywrap(KEYITER_KFOBJ(me), k)); + return (getulong(k->id)); } static void keyiter_pydealloc(PyObject *me) @@ -1681,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@ */ @@ -1909,7 +1924,7 @@ static PyObject *keyfile_pylookup(PyObject *me, PyObject *key) } end: return (rc); -} +} static PyObject *kfmeth_newkey(PyObject *me, PyObject *arg, PyObject *kw) { @@ -1920,10 +1935,10 @@ static PyObject *kfmeth_newkey(PyObject *me, PyObject *arg, PyObject *kw) key *k; int err; - if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&sl:new", kwlist, + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&s|l:newkey", kwlist, convu32, &id, &type, &exptime)) goto end; - if ((err = key_new(KEYFILE_KF(me), id, type, exptime, &k)) == 0) + if ((err = key_new(KEYFILE_KF(me), id, type, exptime, &k)) != 0) KEYERR(err); return (key_pywrap(me, k)); end: @@ -1954,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: @@ -2002,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@ */ @@ -2025,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@ */ @@ -2066,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 }