X-Git-Url: https://git.distorted.org.uk/~mdw/pyke/blobdiff_plain/6f1a40f35fb71ef4c2dbb0e92b8aaff1620a2ad1..a144ac2dc016d261f8e8b1d9bf1f95419a9bb2e8:/catacomb-python.h diff --git a/catacomb-python.h b/catacomb-python.h index a379e1d..5c5611e 100644 --- a/catacomb-python.h +++ b/catacomb-python.h @@ -33,20 +33,19 @@ /*----- Header files ------------------------------------------------------*/ +#define PY_SSIZE_T_CLEAN + #include #include #include -#undef ULLONG_MAX -#undef ULONG_LONG_MAX - -#include #include #include #include #include #include +#include #include #include @@ -61,13 +60,17 @@ #include #include +#include #include #include #include #include +#include #include #include #include +#include +#include #include #include @@ -86,6 +89,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -112,6 +119,21 @@ #include #include +/*----- Other preliminaries -----------------------------------------------*/ + +#define GOBBLE_SEMI extern int notexist +#if defined(__GNUC__) && defined(__ELF__) +# define PRIVATE_SYMBOLS _Pragma("GCC visibility push(hidden)") GOBBLE_SEMI +# define PUBLIC_SYMBOLS _Pragma("GCC visibility pop") GOBBLE_SEMI +# define EXPORT __attribute__((__visibility__("default"))) +#else +# define PRIVATE_SYMBOLS GOBBLE_SEMI +# define PUBLIC_SYMBOLS GOBBLE_SEMI +# define EXPORT +#endif + +PRIVATE_SYMBOLS; + /*----- Utility macros ----------------------------------------------------*/ #define RETURN_OBJ(obj) do { Py_INCREF(obj); return (obj); } while (0) @@ -126,7 +148,9 @@ goto end; \ } while (0) #define VALERR(str) EXCERR(PyExc_ValueError, str) +#define OVFERR(str) EXCERR(PyExc_OverflowError, str) #define TYERR(str) EXCERR(PyExc_TypeError, str) +#define IXERR(str) EXCERR(PyExc_IndexError, str) #define ZDIVERR(str) EXCERR(PyExc_ZeroDivisionError, str) #define SYSERR(str) EXCERR(PyExc_SystemError, str) #define NIERR(str) EXCERR(PyExc_NotImplementedError, str) @@ -138,7 +162,7 @@ PyErr_SetFromErrnoWithFilename(PyExc_OSError, name); \ goto end; \ } while (0) -#define PGENERR do { pgenerr(); goto end; } while (0) +#define PGENERR(exc) do { pgenerr(exc); goto end; } while (0) #define CONVFUNC(ty, cty, ext) \ int conv##ty(PyObject *o, void *p) \ @@ -151,19 +175,18 @@ 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(ty, base) do { \ +#define INITTYPE_META(ty, base, meta) do { \ ty##_pytype_skel.tp_base = base##_pytype; \ - ty##_pytype = inittype(&ty##_pytype_skel); \ + ty##_pytype = inittype(&ty##_pytype_skel, meta##_pytype); \ } while (0) +#define INITTYPE(ty, base) INITTYPE_META(ty, base, type) -#define INSERT(name, ob) do { \ +extern PyObject *home_module; +extern PyObject *modname; + +#define INSERT(name, ob) do { \ PyObject *_o = (PyObject *)(ob); \ Py_INCREF(_o); \ PyModule_AddObject(mod, name, _o); \ @@ -196,12 +219,11 @@ #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) \ +#define DECLARE_MODINIT(m) \ extern void m##_pyinit(void); \ extern void m##_pyinsert(PyObject *); -MODULES(DO) -#undef DO + +MODULES(DECLARE_MODINIT) #define FREEOBJ(obj) \ (((PyObject *)(obj))->ob_type->tp_free((PyObject *)(obj))) @@ -223,7 +245,10 @@ MODULES(DO) return (d); \ } -struct nameval { const char *name; unsigned long value; }; +#define KWLIST (/*unconst*/ char **)kwlist + +struct nameval { const char *name; unsigned f; unsigned long value; }; +#define CF_SIGNED 1u extern void setconstants(PyObject *, const struct nameval *); extern PyObject *mexp_common(PyObject *, PyObject *, size_t, @@ -238,16 +263,45 @@ extern int convulong(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 *); +struct excinfo { PyObject *ty, *val, *tb; }; +#define EXCINFO_INIT { 0, 0, 0 } + extern PyObject *mkexc(PyObject *, PyObject *, const char *, PyMethodDef *); +#define INIT_EXCINFO(exc) do { \ + struct excinfo *_exc = (exc); _exc->ty = _exc->val = _exc->tb = 0; \ +} while (0) +#define RELEASE_EXCINFO(exc) do { \ + struct excinfo *_exc = (exc); \ + Py_XDECREF(_exc->ty); _exc->ty = 0; \ + Py_XDECREF(_exc->val); _exc->val = 0; \ + Py_XDECREF(_exc->tb); _exc->tb = 0; \ +} while (0) +#define STASH_EXCINFO(exc) do { \ + struct excinfo *_exc = (exc); \ + PyErr_Fetch(&_exc->ty, &_exc->val, &_exc->tb); \ + PyErr_NormalizeException(&_exc->ty, &_exc->val, &_exc->tb); \ +} while (0) +#define RESTORE_EXCINFO(exc) do { \ + struct excinfo *_exc = (exc); \ + PyErr_Restore(_exc->ty, _exc->val, _exc->tb); \ + _exc->ty = _exc->val = _exc->tb = 0; \ +} while (0) +extern void report_lost_exception(struct excinfo *, const char *, ...); +extern void report_lost_exception_v(struct excinfo *, const char *, va_list); +extern void stash_exception(struct excinfo *, const char *, ...); +extern void restore_exception(struct excinfo *, const char *, ...); + extern void typeready(PyTypeObject *); -extern PyTypeObject *inittype(PyTypeObject *); +extern PyTypeObject *inittype(PyTypeObject *, PyTypeObject *); extern void addmethods(const PyMethodDef *); extern PyMethodDef *donemethods(void); @@ -269,7 +323,7 @@ extern PyMethodDef *donemethods(void); METH (iterkeys, "D.iterkeys() -> ITER") \ METH (itervalues, "D.itervalues() -> ITER") \ METH (iteritems, "D.iteritems() -> ITER") \ - KWMETH(get, "D.get(KEY, [default = None]) -> VALUE") \ + KWMETH(get, "D.get(KEY, [default = None]) -> VALUE") #define GMAP_DOMETHODS(METH, KWMETH) \ GMAP_DOROMETHODS(METH, KWMETH) \ @@ -288,7 +342,6 @@ extern PyMethodDef gmap_pymethods[]; /*----- Bytestrings -------------------------------------------------------*/ -PyTypeObject *bytestring_pyobj; PyObject *bytestring_pywrap(const void *, size_t); PyObject *bytestring_pywrapbuf(buf *); @@ -314,10 +367,11 @@ extern mp *getgf(PyObject *); extern int convgf(PyObject *, void *); extern PyObject *mp_pywrap(mp *); extern PyObject *gf_pywrap(mp *); +extern long mphash(mp *); extern mp *mp_frompyobject(PyObject *, int); extern PyObject *mp_topystring(mp *, int, const char *, const char *, const char *); -extern int mp_tolong_checked(mp *, long *); +extern int mp_tolong_checked(mp *, long *, int); /*----- Abstract fields ---------------------------------------------------*/ @@ -326,20 +380,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; @@ -351,8 +391,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 *)(o)->ob_type) +#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; @@ -373,23 +443,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; @@ -405,15 +458,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; @@ -433,7 +477,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 *); @@ -448,9 +491,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) @@ -458,55 +499,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; @@ -514,52 +512,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 { @@ -584,9 +545,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 -------------------------------------------------*/