X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/dafb2da44bb35c7057744ca820833cde6d43c534..2aa7d3a9238bfb3d117ca23191ea402c5c5d6f40:/catacomb-python.h diff --git a/catacomb-python.h b/catacomb-python.h index 41c5292..c3b120d 100644 --- a/catacomb-python.h +++ b/catacomb-python.h @@ -33,13 +33,11 @@ /*----- Header files ------------------------------------------------------*/ -#define PY_SSIZE_T_CLEAN +#include "pyke/pyke-mLib.h" -#include +PUBLIC_SYMBOLS; #include -#include -#include #include #include #include @@ -61,6 +59,7 @@ #include #include +#include #include #include #include @@ -69,6 +68,8 @@ #include #include #include +#include +#include #include #include @@ -88,7 +89,9 @@ #include #include #include +#include #include +#include #include #include @@ -114,122 +117,35 @@ #include #include +PRIVATE_SYMBOLS; -/*----- Utility macros ----------------------------------------------------*/ - -#define RETURN_OBJ(obj) do { Py_INCREF(obj); return (obj); } while (0) -#define RETURN_NONE RETURN_OBJ(Py_None) -#define RETURN_NOTIMPL RETURN_OBJ(Py_NotImplemented) -#define RETURN_TRUE RETURN_OBJ(Py_True) -#define RETURN_FALSE RETURN_OBJ(Py_False) -#define RETURN_ME RETURN_OBJ(me) - -#define EXCERR(exc, str) do { \ - PyErr_SetString(exc, str); \ - goto end; \ -} while (0) -#define VALERR(str) EXCERR(PyExc_ValueError, str) -#define TYERR(str) EXCERR(PyExc_TypeError, str) -#define ZDIVERR(str) EXCERR(PyExc_ZeroDivisionError, str) -#define SYSERR(str) EXCERR(PyExc_SystemError, str) -#define NIERR(str) EXCERR(PyExc_NotImplementedError, str) -#define INDEXERR(idx) do { \ - PyErr_SetObject(PyExc_KeyError, idx); \ - goto end; \ -} while (0) -#define OSERR(name) do { \ - PyErr_SetFromErrnoWithFilename(PyExc_OSError, name); \ - goto end; \ -} while (0) -#define PGENERR do { pgenerr(); goto end; } while (0) - -#define CONVFUNC(ty, cty, ext) \ - int conv##ty(PyObject *o, void *p) \ - { \ - if (!PyObject_TypeCheck(o, ty##_pytype)) \ - TYERR("wanted a " #ty); \ - *(cty *)p = ext(o); \ - return (1); \ - end: \ - return (0); \ - } - -#if PY_VERSION_HEX < 0x02050000 /* Compatibility hack */ -# define ht_name name -# define ht_type type -#endif - -#define root_pytype 0 -#define type_pytype &PyType_Type -#define INITTYPE_META(ty, base, meta) do { \ - ty##_pytype_skel.tp_base = base##_pytype; \ - ty##_pytype = inittype(&ty##_pytype_skel, meta##_pytype); \ -} while (0) -#define INITTYPE(ty, base) INITTYPE_META(ty, base, type) - -#define INSERT(name, ob) do { \ - PyObject *_o = (PyObject *)(ob); \ - Py_INCREF(_o); \ - PyModule_AddObject(mod, name, _o); \ -} while (0) - -#define INSEXC(name, var, base, meth) \ - INSERT(name, var = mkexc(mod, base, name, meth)) - -#define METH(func, doc) \ - { #func, METHNAME(func), METH_VARARGS, doc }, -#define KWMETH(func, doc) \ - { #func, (PyCFunction)METHNAME(func), \ - METH_VARARGS | METH_KEYWORDS, doc }, - -#define GET(func, doc) \ - { #func, GETSETNAME(get, func), 0, doc }, -#define GETSET(func, doc) \ - { #func, GETSETNAME(get, func), GETSETNAME(set, func), doc }, - -#define MEMBER(name, ty, f, doc) \ - { #name, ty, offsetof(MEMBERSTRUCT, name), f, doc }, +/*----- Miscellaneous preliminaries ---------------------------------------*/ +/* Submodules. */ #define MODULES(_) \ - _(util) \ + _(pyke_core) _(pyke_gmap) \ _(bytestring) _(buffer) \ _(rand) _(algorithms) _(pubkey) _(pgen) \ _(mp) _(field) _(ec) _(group) \ _(passphrase) _(share) _(key) -#define DOMODINIT(m) m##_pyinit(); -#define DOMODINSERT(m) m##_pyinsert(mod); -#define INIT_MODULES do { MODULES(DOMODINIT) } while (0) -#define INSERT_MODULES do { MODULES(DOMODINSERT) } while (0) - -#define DO(m) \ - extern void m##_pyinit(void); \ - extern void m##_pyinsert(PyObject *); -MODULES(DO) -#undef DO - -#define FREEOBJ(obj) \ - (((PyObject *)(obj))->ob_type->tp_free((PyObject *)(obj))) - -#define GEN(func, base) \ - static PyObject *func(void) \ - { \ - PyObject *d = PyDict_New(); \ - PyObject *o; \ - int i; \ - \ - for (i = 0; g##base##tab[i]; i++) { \ - o = gc##base##_pywrap((/*unconst*/ gc##base *)g##base##tab[i]); \ - PyDict_SetItemString(d, \ - (/*unconst*/ char *)g##base##tab[i]->name, \ - o); \ - Py_DECREF(o); \ - } \ - return (d); \ - } +MODULES(DECLARE_MODINIT) + +/* Exceptions. */ +#define PGENERR(err) do { pgenerr(err); goto end; } while (0) -struct nameval { const char *name; unsigned long value; }; -extern void setconstants(PyObject *, const struct nameval *); +/* Conversions. */ +extern int convmpw(PyObject *, void *); +/* Building tables of things. */ +extern PyObject *make_algtab(const void *tab, size_t esz, + const char *(*namefn)(const void *), + PyObject *(*valfn)(const void *)); +extern PyObject *make_grouptab(const void *tab, size_t esz, + const char *(*namefn)(const void *), + int (*ixfn)(const void *), + PyObject *(*valfn)(int)); + +/* Common handling for simultaneous exponentiation. */ extern PyObject *mexp_common(PyObject *, PyObject *, size_t, PyObject *(*id)(PyObject *), int (*fill)(void *, PyObject *, @@ -237,64 +153,8 @@ extern PyObject *mexp_common(PyObject *, PyObject *, size_t, PyObject *(*exp)(PyObject *, void *, int), void (*drop)(void *)); -extern int convulong(PyObject *, void *); -#define DECL_CONVU_(n) extern int convu##n(PyObject *, void *); -DOUINTSZ(DECL_CONVU_) -extern int convmpw(PyObject *, void *); -extern int convuint(PyObject *, void *); -extern int convk64(PyObject *, void *); -extern int convszt(PyObject *, void *); -extern int convbool(PyObject *, void *); -extern PyObject *abstract_pynew(PyTypeObject *, PyObject *, PyObject *); -extern PyObject *getbool(int); -extern PyObject *getulong(unsigned long); -extern PyObject *getk64(kludge64); -extern void *newtype(PyTypeObject *, const PyTypeObject *, const char *); - -extern PyObject *mkexc(PyObject *, PyObject *, const char *, PyMethodDef *); -extern void typeready(PyTypeObject *); -extern PyTypeObject *inittype(PyTypeObject *, PyTypeObject *); -extern void addmethods(const PyMethodDef *); -extern PyMethodDef *donemethods(void); - -/*----- Mapping methods ---------------------------------------------------*/ - -#define GMAP_METH(func, doc) { #func, gmapmeth_##func, METH_VARARGS, doc }, -#define GMAP_KWMETH(func, doc) \ - { #func, (PyCFunction)gmapmeth_##func, METH_VARARGS|METH_KEYWORDS, doc }, -#define GMAP_METHDECL(func, doc) \ - extern PyObject *gmapmeth_##func(PyObject *, PyObject *); -#define GMAP_KWMETHDECL(func, doc) \ - extern PyObject *gmapmeth_##func(PyObject *, PyObject *, PyObject *); - -#define GMAP_DOROMETHODS(METH, KWMETH) \ - METH (has_key, "D.has_key(KEY) -> BOOL") \ - METH (keys, "D.keys() -> LIST") \ - METH (values, "D.values() -> LIST") \ - METH (items, "D.items() -> LIST") \ - METH (iterkeys, "D.iterkeys() -> ITER") \ - METH (itervalues, "D.itervalues() -> ITER") \ - METH (iteritems, "D.iteritems() -> ITER") \ - KWMETH(get, "D.get(KEY, [default = None]) -> VALUE") \ - -#define GMAP_DOMETHODS(METH, KWMETH) \ - GMAP_DOROMETHODS(METH, KWMETH) \ - METH (clear, "D.clear()") \ - KWMETH(setdefault, "D.setdefault(K, [default = None]) -> VALUE") \ - KWMETH(pop, "D.pop(KEY, [default = ]) -> VALUE") \ - METH (popitem, "D.popitem() -> (KEY, VALUE)") \ - METH (update, "D.update(MAP)") - -GMAP_DOMETHODS(GMAP_METHDECL, GMAP_KWMETHDECL) -#define GMAP_ROMETHODS GMAP_DOROMETHODS(GMAP_METH, GMAP_KWMETH) -#define GMAP_METHODS GMAP_DOMETHODS(GMAP_METH, GMAP_KWMETH) -extern Py_ssize_t gmap_pysize(PyObject *); -extern PySequenceMethods gmap_pysequence; -extern PyMethodDef gmap_pymethods[]; - /*----- Bytestrings -------------------------------------------------------*/ -PyTypeObject *bytestring_pyobj; PyObject *bytestring_pywrap(const void *, size_t); PyObject *bytestring_pywrapbuf(buf *); @@ -320,6 +180,7 @@ extern mp *getgf(PyObject *); extern int convgf(PyObject *, void *); extern PyObject *mp_pywrap(mp *); extern PyObject *gf_pywrap(mp *); +extern Py_hash_t mphash(mp *); extern mp *mp_frompyobject(PyObject *, int); extern PyObject *mp_topystring(mp *, int, const char *, const char *, const char *); @@ -332,20 +193,6 @@ typedef struct field_pyobj { field *f; } field_pyobj; -extern PyTypeObject *fe_pytype; -#define FE_PYCHECK(o) PyObject_TypeCheck((o), fe_pytype) -#define FE_F(o) (((fe_pyobj *)(o))->f) -#define FE_FOBJ(o) ((PyObject *)(o)->ob_type) -#define FE_X(o) (((fe_pyobj *)(o))->x) -extern PyObject *fe_pywrap(PyObject *, mp *); -extern mp *getfe(field *, PyObject *); - -typedef struct fe_pyobj { - PyObject_HEAD - field *f; - mp *x; -} fe_pyobj; - extern PyTypeObject *field_pytype; extern PyTypeObject *primefield_pytype; extern PyTypeObject *niceprimefield_pytype; @@ -357,8 +204,38 @@ extern PyTypeObject *binnormfield_pytype; extern PyObject *field_pywrap(field *); extern field *field_copy(field *); +typedef struct fe_pyobj { + PyObject_HEAD + field *f; + mp *x; +} fe_pyobj; + +extern PyTypeObject *fe_pytype; +#define FE_PYCHECK(o) PyObject_TypeCheck((o), fe_pytype) +#define FE_F(o) (((fe_pyobj *)(o))->f) +#define FE_FOBJ(o) ((PyObject *)Py_TYPE(o)) +#define FE_X(o) (((fe_pyobj *)(o))->x) +extern PyObject *fe_pywrap(PyObject *, mp *); + /*----- Elliptic curves ---------------------------------------------------*/ +typedef struct eccurve_pyobj { + PyHeapTypeObject ty; + ec_curve *c; + PyObject *fobj; +} eccurve_pyobj; + +extern PyTypeObject *eccurve_pytype; +extern PyTypeObject *ecprimecurve_pytype; +extern PyTypeObject *ecprimeprojcurve_pytype; +extern PyTypeObject *ecbincurve_pytype; +extern PyTypeObject *ecbinprojcurve_pytype; +#define ECCURVE_PYCHECK(o) PyObject_TypeCheck((o), eccurve_pytype) +#define ECCURVE_C(o) (((eccurve_pyobj *)(o))->c) +#define ECCURVE_FOBJ(o) (((eccurve_pyobj *)(o))->fobj) +extern PyObject *eccurve_pywrap(PyObject *, ec_curve *); +extern ec_curve *eccurve_copy(ec_curve *); + typedef struct ecpt_pyobj { PyObject_HEAD ec_curve *c; @@ -369,7 +246,7 @@ extern PyTypeObject *ecpt_pytype, *ecptcurve_pytype; #define ECPT_PYCHECK(o) PyObject_TypeCheck((o), ecpt_pytype) #define ECPTCURVE_PYCHECK(o) PyObject_TypeCheck((o), ecptcurve_pytype) #define ECPT_C(o) (((ecpt_pyobj *)(o))->c) -#define ECPT_COBJ(o) ((PyObject *)(o)->ob_type) +#define ECPT_COBJ(o) ((PyObject *)Py_TYPE(o)) #define ECPT_FOBJ(o) ECCURVE_FOBJ(ECPT_COBJ((o))) #define ECPT_P(o) (&((ecpt_pyobj *)(o))->p) extern PyObject *ecpt_pywrap(PyObject *, ec *); @@ -379,23 +256,6 @@ extern int getecpt(ec_curve *, ec *, PyObject *); extern void getecptout(ec *, PyObject *); extern int convecpt(PyObject *, void *); -typedef struct eccurve_pyobj { - PyHeapTypeObject ty; - ec_curve *c; - PyObject *fobj; -} eccurve_pyobj; - -extern PyTypeObject *eccurve_pytype; -extern PyTypeObject *ecprimecurve_pytype; -extern PyTypeObject *ecprimeprojcurve_pytype; -extern PyTypeObject *ecbincurve_pytype; -extern PyTypeObject *ecbinprojcurve_pytype; -#define ECCURVE_PYCHECK(o) PyObject_TypeCheck((o), eccurve_pytype) -#define ECCURVE_C(o) (((eccurve_pyobj *)(o))->c) -#define ECCURVE_FOBJ(o) (((eccurve_pyobj *)(o))->fobj) -extern PyObject *eccurve_pywrap(PyObject *, ec_curve *); -extern ec_curve *eccurve_copy(ec_curve *); - typedef struct ecinfo_pyobj { PyObject_HEAD ec_info ei; @@ -411,15 +271,6 @@ extern PyObject *ecinfo_pywrap(ec_info *); /*----- Cyclic groups -----------------------------------------------------*/ -typedef struct fginfo_pyobj { - PyObject_HEAD - gprime_param dp; -} fginfo_pyobj; - -PyTypeObject *fginfo_pytype, *dhinfo_pytype, *bindhinfo_pytype; -#define FGINFO_DP(fg) (&((fginfo_pyobj *)(fg))->dp) -PyObject *fginfo_pywrap(gprime_param *, PyTypeObject *); - typedef struct ge_pyobj { PyObject_HEAD ge *x; @@ -430,7 +281,7 @@ extern PyTypeObject *ge_pytype; #define GE_PYCHECK(o) PyObject_TypeCheck((o), ge_pytype) #define GE_X(o) (((ge_pyobj *)(o))->x) #define GE_G(o) (((ge_pyobj *)(o))->g) -#define GE_GOBJ(o) ((PyObject *)(group_pyobj *)(o)->ob_type) +#define GE_GOBJ(o) (PyObject *)(Py_TYPE(o)) extern PyObject *ge_pywrap(PyObject *, ge *); typedef struct group_pyobj { @@ -439,7 +290,6 @@ typedef struct group_pyobj { } group_pyobj; extern PyTypeObject *group_pytype; -extern PyTypeObject *primegroup_pytype, *bingroup_pytype, *ecgroup_pytype; #define GROUP_G(o) (((group_pyobj *)(o))->g) extern PyObject *group_pywrap(group *); extern group *group_copy(group *); @@ -454,9 +304,7 @@ typedef struct grand_pyobj { grand *r; } grand_pyobj; -extern PyTypeObject *grand_pytype, *truerand_pytype; -extern PyTypeObject *lcrand_pytype,* fibrand_pytype; -extern PyTypeObject *dsarand_pytype, *bbs_pytype; +extern PyTypeObject *grand_pytype; extern PyObject *rand_pyobj; #define GRAND_PYCHECK(o) PyObject_TypeCheck((o), grand_pytype) #define GRAND_F(o) (((grand_pyobj *)(o))->f) @@ -464,55 +312,12 @@ extern PyObject *rand_pyobj; extern PyObject *grand_pywrap(grand *, unsigned); extern int convgrand(PyObject *, void *); -/*----- Key sizes ---------------------------------------------------------*/ - -typedef struct keysz_pyobj { - PyObject_HEAD - int dfl; -} keysz_pyobj; - -typedef struct keyszrange_pyobj { - PyObject_HEAD - int dfl; - int min, max, mod; -} keyszrange_pyobj; - -typedef struct keyszset_pyobj { - PyObject_HEAD - int dfl; - PyObject *set; -} keyszset_pyobj; - -#define KEYSZ_PYCHECK(o) PyObject_TypeCheck((o), keysz_pytype) -extern PyObject *keysz_pywrap(const octet *); - /*----- Symmetric cryptography --------------------------------------------*/ -typedef struct gccipher_pyobj { - PyHeapTypeObject ty; - gccipher *cc; -} gccipher_pyobj; +extern PyObject *keysz_pywrap(const octet *); -extern PyTypeObject *gccipher_pytype; -#define GCCIPHER_PYCHECK(o) PyObject_TypeCheck((o), gccipher_pytype) -#define GCCIPHER_CC(o) (((gccipher_pyobj *)(o))->cc) -#define GCCIPHER_F(o) (((gccipher_pyobj *)(o))->f) -extern PyObject *gccipher_pywrap(gccipher *); extern int convgccipher(PyObject *, void *); -extern int convgcipher(PyObject *, void *); - -typedef struct gcipher_pyobj { - PyObject_HEAD - unsigned f; - gcipher *c; -} gcipher_pyobj; - -extern PyTypeObject *gcipher_pytype; -#define GCIPHER_PYCHECK(o) PyObject_TypeCheck((o), gcipher_pytype) -#define GCIPHER_C(o) (((gcipher_pyobj *)(o))->c) -#define GCIPHER_F(o) (((gcipher_pyobj *)(o))->f) -extern PyObject *gcipher_pywrap(PyObject *, gcipher *, unsigned); -extern int convgcipher(PyObject *, void *); +extern PyObject *gccipher_pywrap(gccipher *); typedef struct gchash_pyobj { PyHeapTypeObject ty; @@ -520,52 +325,15 @@ typedef struct gchash_pyobj { } gchash_pyobj; extern PyTypeObject *gchash_pytype; +extern PyObject *sha_pyobj, *has160_pyobj; #define GCHASH_PYCHECK(o) PyObject_TypeCheck((o), gchash_pytype) #define GCHASH_CH(o) (((gchash_pyobj *)(o))->ch) -#define GCHASH_F(o) (((gchash_pyobj *)(o))->f) -extern PyObject *gchash_pywrap(gchash *); +extern PyObject *ghash_pywrap(PyObject *, ghash *); extern int convgchash(PyObject *, void *); - -typedef struct ghash_pyobj { - PyObject_HEAD - unsigned f; - ghash *h; -} ghash_pyobj; - -extern PyTypeObject *ghash_pytype, *gmhash_pytype; -extern PyObject *sha_pyobj, *has160_pyobj; -#define GHASH_PYCHECK(o) PyObject_TypeCheck((o), ghash_pytype) -#define GHASH_H(o) (((ghash_pyobj *)(o))->h) -#define GHASH_F(o) (((ghash_pyobj *)(o))->f) -extern PyObject *ghash_pywrap(PyObject *, ghash *, unsigned); extern int convghash(PyObject *, void *); -extern int convgmhash(PyObject *, void *); -typedef struct gcmac_pyobj { - PyHeapTypeObject ty; - gcmac *cm; -} gcmac_pyobj; - -extern PyTypeObject *gcmac_pytype; -#define GCMAC_PYCHECK(o) PyObject_TypeCheck((o), gcmac_pytype) -#define GCMAC_CM(o) (((gcmac_pyobj *)(o))->cm) -#define GCMAC_F(o) (((gcmac_pyobj *)(o))->f) -extern PyObject *gcmac_pywrap(gcmac *); extern int convgcmac(PyObject *, void *); -typedef struct gmac_pyobj { - PyHeapTypeObject ty; - unsigned f; - gmac *m; -} gmac_pyobj; - -extern PyTypeObject *gmac_pytype; -#define GMAC_PYCHECK(o) PyObject_TypeCheck((o), gmac_pytype) -#define GMAC_M(o) (((gmac_pyobj *)(o))->m) -#define GMAC_F(o) (((gmac_pyobj *)(o))->f) -extern PyObject *gmac_pywrap(PyObject *, gmac *, unsigned); -extern int convgmac(PyObject *, void *); - /*----- Key generation ----------------------------------------------------*/ typedef struct pfilt_pyobj { @@ -590,9 +358,15 @@ extern PyTypeObject *pgev_pytype; #define PGEV_PYCHECK(o) PyObject_TypeCheck(o, pgev_pytype) #define PGEV_PG(o) (&((pgev_pyobj *)(o))->pg) +typedef struct pypgev { + pgev ev; + PyObject *obj; + struct excinfo *exc; +} pypgev; + extern int convpgev(PyObject *, void *); -extern void droppgev(pgev *); -extern void pgenerr(void); +extern void droppgev(pypgev *); +extern void pgenerr(struct excinfo *exc); /*----- That's all, folks -------------------------------------------------*/