X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/71574cbaff3942fd35ceb2754cbfc36449856644..5d8da10545210a437cef3ba0348d125805349699:/algorithms.c diff --git a/algorithms.c b/algorithms.c index 57a41d7..48bd480 100644 --- a/algorithms.c +++ b/algorithms.c @@ -1194,7 +1194,7 @@ DOUINTCONV(GAEAMETH_HASHU_) { \ struct bin in; octet b[SZ_##W]; \ if (!PyArg_ParseTuple(arg, "O&:hashbuf" #w, convbin, &in)) goto end; \ - if (in.sz > MASK##n) TYERR("string too long"); \ + if (in.sz > MASK##n) VALERR("too large"); \ STORE##W(b, in.sz); if (gaeadaad_hash(me, b, sizeof(b))) goto end; \ if (gaeadaad_hash(me, in.p, in.sz)) goto end; \ RETURN_ME; \ @@ -2044,7 +2044,7 @@ DOUINTCONV(GHMETH_HASHU_) { \ struct bin in; \ if (!PyArg_ParseTuple(arg, "O&:hashbuf" #w, convbin, &in)) goto end; \ - if (in.sz > MASK##n) TYERR("string too long"); \ + if (in.sz > MASK##n) VALERR("too large"); \ GH_HASHBUF##W(GHASH_H(me), in.p, in.sz); \ RETURN_ME; \ end: \ @@ -2588,7 +2588,7 @@ DOUINTCONV(POLYMETH_HASHU_) struct bin in; \ octet b[SZ_##W]; \ if (!PyArg_ParseTuple(arg, "O&:hashbuf" #w, convbin, &in)) goto end; \ - if (in.sz > MASK##n) TYERR("string too long"); \ + if (in.sz > MASK##n) VALERR("too large"); \ STORE##W(b, in.sz); poly1305_hash(P1305_CTX(me), b, sizeof(b)); \ poly1305_hash(P1305_CTX(me), in.p, in.sz); \ RETURN_ME; \ @@ -2683,7 +2683,7 @@ static const PyMethodDef poly1305hash_pymethods[] = { static const PyTypeObject poly1305cls_pytype_skel = { PyVarObject_HEAD_INIT(0, 0) /* Header */ - "Poly1305Class", /* @tp_name@ */ + "_Poly1305Class", /* @tp_name@ */ sizeof(PyHeapTypeObject), /* @tp_basicsize@ */ 0, /* @tp_itemsize@ */ @@ -3081,7 +3081,7 @@ DOUINTCONV(SHAKEMETH_HASHU_) struct bin in; \ octet b[SZ_##W]; \ if (!PyArg_ParseTuple(arg, "O&:hashbuf" #w, convbin, &in)) goto end; \ - if (in.sz > MASK##n) TYERR("string too long"); \ + if (in.sz > MASK##n) VALERR("too large"); \ if (shake_check(me, 0)) goto end; \ STORE##W(b, in.sz); shake_hash(SHAKE_H(me), b, sizeof(b)); \ shake_hash(SHAKE_H(me), in.p, in.sz); \ @@ -3347,6 +3347,215 @@ static const PyTypeObject shake256_pytype_skel = { 0 /* @tp_is_gc@ */ }; +static PyTypeObject *kmac_pytype, *kmac128_pytype, *kmac256_pytype; + +static PyObject *kmac_dopynew(void (*initfn)(shake_ctx *, + const void *, size_t, + const void *, size_t), + PyTypeObject *ty, + PyObject *arg, PyObject *kw) +{ + shake_pyobj *rc = 0; + PyObject *pobj = Py_None; + struct bin k = { 0, 0 }, p = { 0, 0 }; + static const char *const kwlist[] = { "key", "perso", 0 }; + + if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O:new", KWLIST, + convbin, &k, &pobj)) + goto end; + if (pobj != Py_None && !convbin(pobj, &p)) goto end; + rc = (shake_pyobj *)ty->tp_alloc(ty, 0); + initfn(&rc->h, p.p, p.sz, k.p, k.sz); + rc->st = 0; +end: + return ((PyObject *)rc); +} + +static PyObject *kmac128_pynew(PyTypeObject *ty, + PyObject *arg, PyObject *kw) + { return (kmac_dopynew(kmac128_init, ty, arg, kw)); } + +static PyObject *kmac256_pynew(PyTypeObject *ty, + PyObject *arg, PyObject *kw) + { return (kmac_dopynew(kmac256_init, ty, arg, kw)); } + +static PyObject *kmacmeth_xof(PyObject *me) +{ + if (shake_check(me, 0)) goto end; + kmac_xof(SHAKE_H(me)); + SHAKE_ST(me) = 1; + RETURN_ME; +end: + return (0); +} + +static PyObject *kmacmeth_done(PyObject *me, PyObject *arg, PyObject *kw) +{ + PyObject *rc = 0; + size_t n = 100 - SHAKE_H(me)->h.r/2; + static const char *const kwlist[] = { "hsz", 0 }; + if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:done", KWLIST, convszt, &n)) + goto end; + if (shake_check(me, 0)) goto end; + rc = bytestring_pywrap(0, n); + kmac_done(SHAKE_H(me), BIN_PTR(rc), n); + SHAKE_ST(me) = -1; +end: + return (rc); +} + +static const PyMethodDef kmac_pymethods[] = { +#define METHNAME(func) kmacmeth_##func + NAMETH(xof, "K.xof()") + KWMETH(done, "K.done([hsz = CAP/2]) -> T") +#undef METHNAME + { 0 } +}; + +static const PyTypeObject kmac_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ + "KMAC", /* @tp_name@ */ + sizeof(shake_pyobj), /* @tp_basicsize@ */ + 0, /* @tp_itemsize@ */ + + 0, /* @tp_dealloc@ */ + 0, /* @tp_print@ */ + 0, /* @tp_getattr@ */ + 0, /* @tp_setattr@ */ + 0, /* @tp_compare@ */ + 0, /* @tp_repr@ */ + 0, /* @tp_as_number@ */ + 0, /* @tp_as_sequence@ */ + 0, /* @tp_as_mapping@ */ + 0, /* @tp_hash@ */ + 0, /* @tp_call@ */ + 0, /* @tp_str@ */ + 0, /* @tp_getattro@ */ + 0, /* @tp_setattro@ */ + 0, /* @tp_as_buffer@ */ + Py_TPFLAGS_DEFAULT | /* @tp_flags@ */ + Py_TPFLAGS_BASETYPE, + + /* @tp_doc@ */ + "KMAC base class.", + + 0, /* @tp_traverse@ */ + 0, /* @tp_clear@ */ + 0, /* @tp_richcompare@ */ + 0, /* @tp_weaklistoffset@ */ + 0, /* @tp_iter@ */ + 0, /* @tp_iternext@ */ + PYMETHODS(kmac), /* @tp_methods@ */ + 0, /* @tp_members@ */ + 0, /* @tp_getset@ */ + 0, /* @tp_base@ */ + 0, /* @tp_dict@ */ + 0, /* @tp_descr_get@ */ + 0, /* @tp_descr_set@ */ + 0, /* @tp_dictoffset@ */ + 0, /* @tp_init@ */ + PyType_GenericAlloc, /* @tp_alloc@ */ + abstract_pynew, /* @tp_new@ */ + 0, /* @tp_free@ */ + 0 /* @tp_is_gc@ */ +}; + +static const PyTypeObject kmac128_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ + "KMAC128", /* @tp_name@ */ + 0, /* @tp_basicsize@ */ + 0, /* @tp_itemsize@ */ + + 0, /* @tp_dealloc@ */ + 0, /* @tp_print@ */ + 0, /* @tp_getattr@ */ + 0, /* @tp_setattr@ */ + 0, /* @tp_compare@ */ + 0, /* @tp_repr@ */ + 0, /* @tp_as_number@ */ + 0, /* @tp_as_sequence@ */ + 0, /* @tp_as_mapping@ */ + 0, /* @tp_hash@ */ + 0, /* @tp_call@ */ + 0, /* @tp_str@ */ + 0, /* @tp_getattro@ */ + 0, /* @tp_setattro@ */ + 0, /* @tp_as_buffer@ */ + Py_TPFLAGS_DEFAULT | /* @tp_flags@ */ + Py_TPFLAGS_BASETYPE, + + /* @tp_doc@ */ + "KMAC128(KEY, [perso = STR]): KMAC XOMAC.", + + 0, /* @tp_traverse@ */ + 0, /* @tp_clear@ */ + 0, /* @tp_richcompare@ */ + 0, /* @tp_weaklistoffset@ */ + 0, /* @tp_iter@ */ + 0, /* @tp_iternext@ */ + 0, /* @tp_methods@ */ + 0, /* @tp_members@ */ + 0, /* @tp_getset@ */ + 0, /* @tp_base@ */ + 0, /* @tp_dict@ */ + 0, /* @tp_descr_get@ */ + 0, /* @tp_descr_set@ */ + 0, /* @tp_dictoffset@ */ + 0, /* @tp_init@ */ + PyType_GenericAlloc, /* @tp_alloc@ */ + kmac128_pynew, /* @tp_new@ */ + 0, /* @tp_free@ */ + 0 /* @tp_is_gc@ */ +}; + +static const PyTypeObject kmac256_pytype_skel = { + PyVarObject_HEAD_INIT(0, 0) /* Header */ + "KMAC256", /* @tp_name@ */ + 0, /* @tp_basicsize@ */ + 0, /* @tp_itemsize@ */ + + 0, /* @tp_dealloc@ */ + 0, /* @tp_print@ */ + 0, /* @tp_getattr@ */ + 0, /* @tp_setattr@ */ + 0, /* @tp_compare@ */ + 0, /* @tp_repr@ */ + 0, /* @tp_as_number@ */ + 0, /* @tp_as_sequence@ */ + 0, /* @tp_as_mapping@ */ + 0, /* @tp_hash@ */ + 0, /* @tp_call@ */ + 0, /* @tp_str@ */ + 0, /* @tp_getattro@ */ + 0, /* @tp_setattro@ */ + 0, /* @tp_as_buffer@ */ + Py_TPFLAGS_DEFAULT | /* @tp_flags@ */ + Py_TPFLAGS_BASETYPE, + + /* @tp_doc@ */ + "KMAC256(KEY, [perso = STR]): KMAC XOMAC.", + + 0, /* @tp_traverse@ */ + 0, /* @tp_clear@ */ + 0, /* @tp_richcompare@ */ + 0, /* @tp_weaklistoffset@ */ + 0, /* @tp_iter@ */ + 0, /* @tp_iternext@ */ + 0, /* @tp_methods@ */ + 0, /* @tp_members@ */ + 0, /* @tp_getset@ */ + 0, /* @tp_base@ */ + 0, /* @tp_dict@ */ + 0, /* @tp_descr_get@ */ + 0, /* @tp_descr_set@ */ + 0, /* @tp_dictoffset@ */ + 0, /* @tp_init@ */ + PyType_GenericAlloc, /* @tp_alloc@ */ + kmac256_pynew, /* @tp_new@ */ + 0, /* @tp_free@ */ + 0 /* @tp_is_gc@ */ +}; + /*----- Pseudorandom permutations -----------------------------------------*/ static PyTypeObject *gcprp_pytype, *gprp_pytype; @@ -3417,8 +3626,7 @@ static PyObject *gprp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw) me = (PyObject *)ty->tp_alloc(ty, 0); GPRP_PRP(me) = prp; prp->init(GPRP_CTX(me), k.p, k.sz); - Py_INCREF(me); - return (me); + RETURN_ME; end: return (0); } @@ -3640,6 +3848,9 @@ void algorithms_pyinit(void) INITTYPE(shake, root); INITTYPE(shake128, shake); INITTYPE(shake256, shake); + INITTYPE(kmac, shake); + INITTYPE(kmac128, kmac); + INITTYPE(kmac256, kmac); INITTYPE(gcprp, type); INITTYPE(gprp, root); addmethods(methods); @@ -3686,13 +3897,16 @@ void algorithms_pyinsert(PyObject *mod) INSERT("GMACHash", gmhash_pytype); INSERT("gcmacs", make_algtab(gmactab, sizeof(gcmac *), mac_namefn, mac_valfn)); - INSERT("Poly1305Class", poly1305cls_pytype); + INSERT("_Poly1305Class", poly1305cls_pytype); INSERT("poly1305", poly1305key_pytype); INSERT("Poly1305Hash", poly1305hash_pytype); INSERT("Keccak1600", kxvik_pytype); INSERT("Shake", shake_pytype); INSERT("Shake128", shake128_pytype); INSERT("Shake256", shake256_pytype); + INSERT("KMAC", kmac_pytype); + INSERT("KMAC128", kmac128_pytype); + INSERT("KMAC256", kmac256_pytype); INSERT("GCPRP", gcprp_pytype); INSERT("GPRP", gprp_pytype); INSERT("gcprps", make_algtab(gprptab, sizeof(gcprp *),