X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/6438edb82bafab97b8aad35ce7ce3d787dde9a99..620169aef06f74c9a8574e28b5482061e81a7389:/algorithms.c diff --git a/algorithms.c b/algorithms.c index 465da45..9dbebe6 100644 --- a/algorithms.c +++ b/algorithms.c @@ -295,8 +295,8 @@ static const PyMemberDef keyszset_pymembers[] = { { 0 } }; -static PyTypeObject keysz_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject keysz_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "KeySZ", /* @tp_name@ */ sizeof(keysz_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -343,8 +343,8 @@ static PyTypeObject keysz_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject keyszany_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject keyszany_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "KeySZAny", /* @tp_name@ */ sizeof(keysz_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -392,8 +392,8 @@ static PyTypeObject keyszany_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject keyszrange_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject keyszrange_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "KeySZRange", /* @tp_name@ */ sizeof(keyszrange_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -442,8 +442,8 @@ static PyTypeObject keyszrange_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject keyszset_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject keyszset_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "KeySZSet", /* @tp_name@ */ sizeof(keyszset_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -558,7 +558,7 @@ PyObject *gccipher_pywrap(gccipher *cc) static void gcipher_pydealloc(PyObject *me) { GC_DESTROY(GCIPHER_C(me)); - Py_DECREF(me->ob_type); + Py_DECREF(Py_TYPE(me)); FREEOBJ(me); } @@ -669,8 +669,8 @@ static const PyMethodDef gcipher_pymethods[] = { { 0 } }; -static PyTypeObject gccipher_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gccipher_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GCCipher", /* @tp_name@ */ sizeof(gccipher_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -717,8 +717,8 @@ static PyTypeObject gccipher_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gcipher_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gcipher_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GCipher", /* @tp_name@ */ sizeof(gcipher_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -933,7 +933,7 @@ static PyObject *gcaead_pywrap(gcaead *aec) } static void gaeadkey_pydealloc(PyObject *me) - { GAEAD_DESTROY(GAEADKEY_K(me)); Py_DECREF(me->ob_type); FREEOBJ(me); } + { GAEAD_DESTROY(GAEADKEY_K(me)); Py_DECREF(Py_TYPE(me)); FREEOBJ(me); } static PyObject *gcaeget_name(PyObject *me, void *hunoz) { return (PyString_FromString(GCAEAD_AEC(me)->name)); } @@ -980,7 +980,7 @@ static PyObject *gaekmeth_aad(PyObject *me) if (k->ops->c->f&AEADF_AADNDEP) VALERR("aad must be associated with enc/dec op"); - rc = gaeadaad_pywrap((PyObject *)GCAEAD_AAD(me->ob_type), + rc = gaeadaad_pywrap((PyObject *)GCAEAD_AAD(Py_TYPE(me)), GAEAD_AAD(k), 0, 0); end: return (rc); @@ -1031,7 +1031,7 @@ static PyObject *gaekmeth_enc(PyObject *me, PyObject *arg, PyObject *kw) goto end; e = GAEAD_ENC(GAEADKEY_K(me), n, nsz, hsz, msz, tsz); if (!e) VALERR("bad aead parameter combination"); - rc = gaeadenc_pywrap((PyObject *)GCAEAD_ENC(me->ob_type), + rc = gaeadenc_pywrap((PyObject *)GCAEAD_ENC(Py_TYPE(me)), e, f, hsz, msz, tsz); end: return (rc); @@ -1056,7 +1056,7 @@ static PyObject *gaekmeth_dec(PyObject *me, PyObject *arg, PyObject *kw) goto end; d = GAEAD_DEC(GAEADKEY_K(me), n, nsz, hsz, csz, tsz); if (!d) VALERR("bad aead parameter combination"); - rc = gaeaddec_pywrap((PyObject *)GCAEAD_DEC(me->ob_type), + rc = gaeaddec_pywrap((PyObject *)GCAEAD_DEC(Py_TYPE(me)), d, f, hsz, csz, tsz); end: return (rc); @@ -1087,7 +1087,7 @@ static void gaeadaad_pydealloc(PyObject *me) gaeadaad_pyobj *ga = (gaeadaad_pyobj *)me; if (ga->a) GAEAD_DESTROY(ga->a); - Py_DECREF(me->ob_type); FREEOBJ(me); + Py_DECREF(Py_TYPE(me)); FREEOBJ(me); } static int gaea_check(PyObject *me) @@ -1135,7 +1135,7 @@ static PyObject *gaeameth_copy(PyObject *me) if (gaea_check(me)) goto end; if (GAEADAAD_F(me)&AEADF_AADNDEP) VALERR("can't duplicate nonce-dependent aad"); - rc = gaeadaad_pywrap((PyObject *)me->ob_type, + rc = gaeadaad_pywrap((PyObject *)Py_TYPE(me), GAEAD_DUP(GAEADAAD_A(me)), 0, 0); GAEADAAD_HLEN(rc) = GAEADAAD_HLEN(me); end: @@ -1232,7 +1232,7 @@ static void gaeadenc_pydealloc(PyObject *me) gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me; gaea_sever(&ge->aad); GAEAD_DESTROY(ge->e); - Py_DECREF(me->ob_type); FREEOBJ(me); + Py_DECREF(Py_TYPE(me)); FREEOBJ(me); } static PyObject *gaeeget_hsz(PyObject *me, void *hunoz) @@ -1272,14 +1272,14 @@ static PyObject *gaeemeth_aad(PyObject *me) PyObject *rc = 0; if (!(ge->f&AEADF_AADNDEP)) - rc = gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(ge->ob_type)->aad, + rc = gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(Py_TYPE(ge))->aad, GAEAD_AAD(ge->e), 0, 0); else { if ((ge->f&AEADF_AADFIRST) && ge->mlen) VALERR("too late for aad"); if (!ge->aad) ge->aad = (gaeadaad_pyobj *) - gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(ge->ob_type)->aad, + gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(Py_TYPE(ge))->aad, GAEAD_AAD(ge->e), ge->f&(AEADF_PCHSZ | AEADF_NOAAD), ge->hsz); Py_INCREF(ge->aad); @@ -1352,7 +1352,7 @@ static PyObject *gaeemeth_done(PyObject *me, PyObject *arg, PyObject *kw) if (tszobj != Py_None && !convszt(tszobj, &tsz)) goto end; if (aad != Py_None && !PyObject_TypeCheck(aad, - (PyTypeObject *)GCAEADENC_KEY(me->ob_type)->aad)) + (PyTypeObject *)GCAEADENC_KEY(Py_TYPE(me))->aad)) TYERR("wanted aad"); if ((ge->f&AEADF_AADNDEP) && aad != Py_None && aad != (PyObject *)ge->aad) VALERR("mismatched aad"); @@ -1406,7 +1406,7 @@ static void gaeaddec_pydealloc(PyObject *me) gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me; gaea_sever(&gd->aad); GAEAD_DESTROY(GAEADDEC_D(me)); - Py_DECREF(me->ob_type); FREEOBJ(me); + Py_DECREF(Py_TYPE(me)); FREEOBJ(me); } static PyObject *gaedget_hsz(PyObject *me, void *hunoz) @@ -1445,12 +1445,12 @@ static PyObject *gaedmeth_aad(PyObject *me) gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me; if (!(gd->f&AEADF_AADNDEP)) - return (gaeadaad_pywrap((PyObject *)GCAEADDEC_KEY(gd->ob_type)->aad, + return (gaeadaad_pywrap((PyObject *)GCAEADDEC_KEY(Py_TYPE(gd))->aad, GAEAD_AAD(gd->d), 0, 0)); else { if (!gd->aad) gd->aad = (gaeadaad_pyobj *) - gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(gd->ob_type)->aad, + gaeadaad_pywrap((PyObject *)GCAEADENC_KEY(Py_TYPE(gd))->aad, GAEAD_AAD(gd->d), gd->f&(AEADF_PCHSZ | AEADF_NOAAD), gd->hsz); Py_INCREF(gd->aad); @@ -1520,7 +1520,7 @@ static PyObject *gaedmeth_done(PyObject *me, PyObject *arg, PyObject *kw) goto end; if (aad != Py_None && !PyObject_TypeCheck(aad, - (PyTypeObject *)GCAEADENC_KEY(me->ob_type)->aad)) + (PyTypeObject *)GCAEADENC_KEY(Py_TYPE(me))->aad)) TYERR("wanted aad"); if ((gd->f&AEADF_AADNDEP) && aad != Py_None && aad != (PyObject *)gd->aad) VALERR("mismatched aad"); @@ -1552,8 +1552,8 @@ static const PyMethodDef gaeaddec_pymethods[] = { { 0 } }; -static PyTypeObject gcaead_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gcaead_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GCAEAD", /* @tp_name@ */ sizeof(gcaead_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1600,8 +1600,8 @@ static PyTypeObject gcaead_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gaeadkey_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gaeadkey_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GAEKey", /* @tp_name@ */ sizeof(gaeadkey_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1648,8 +1648,8 @@ static PyTypeObject gaeadkey_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gcaeadaad_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gcaeadaad_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GAEAADClass", /* @tp_name@ */ sizeof(gcaeadaad_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1696,8 +1696,8 @@ static PyTypeObject gcaeadaad_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gaeadaad_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gaeadaad_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GAEAAD", /* @tp_name@ */ sizeof(gaeadaad_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1744,8 +1744,8 @@ static PyTypeObject gaeadaad_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gcaeadenc_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gcaeadenc_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GAEEncClass", /* @tp_name@ */ sizeof(gcaeadenc_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1792,8 +1792,8 @@ static PyTypeObject gcaeadenc_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gaeadenc_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gaeadenc_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GAEEnc", /* @tp_name@ */ sizeof(gaeadenc_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1840,8 +1840,8 @@ static PyTypeObject gaeadenc_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gcaeaddec_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gcaeaddec_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GAEDecClass", /* @tp_name@ */ sizeof(gcaeaddec_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1888,8 +1888,8 @@ static PyTypeObject gcaeaddec_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gaeaddec_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gaeaddec_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GAEDec", /* @tp_name@ */ sizeof(gaeaddec_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -1993,7 +1993,7 @@ PyObject *ghash_pywrap(PyObject *cobj, ghash *h) static void ghash_pydealloc(PyObject *me) { GH_DESTROY(GHASH_H(me)); - Py_DECREF(me->ob_type); + Py_DECREF(Py_TYPE(me)); FREEOBJ(me); } @@ -2007,7 +2007,7 @@ static PyObject *gchget_bufsz(PyObject *me, void *hunoz) { return (PyInt_FromLong(GCHASH_CH(me)->bufsz)); } static PyObject *ghmeth_copy(PyObject *me) - { return (ghash_pywrap((PyObject *)me->ob_type, GH_COPY(GHASH_H(me)))); } + { return (ghash_pywrap((PyObject *)Py_TYPE(me), GH_COPY(GHASH_H(me)))); } static PyObject *ghmeth_hash(PyObject *me, PyObject *arg) { @@ -2086,8 +2086,8 @@ static const PyMethodDef ghash_pymethods[] = { { 0 } }; -static PyTypeObject gchash_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gchash_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GCHash", /* @tp_name@ */ sizeof(gchash_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2134,8 +2134,8 @@ static PyTypeObject gchash_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject ghash_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject ghash_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GHash", /* @tp_name@ */ sizeof(ghash_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2278,7 +2278,7 @@ static PyObject *gmac_pywrap(PyObject *cobj, gmac *m) static void gmac_pydealloc(PyObject *me) { GM_DESTROY(GMAC_M(me)); - Py_DECREF(me->ob_type); + Py_DECREF(Py_TYPE(me)); PyType_Type.tp_dealloc(me); } @@ -2300,8 +2300,8 @@ static const PyGetSetDef gcmac_pygetset[] = { { 0 } }; -static PyTypeObject gcmac_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gcmac_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GCMAC", /* @tp_name@ */ sizeof(gchash_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2348,8 +2348,8 @@ static PyTypeObject gcmac_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gmac_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gmac_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GMAC", /* @tp_name@ */ sizeof(gmac_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2396,8 +2396,8 @@ static PyTypeObject gmac_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gmhash_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gmhash_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GMACHash", /* @tp_name@ */ sizeof(ghash_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2534,9 +2534,9 @@ static PyObject *poly1305clsget_tagsz(PyObject *me, void *hunoz) static PyObject *polymeth_copy(PyObject *me) { poly1305hash_pyobj *ph; - ph = PyObject_NEW(poly1305hash_pyobj, me->ob_type); + ph = PyObject_NEW(poly1305hash_pyobj, Py_TYPE(me)); poly1305_copy(&ph->ctx, P1305_CTX(me)); - Py_INCREF(me->ob_type); + Py_INCREF(Py_TYPE(me)); return ((PyObject *)ph); } @@ -2597,7 +2597,7 @@ static PyObject *polymeth_concat(PyObject *me, PyObject *arg) if (!PyObject_TypeCheck(pre, poly1305hash_pytype) || !PyObject_TypeCheck(suff, poly1305hash_pytype)) TYERR("wanted a poly1305hash"); - if (me->ob_type != pre->ob_type || me->ob_type != suff->ob_type) + if (Py_TYPE(me) != Py_TYPE(pre) || Py_TYPE(me) != Py_TYPE(suff)) TYERR("key mismatch"); if (P1305_CTX(pre)->nbuf) VALERR("prefix is not block-aligned"); poly1305_concat(P1305_CTX(me), P1305_CTX(pre), P1305_CTX(suff)); @@ -2646,8 +2646,8 @@ static const PyMethodDef poly1305hash_pymethods[] = { { 0 } }; -static PyTypeObject poly1305cls_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject poly1305cls_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "Poly1305Class", /* @tp_name@ */ sizeof(PyHeapTypeObject), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2694,8 +2694,8 @@ static PyTypeObject poly1305cls_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject poly1305key_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject poly1305key_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "poly1305", /* @tp_name@ */ sizeof(poly1305key_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2742,8 +2742,8 @@ static PyTypeObject poly1305key_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject poly1305hash_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject poly1305hash_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "Poly1305Hash", /* @tp_name@ */ sizeof(poly1305hash_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2848,7 +2848,7 @@ end: static PyObject *kxvikmeth_copy(PyObject *me) { kxvik_pyobj *k = (kxvik_pyobj *)me, *rc = 0; - rc = (kxvik_pyobj *)k->ob_type->tp_alloc(k->ob_type, 0); + rc = (kxvik_pyobj *)Py_TYPE(k)->tp_alloc(Py_TYPE(k), 0); rc->s = k->s; rc->n = k->n; return ((PyObject *)rc); } @@ -2905,30 +2905,10 @@ static PyObject *kxvikmeth_step(PyObject *me) RETURN_ME; } -static PyObject *kxvikget_nround(PyObject *me, void *hunoz) -{ - kxvik_pyobj *k = (kxvik_pyobj *)me; - return (PyInt_FromLong(k->n)); -} - -static int kxvikset_nround(PyObject *me, PyObject *val, void *hunoz) -{ - kxvik_pyobj *k = (kxvik_pyobj *)me; - unsigned n; - int rc = -1; - - if (!val) NIERR("__del__"); - if (!convuint(val, &n)) goto end; - k->n = n; - rc = 0; -end: - return (rc); -} - -static const PyGetSetDef kxvik_pygetset[] = { -#define GETSETNAME(op, name) kxvik##op##_##name - GETSET(nround, "KECCAK.nround -> number of rounds") -#undef GETSETNAME +static const PyMemberDef kxvik_pymembers[] = { +#define MEMBERSTRUCT kxvik_pyobj + MEMRNM(nround, T_UINT, n, 0, "KECCAC.nround -> number of rounds") +#undef MEMBERSTRUCT { 0 } }; @@ -2942,8 +2922,8 @@ static const PyMethodDef kxvik_pymethods[] = { { 0 } }; -static PyTypeObject kxvik_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject kxvik_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "Keccak1600", /* @tp_name@ */ sizeof(kxvik_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -2976,8 +2956,8 @@ static PyTypeObject kxvik_pytype_skel = { 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ PYMETHODS(kxvik), /* @tp_methods@ */ - 0, /* @tp_members@ */ - PYGETSET(kxvik), /* @tp_getset@ */ + PYMEMBERS(kxvik), /* @tp_members@ */ + 0, /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ 0, /* @tp_descr_get@ */ @@ -3113,7 +3093,7 @@ static PyObject *shakemeth_copy(PyObject *me) { shake_pyobj *rc = 0; - rc = PyObject_NEW(shake_pyobj, me->ob_type); + rc = PyObject_NEW(shake_pyobj, Py_TYPE(me)); rc->h = *SHAKE_H(me); rc->st = SHAKE_ST(me); return ((PyObject *)rc); @@ -3145,12 +3125,6 @@ end: return (rc); } -static PyObject *shakeget_rate(PyObject *me, void *hunoz) - { return (PyInt_FromLong(SHAKE_H(me)->h.r)); } - -static PyObject *shakeget_buffered(PyObject *me, void *hunoz) - { return (PyInt_FromLong(SHAKE_H(me)->h.n)); } - static PyObject *shakeget_state(PyObject *me, void *hunoz) { int st = SHAKE_ST(me); @@ -3158,10 +3132,17 @@ static PyObject *shakeget_state(PyObject *me, void *hunoz) st == 1 ? "squeeze" : "dead")); } +static const PyMemberDef shake_pymembers[] = { +#define MEMBERSTRUCT shake_pyobj + MEMRNM(rate, T_UINT, h.h.r, READONLY, "S.rate -> rate, in bytes") + MEMRNM(buffered, T_UINT, h.h.n, READONLY, + "S.buffered -> amount currently buffered") +#undef MEMBERSTRUCT + { 0 } +}; + static const PyGetSetDef shake_pygetset[] = { #define GETSETNAME(op, name) shake##op##_##name - GET (rate, "S.rate -> rate, in bytes") - GET (buffered, "S.buffered -> amount currently buffered") GET (state, "S.state -> `absorb', `squeeze', `dead'") #undef GETSETNAME { 0 } @@ -3186,8 +3167,8 @@ static const PyMethodDef shake_pymethods[] = { { 0 } }; -static PyTypeObject shake_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject shake_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "Shake", /* @tp_name@ */ sizeof(shake_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -3220,7 +3201,7 @@ static PyTypeObject shake_pytype_skel = { 0, /* @tp_iter@ */ 0, /* @tp_iternext@ */ PYMETHODS(shake), /* @tp_methods@ */ - 0, /* @tp_members@ */ + PYMEMBERS(shake), /* @tp_members@ */ PYGETSET(shake), /* @tp_getset@ */ 0, /* @tp_base@ */ 0, /* @tp_dict@ */ @@ -3234,8 +3215,8 @@ static PyTypeObject shake_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject shake128_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject shake128_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "Shake128", /* @tp_name@ */ 0, /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -3282,8 +3263,8 @@ static PyTypeObject shake128_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject shake256_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject shake256_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "Shake256", /* @tp_name@ */ 0, /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -3408,7 +3389,7 @@ end: } static void gprp_pydealloc(PyObject *me) - { Py_DECREF(me->ob_type); FREEOBJ(me); } + { Py_DECREF(Py_TYPE(me)); FREEOBJ(me); } static PyObject *gcprp_pywrap(const prpinfo *prp) { @@ -3479,8 +3460,8 @@ static const PyMethodDef gprp_pymethods[] = { { 0 } }; -static PyTypeObject gcprp_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gcprp_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GCPRP", /* @tp_name@ */ sizeof(gcprp_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -3527,8 +3508,8 @@ static PyTypeObject gcprp_pytype_skel = { 0 /* @tp_is_gc@ */ }; -static PyTypeObject gprp_pytype_skel = { - PyObject_HEAD_INIT(0) 0, /* Header */ +static const PyTypeObject gprp_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ "GPRP", /* @tp_name@ */ sizeof(gprp_pyobj), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -3577,6 +3558,12 @@ static PyTypeObject gprp_pytype_skel = { /*----- Main code ---------------------------------------------------------*/ +static const struct nameval consts[] = { + CONST(AEADF_PCHSZ), CONST(AEADF_PCMSZ), CONST(AEADF_PCTSZ), + CONST(AEADF_AADNDEP), CONST(AEADF_AADFIRST), CONST(AEADF_NOAAD), + { 0 } +}; + static const PyMethodDef methods[] = { #define METHNAME(func) meth_##func #define METH_HDANCE(hdance, HDance) METH(hdance##_prf, \ @@ -3625,12 +3612,14 @@ void algorithms_pyinit(void) addmethods(methods); } -GEN(gcciphers, cipher) -GEN(gcaeads, aead) -GEN(gchashes, hash) -GEN(gcmacs, mac) #define gcprp prpinfo -GEN(gcprps, prp) +#define CLASS_TABLES(_) _(cipher) _(aead) _(hash) _(mac) _(prp) +#define TABLE_FNS(pre) \ + static const char *pre##_namefn(const void *p) \ + { const gc##pre *const *cls = p; return (*cls ? (*cls)->name : 0); } \ + static PyObject *pre##_valfn(const void *p) \ + { gc##pre *const*cls = p; return (gc##pre##_pywrap(*cls)); } +CLASS_TABLES(TABLE_FNS) void algorithms_pyinsert(PyObject *mod) { @@ -3641,7 +3630,8 @@ void algorithms_pyinsert(PyObject *mod) INSERT("KeySZSet", keyszset_pytype); INSERT("GCCipher", gccipher_pytype); INSERT("GCipher", gcipher_pytype); - INSERT("gcciphers", gcciphers()); + INSERT("gcciphers", make_algtab(gciphertab, sizeof(gccipher *), + cipher_namefn, cipher_valfn)); INSERT("GCAEAD", gcaead_pytype); INSERT("GAEKey", gaeadkey_pytype); INSERT("GAEAADClass", gcaeadaad_pytype); @@ -3650,16 +3640,19 @@ void algorithms_pyinsert(PyObject *mod) INSERT("GAEEnc", gaeadenc_pytype); INSERT("GAEDecClass", gcaeaddec_pytype); INSERT("GAEDec", gaeaddec_pytype); - INSERT("gcaeads", gcaeads()); + INSERT("gcaeads", make_algtab(gaeadtab, sizeof(gcaead *), + aead_namefn, aead_valfn)); INSERT("GCHash", gchash_pytype); INSERT("GHash", ghash_pytype); - INSERT("gchashes", d = gchashes()); - sha_pyobj = PyDict_GetItemString(d, "sha"); Py_INCREF(sha_pyobj); - has160_pyobj = PyDict_GetItemString(d, "has160"); Py_INCREF(has160_pyobj); + d = make_algtab(ghashtab, sizeof(gchash *), hash_namefn, hash_valfn); + INSERT("gchashes", d); + sha_pyobj = PyMapping_GetItemString(d, "sha"); Py_INCREF(sha_pyobj); + has160_pyobj = PyMapping_GetItemString(d, "has160"); Py_INCREF(has160_pyobj); INSERT("GCMAC", gcmac_pytype); INSERT("GMAC", gmac_pytype); INSERT("GMACHash", gmhash_pytype); - INSERT("gcmacs", gcmacs()); + INSERT("gcmacs", make_algtab(gmactab, sizeof(gcmac *), + mac_namefn, mac_valfn)); INSERT("Poly1305Class", poly1305cls_pytype); INSERT("poly1305", poly1305key_pytype); INSERT("Poly1305Hash", poly1305hash_pytype); @@ -3669,7 +3662,9 @@ void algorithms_pyinsert(PyObject *mod) INSERT("Shake256", shake256_pytype); INSERT("GCPRP", gcprp_pytype); INSERT("GPRP", gprp_pytype); - INSERT("gcprps", gcprps()); + INSERT("gcprps", make_algtab(gprptab, sizeof(gcprp *), + prp_namefn, prp_valfn)); + setconstants(mod, consts); } /*----- That's all, folks -------------------------------------------------*/