};
static const PyTypeObject keysz_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeySZ", /* @tp_name@ */
sizeof(keysz_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject keyszany_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeySZAny", /* @tp_name@ */
sizeof(keysz_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject keyszrange_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeySZRange", /* @tp_name@ */
sizeof(keyszrange_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject keyszset_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"KeySZSet", /* @tp_name@ */
sizeof(keyszset_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
static PyObject *gcipher_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
static const char *const kwlist[] = { "k", 0 };
- char *k;
- Py_ssize_t sz;
+ struct bin k;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convbin, &k))
goto end;
- if (keysz(sz, GCCIPHER_CC(ty)->keysz) != sz) VALERR("bad key length");
+ if (keysz(k.sz, GCCIPHER_CC(ty)->keysz) != k.sz) VALERR("bad key length");
return (gcipher_pywrap((PyObject *)ty,
- GC_INIT(GCCIPHER_CC(ty), k, sz)));
+ GC_INIT(GCCIPHER_CC(ty), k.p, k.sz)));
end:
return (0);
}
static void gcipher_pydealloc(PyObject *me)
{
GC_DESTROY(GCIPHER_C(me));
- Py_DECREF(me->ob_type);
+ Py_DECREF(Py_TYPE(me));
FREEOBJ(me);
}
static PyObject *gccget_name(PyObject *me, void *hunoz)
- { return (PyString_FromString(GCCIPHER_CC(me)->name)); }
+ { return (TEXT_FROMSTR(GCCIPHER_CC(me)->name)); }
static PyObject *gccget_keysz(PyObject *me, void *hunoz)
{ return (keysz_pywrap(GCCIPHER_CC(me)->keysz)); }
static PyObject *gcmeth_encrypt(PyObject *me, PyObject *arg)
{
- char *p;
- Py_ssize_t sz;
+ struct bin m;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#:encrypt", &p, &sz)) return (0);
- rc = bytestring_pywrap(0, sz);
- GC_ENCRYPT(GCIPHER_C(me), p, PyString_AS_STRING(rc), sz);
+ if (!PyArg_ParseTuple(arg, "O&:encrypt", convbin, &m)) return (0);
+ rc = bytestring_pywrap(0, m.sz);
+ GC_ENCRYPT(GCIPHER_C(me), m.p, BIN_PTR(rc), m.sz);
return (rc);
}
if (!PyArg_ParseTuple(arg, "i:enczero", &sz)) return (0);
rc = bytestring_pywrap(0, sz);
- p = PyString_AS_STRING(rc);
+ p = BIN_PTR(rc);
memset(p, 0, sz);
GC_ENCRYPT(GCIPHER_C(me), p, p, sz);
return (rc);
static PyObject *gcmeth_decrypt(PyObject *me, PyObject *arg)
{
- char *p;
- Py_ssize_t sz;
+ struct bin c;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#:decrypt", &p, &sz)) return (0);
- rc = bytestring_pywrap(0, sz);
- GC_DECRYPT(GCIPHER_C(me), p, PyString_AS_STRING(rc), sz);
+ if (!PyArg_ParseTuple(arg, "O&:decrypt", convbin, &c)) return (0);
+ rc = bytestring_pywrap(0, c.sz);
+ GC_DECRYPT(GCIPHER_C(me), c.p, BIN_PTR(rc), c.sz);
return (rc);
}
if (!PyArg_ParseTuple(arg, "i:deczero", &sz)) return (0);
rc = bytestring_pywrap(0, sz);
- p = PyString_AS_STRING(rc);
+ p = BIN_PTR(rc);
memset(p, 0, sz);
GC_DECRYPT(GCIPHER_C(me), p, p, sz);
return (rc);
static PyObject *gcmeth_setiv(PyObject *me, PyObject *arg)
{
- char *p;
- Py_ssize_t sz;
+ struct bin iv;
- if (!PyArg_ParseTuple(arg, "s#:setiv", &p, &sz)) goto end;
+ if (!PyArg_ParseTuple(arg, "O&:setiv", convbin, &iv)) goto end;
if (!GCIPHER_C(me)->ops->setiv) VALERR("`setiv' not supported");
if (!GC_CLASS(GCIPHER_C(me))->blksz) VALERR("not a block cipher mode");
- if (sz != GC_CLASS(GCIPHER_C(me))->blksz) VALERR("bad IV length");
- GC_SETIV(GCIPHER_C(me), p);
+ if (iv.sz != GC_CLASS(GCIPHER_C(me))->blksz) VALERR("bad IV length");
+ GC_SETIV(GCIPHER_C(me), iv.p);
RETURN_ME;
end:
return (0);
};
static const PyTypeObject gccipher_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GCCipher", /* @tp_name@ */
sizeof(gccipher_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gcipher_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GCipher", /* @tp_name@ */
sizeof(gcipher_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
PyObject *arg, PyObject *kw)
{
static const char *const kwlist[] = { "k", 0 };
- char *k;
- Py_ssize_t sz;
+ struct bin k;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convbin, &k))
goto end;
- if (keysz(sz, GCAEAD_AEC(ty)->keysz) != sz) VALERR("bad key length");
+ if (keysz(k.sz, GCAEAD_AEC(ty)->keysz) != k.sz) VALERR("bad key length");
return (gaeadkey_pywrap((PyObject *)ty,
- GAEAD_KEY(GCAEAD_AEC(ty), k, sz)));
+ GAEAD_KEY(GCAEAD_AEC(ty), k.p, k.sz)));
end:
return (0);
}
#define MKTYPE(obj, thing, newfn, namefmt) do { \
(obj) = newtype(gcaead_pytype, 0, 0); \
- (obj)->ty.ht_name = PyString_FromFormat(namefmt, aec->name); \
- (obj)->ty.ht_type.tp_name = PyString_AS_STRING((obj)->ty.ht_name); \
+ (obj)->ty.ht_name = TEXT_FORMAT(namefmt, aec->name); \
+ (obj)->ty.ht_type.tp_name = TEXT_PTR((obj)->ty.ht_name); \
(obj)->ty.ht_type.tp_basicsize = sizeof(gaead##thing##_pyobj); \
(obj)->ty.ht_type.tp_base = gaead##thing##_pytype; \
Py_INCREF(gaead##thing##_pytype); \
}
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)); }
+ { return (TEXT_FROMSTR(GCAEAD_AEC(me)->name)); }
static PyObject *gcaeget_keysz(PyObject *me, void *hunoz)
{ return (keysz_pywrap(GCAEAD_AEC(me)->keysz)); }
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);
const gaead_key *k = GAEADKEY_K(me);
gaead_enc *e;
PyObject *rc = 0;
- char *n; Py_ssize_t nsz;
+ struct bin n;
PyObject *hszobj = Py_None, *mszobj = Py_None, *tszobj = Py_None;
size_t hsz = 0, msz = 0, tsz = 0;
unsigned f;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|OOO:enc", KWLIST,
- &n, &nsz, &hszobj, &mszobj, &tszobj))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|OOO:enc", KWLIST,
+ convbin, &n, &hszobj, &mszobj, &tszobj))
goto end;
- if (check_aead_encdec(k->ops->c, &f, nsz,
+ if (check_aead_encdec(k->ops->c, &f, n.sz,
hszobj, &hsz, mszobj, &msz, tszobj, &tsz))
goto end;
- e = GAEAD_ENC(GAEADKEY_K(me), n, nsz, hsz, msz, tsz);
+ e = GAEAD_ENC(GAEADKEY_K(me), n.p, n.sz, 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);
const gaead_key *k = GAEADKEY_K(me);
gaead_dec *d;
PyObject *rc = 0;
- char *n; Py_ssize_t nsz;
+ struct bin n;
PyObject *hszobj = Py_None, *cszobj = Py_None, *tszobj = Py_None;
size_t hsz = 0, csz = 0, tsz = 0;
unsigned f;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|OOO:dec", KWLIST,
- &n, &nsz, &hszobj, &cszobj, &tszobj))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|OOO:dec", KWLIST,
+ convbin, &n, &hszobj, &cszobj, &tszobj))
goto end;
- if (check_aead_encdec(k->ops->c, &f, nsz,
+ if (check_aead_encdec(k->ops->c, &f, n.sz,
hszobj, &hsz, cszobj, &csz, tszobj, &tsz))
goto end;
- d = GAEAD_DEC(GAEADKEY_K(me), n, nsz, hsz, csz, tsz);
+ d = GAEAD_DEC(GAEADKEY_K(me), n.p, n.sz, 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);
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)
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:
return (rc);
}
-
static PyObject *gaeameth_hash(PyObject *me, PyObject *arg)
{
- char *h; Py_ssize_t hsz;
+ struct bin h;
- if (!PyArg_ParseTuple(arg, "s#:hash", &h, &hsz)) return (0);
- if (gaeadaad_hash(me, h, hsz)) return (0);
+ if (!PyArg_ParseTuple(arg, "O&:hash", convbin, &h)) return (0);
+ if (gaeadaad_hash(me, h.p, h.sz)) return (0);
RETURN_ME;
}
#define GAEAMETH_HASHBUF_(n, W, w) \
static PyObject *gaeameth_hashbuf##w(PyObject *me, PyObject *arg) \
{ \
- char *p; Py_ssize_t sz; octet b[SZ_##W]; \
- if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end; \
- if (sz > MASK##n) TYERR("string too long"); \
- STORE##W(b, sz); if (gaeadaad_hash(me, b, sizeof(b))) goto end; \
- if (gaeadaad_hash(me, p, sz)) goto end; \
+ 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"); \
+ 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; \
end: \
return (0); \
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)
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);
{
static const char *const kwlist[] = { "nonce", "hsz", "msz", "tsz", 0 };
gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me;
- char *n; Py_ssize_t nsz;
+ struct bin n;
PyObject *hszobj = Py_None, *mszobj = Py_None, *tszobj = Py_None;
size_t hsz = 0, msz = 0, tsz = 0;
unsigned f;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|OOO:enc", KWLIST,
- &n, &nsz, &hszobj, &mszobj, &tszobj))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|OOO:enc", KWLIST,
+ convbin, &n, &hszobj, &mszobj, &tszobj))
goto end;
- if (check_aead_encdec(ge->e->ops->c, &f, nsz,
+ if (check_aead_encdec(ge->e->ops->c, &f, n.sz,
hszobj, &hsz, mszobj, &msz, tszobj, &tsz))
goto end;
- if (GAEAD_REINIT(ge->e, n, nsz, hsz, msz, tsz))
+ if (GAEAD_REINIT(ge->e, n.p, n.sz, hsz, msz, tsz))
VALERR("bad aead parameter combination");
gaea_sever(&ge->aad);
ge->f = f; ge->hsz = hsz; ge->msz = msz; ge->tsz = tsz;
static PyObject *gaeemeth_encrypt(PyObject *me, PyObject *arg)
{
gaeadenc_pyobj *ge = (gaeadenc_pyobj *)me;
- char *m; Py_ssize_t msz;
+ struct bin m;
char *c = 0; size_t csz; buf b;
int err;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#:encrypt", &m, &msz)) goto end;
+ if (!PyArg_ParseTuple(arg, "O&:encrypt", convbin, &m)) goto end;
if (ge->f&AEADF_AADFIRST) {
if ((ge->f&AEADF_PCHSZ) && (ge->aad ? ge->aad->hlen : 0) != ge->hsz)
VALERR("header doesn't match precommitted length");
gaea_invalidate(ge->aad);
}
- if ((ge->f&AEADF_PCMSZ) && msz > ge->msz - ge->mlen)
+ if ((ge->f&AEADF_PCMSZ) && m.sz > ge->msz - ge->mlen)
VALERR("too large for precommitted message length");
- csz = msz + ge->e->ops->c->bufsz; c = xmalloc(csz); buf_init(&b, c, csz);
- err = GAEAD_ENCRYPT(ge->e, m, msz, &b); assert(!err); (void)err;
- buf_flip(&b); rc = bytestring_pywrapbuf(&b); ge->mlen += msz;
+ csz = m.sz + ge->e->ops->c->bufsz; c = xmalloc(csz); buf_init(&b, c, csz);
+ err = GAEAD_ENCRYPT(ge->e, m.p, m.sz, &b); assert(!err); (void)err;
+ buf_flip(&b); rc = bytestring_pywrapbuf(&b); ge->mlen += m.sz;
end:
xfree(c);
return (rc);
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");
csz = ge->e->ops->c->bufsz; c = xmalloc(csz); buf_init(&b, c, csz);
tag = bytestring_pywrap(0, tsz);
err = GAEAD_DONE(ge->e, aad == Py_None ? 0 : GAEADAAD_A(aad), &b,
- PyString_AS_STRING(tag), tsz);
+ BIN_PTR(tag), tsz);
assert(!err); (void)err;
buf_flip(&b); rc = Py_BuildValue("NN", bytestring_pywrapbuf(&b), tag);
end:
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)
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);
{
static const char *const kwlist[] = { "nonce", "hsz", "csz", "tsz", 0 };
gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me;
- char *n; Py_ssize_t nsz;
+ struct bin n;
PyObject *hszobj = Py_None, *cszobj = Py_None, *tszobj = Py_None;
size_t hsz = 0, csz = 0, tsz = 0;
unsigned f;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|OOO:enc", KWLIST,
- &n, &nsz, &hszobj, &cszobj, &tszobj))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|OOO:enc", KWLIST,
+ convbin, &n, &hszobj, &cszobj, &tszobj))
goto end;
- if (check_aead_encdec(gd->d->ops->c, &f, nsz,
+ if (check_aead_encdec(gd->d->ops->c, &f, n.sz,
hszobj, &hsz, cszobj, &csz, tszobj, &tsz))
goto end;
- if (GAEAD_REINIT(gd->d, n, nsz, hsz, csz, tsz))
+ if (GAEAD_REINIT(gd->d, n.p, n.sz, hsz, csz, tsz))
VALERR("bad aead parameter combination");
gaea_sever(&gd->aad);
gd->f = f; gd->hsz = hsz; gd->csz = csz; gd->tsz = tsz;
static PyObject *gaedmeth_decrypt(PyObject *me, PyObject *arg)
{
gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me;
- char *c; Py_ssize_t csz;
+ struct bin c;
char *m = 0; size_t msz; buf b;
int err;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#:decrypt", &c, &csz)) goto end;
+ if (!PyArg_ParseTuple(arg, "O&:decrypt", convbin, &c)) goto end;
if (gd->f&AEADF_AADFIRST) {
if ((gd->f&AEADF_PCHSZ) && (gd->aad ? gd->aad->hlen : 0) != gd->hsz)
VALERR("header doesn't match precommitted length");
gaea_invalidate(gd->aad);
}
- if ((gd->f&AEADF_PCMSZ) && csz > gd->csz - gd->clen)
+ if ((gd->f&AEADF_PCMSZ) && c.sz > gd->csz - gd->clen)
VALERR("too large for precommitted message length");
- msz = csz + gd->d->ops->c->bufsz; m = xmalloc(msz); buf_init(&b, m, msz);
- err = GAEAD_DECRYPT(gd->d, c, csz, &b); assert(!err); (void)err;
- buf_flip(&b); rc = bytestring_pywrapbuf(&b); gd->clen += csz;
+ msz = c.sz + gd->d->ops->c->bufsz; m = xmalloc(msz); buf_init(&b, m, msz);
+ err = GAEAD_DECRYPT(gd->d, c.p, c.sz, &b); assert(!err); (void)err;
+ buf_flip(&b); rc = bytestring_pywrapbuf(&b); gd->clen += c.sz;
end:
xfree(m);
return (rc);
static const char *const kwlist[] = { "tag", "aad", 0 };
gaeaddec_pyobj *gd = (gaeaddec_pyobj *)me;
PyObject *aad = Py_None;
- char *t; Py_ssize_t tsz;
+ struct bin t;
char *m = 0; size_t msz; buf b;
int err;
PyObject *rc = 0;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#|O:done", KWLIST,
- &t, &tsz, &aad))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O:done", KWLIST,
+ convbin, &t, &aad))
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");
VALERR("header doesn't match precommitted length");
if ((gd->f&AEADF_PCMSZ) && gd->clen != gd->csz)
VALERR("message doesn't match precommitted length");
- if ((gd->f&AEADF_PCTSZ) && tsz != gd->tsz)
+ if ((gd->f&AEADF_PCTSZ) && t.sz != gd->tsz)
VALERR("tag length doesn't match precommitted value");
- if (keysz(tsz, gd->d->ops->c->tagsz) != tsz) VALERR("bad tag length");
+ if (keysz(t.sz, gd->d->ops->c->tagsz) != t.sz) VALERR("bad tag length");
msz = gd->d->ops->c->bufsz; m = xmalloc(msz); buf_init(&b, m, msz);
- err = GAEAD_DONE(gd->d, aad == Py_None ? 0 : GAEADAAD_A(aad), &b, t, tsz);
+ err = GAEAD_DONE(gd->d, aad == Py_None ? 0 : GAEADAAD_A(aad),
+ &b, t.p, t.sz);
assert(err >= 0);
if (!err) VALERR("decryption failed");
buf_flip(&b); rc = bytestring_pywrapbuf(&b);
};
static const PyTypeObject gcaead_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GCAEAD", /* @tp_name@ */
sizeof(gcaead_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gaeadkey_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GAEKey", /* @tp_name@ */
sizeof(gaeadkey_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gcaeadaad_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GAEAADClass", /* @tp_name@ */
sizeof(gcaeadaad_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gaeadaad_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GAEAAD", /* @tp_name@ */
sizeof(gaeadaad_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gcaeadenc_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GAEEncClass", /* @tp_name@ */
sizeof(gcaeadenc_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gaeadenc_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GAEEnc", /* @tp_name@ */
sizeof(gaeadenc_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gcaeaddec_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GAEDecClass", /* @tp_name@ */
sizeof(gcaeaddec_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gaeaddec_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GAEDec", /* @tp_name@ */
sizeof(gaeaddec_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
static void ghash_pydealloc(PyObject *me)
{
GH_DESTROY(GHASH_H(me));
- Py_DECREF(me->ob_type);
+ Py_DECREF(Py_TYPE(me));
FREEOBJ(me);
}
static PyObject *gchget_name(PyObject *me, void *hunoz)
- { return (PyString_FromString(GCHASH_CH(me)->name)); }
+ { return (TEXT_FROMSTR(GCHASH_CH(me)->name)); }
static PyObject *gchget_hashsz(PyObject *me, void *hunoz)
{ return (PyInt_FromLong(GCHASH_CH(me)->hashsz)); }
{ 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)
{
- char *p;
- Py_ssize_t sz;
- if (!PyArg_ParseTuple(arg, "s#:hash", &p, &sz)) return (0);
- GH_HASH(GHASH_H(me), p, sz);
+ struct bin m;
+ if (!PyArg_ParseTuple(arg, "O&:hash", convbin, &m)) return (0);
+ GH_HASH(GHASH_H(me), m.p, m.sz);
RETURN_ME;
}
#define GHMETH_HASHBUF_(n, W, w) \
static PyObject *ghmeth_hashbuf##w(PyObject *me, PyObject *arg) \
{ \
- char *p; \
- Py_ssize_t sz; \
- if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end; \
- if (sz > MASK##n) TYERR("string too long"); \
- GH_HASHBUF##W(GHASH_H(me), p, sz); \
+ struct bin in; \
+ if (!PyArg_ParseTuple(arg, "O&:hashbuf" #w, convbin, &in)) goto end; \
+ if (in.sz > MASK##n) TYERR("string too long"); \
+ GH_HASHBUF##W(GHASH_H(me), in.p, in.sz); \
RETURN_ME; \
end: \
return (0); \
PyObject *rc;
g = GH_COPY(GHASH_H(me));
rc = bytestring_pywrap(0, g->ops->c->hashsz);
- GH_DONE(g, PyString_AS_STRING(rc));
+ GH_DONE(g, BIN_PTR(rc));
GH_DESTROY(g);
return (rc);
}
};
static const PyTypeObject gchash_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GCHash", /* @tp_name@ */
sizeof(gchash_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject ghash_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GHash", /* @tp_name@ */
sizeof(ghash_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
static PyObject *gmac_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
static const char *const kwlist[] = { "k", 0 };
- char *k;
- Py_ssize_t sz;
+ struct bin k;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convbin, &k))
goto end;
- if (keysz(sz, GCMAC_CM(ty)->keysz) != sz) VALERR("bad key length");
+ if (keysz(k.sz, GCMAC_CM(ty)->keysz) != k.sz) VALERR("bad key length");
return (gmac_pywrap((PyObject *)ty,
- GM_KEY(GCMAC_CM(ty), k, sz)));
+ GM_KEY(GCMAC_CM(ty), k.p, k.sz)));
end:
return (0);
}
else Py_INCREF(cobj);
g = newtype((PyTypeObject *)cobj, 0, 0);
g->ty.ht_type.tp_basicsize = sizeof(ghash_pyobj);
- g->ty.ht_name = PyString_FromFormat("%s(keyed)", m->ops->c->name);
- g->ty.ht_type.tp_name = PyString_AS_STRING(g->ty.ht_name);
+ g->ty.ht_name = TEXT_FORMAT("%s(keyed)", m->ops->c->name);
+ g->ty.ht_type.tp_name = TEXT_PTR(g->ty.ht_name);
g->ty.ht_type.tp_base = gmhash_pytype;
Py_INCREF(gmac_pytype);
g->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
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);
}
static PyObject *gcmget_name(PyObject *me, void *hunoz)
- { return (PyString_FromString(GCMAC_CM(me)->name)); }
+ { return (TEXT_FROMSTR(GCMAC_CM(me)->name)); }
static PyObject *gcmget_keysz(PyObject *me, void *hunoz)
{ return (keysz_pywrap(GCMAC_CM(me)->keysz)); }
};
static const PyTypeObject gcmac_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GCMAC", /* @tp_name@ */
sizeof(gchash_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gmac_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GMAC", /* @tp_name@ */
sizeof(gmac_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gmhash_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GMACHash", /* @tp_name@ */
sizeof(ghash_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
static const char *const kwlist[] = { "mask", 0 };
poly1305key_pyobj *pk = (poly1305key_pyobj *)ty;
poly1305hash_pyobj *ph;
- char *m = 0;
- Py_ssize_t sz;
+ struct bin m = { 0, 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "|s#:new", KWLIST, &m, &sz))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:new", KWLIST, convbin, &m))
return (0);
- if (m && sz != POLY1305_MASKSZ) VALERR("bad mask length");
+ if (m.p && m.sz != POLY1305_MASKSZ) VALERR("bad mask length");
ph = PyObject_NEW(poly1305hash_pyobj, ty);
ph->f = 0;
- if (m) ph->f |= f_mask;
- poly1305_macinit(&ph->ctx, &pk->k, m);
+ if (m.p) ph->f |= f_mask;
+ poly1305_macinit(&ph->ctx, &pk->k, m.p);
Py_INCREF(ty);
return ((PyObject *)ph);
end:
{
static const char *const kwlist[] = { "k", 0 };
poly1305key_pyobj *pk;
- char *k;
- Py_ssize_t sz;
+ struct bin k;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convbin, &k))
goto end;
- if (keysz(sz, poly1305_keysz) != sz) VALERR("bad key length");
+ if (keysz(k.sz, poly1305_keysz) != k.sz) VALERR("bad key length");
pk = newtype(ty, 0, 0);
- pk->ty.ht_name = PyString_FromString("poly1305(keyed)");
+ pk->ty.ht_name = TEXT_FROMSTR("poly1305(keyed)");
pk->ty.ht_type.tp_basicsize = sizeof(poly1305hash_pyobj);
- pk->ty.ht_type.tp_name = PyString_AS_STRING(pk->ty.ht_name);
+ pk->ty.ht_type.tp_name = TEXT_PTR(pk->ty.ht_name);
pk->ty.ht_type.tp_base = poly1305hash_pytype;
Py_INCREF(poly1305key_pytype);
pk->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
pk->ty.ht_type.tp_new = poly1305hash_pynew;
typeready(&pk->ty.ht_type);
- poly1305_keyinit(&pk->k, k, sz);
+ poly1305_keyinit(&pk->k, k.p, k.sz);
return ((PyObject *)pk);
end:
}
static PyObject *poly1305clsget_name(PyObject *me, void *hunoz)
- { return (PyString_FromString("poly1305")); }
+ { return (TEXT_FROMSTR("poly1305")); }
static PyObject *poly1305clsget_keysz(PyObject *me, void *hunoz)
{ return (keysz_pywrap(poly1305_keysz)); }
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);
}
static PyObject *polymeth_hash(PyObject *me, PyObject *arg)
{
- char *p;
- Py_ssize_t sz;
- if (!PyArg_ParseTuple(arg, "s#:hash", &p, &sz)) return (0);
- poly1305_hash(P1305_CTX(me), p, sz);
+ struct bin m;
+ if (!PyArg_ParseTuple(arg, "O&:hash", convbin, &m)) return (0);
+ poly1305_hash(P1305_CTX(me), m.p, m.sz);
RETURN_ME;
}
#define POLYMETH_HASHBUF_(n, W, w) \
static PyObject *polymeth_hashbuf##w(PyObject *me, PyObject *arg) \
{ \
- char *p; \
- Py_ssize_t sz; \
+ struct bin in; \
octet b[SZ_##W]; \
- if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end; \
- if (sz > MASK##n) TYERR("string too long"); \
- STORE##W(b, sz); poly1305_hash(P1305_CTX(me), b, sizeof(b)); \
- poly1305_hash(P1305_CTX(me), p, sz); \
+ if (!PyArg_ParseTuple(arg, "O&:hashbuf" #w, convbin, &in)) goto end; \
+ if (in.sz > MASK##n) TYERR("string too long"); \
+ STORE##W(b, in.sz); poly1305_hash(P1305_CTX(me), b, sizeof(b)); \
+ poly1305_hash(P1305_CTX(me), in.p, in.sz); \
RETURN_ME; \
end: \
return (0); \
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));
PyObject *rc;
if (!(P1305_F(me) & f_mask)) VALERR("no mask");
rc = bytestring_pywrap(0, POLY1305_TAGSZ);
- poly1305_done(P1305_CTX(me), PyString_AS_STRING(rc));
+ poly1305_done(P1305_CTX(me), BIN_PTR(rc));
return (rc);
end:
return (0);
};
static const PyTypeObject poly1305cls_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"Poly1305Class", /* @tp_name@ */
sizeof(PyHeapTypeObject), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject poly1305key_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"poly1305", /* @tp_name@ */
sizeof(poly1305key_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject poly1305hash_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"Poly1305Hash", /* @tp_name@ */
sizeof(poly1305hash_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
static PyObject *meth_##hdance##_prf(PyObject *me, PyObject *arg) \
{ \
dance##_ctx dance; \
- char *k, *n; \
- Py_ssize_t ksz, nsz; \
+ struct bin k, n; \
PyObject *rc; \
- if (!PyArg_ParseTuple(arg, "s#s#:" #hdance "_prf", \
- &k, &ksz, &n, &nsz)) \
+ if (!PyArg_ParseTuple(arg, "O&O&:" #hdance "_prf", \
+ convbin, &k, convbin, &n)) \
goto end; \
- if (ksz != keysz(ksz, dance##_keysz)) VALERR("bad key length"); \
- if (nsz != HDANCE##_INSZ) VALERR("bad input length"); \
+ if (k.sz != keysz(k.sz, dance##_keysz)) VALERR("bad key length"); \
+ if (n.sz != HDANCE##_INSZ) VALERR("bad input length"); \
rc = bytestring_pywrap(0, HSALSA20_OUTSZ); \
- dance##_init(&dance, k, ksz, 0); \
- hdance##_prf(&dance, n, PyString_AS_STRING(rc)); \
+ dance##_init(&dance, k.p, k.sz, 0); \
+ hdance##_prf(&dance, n.p, BIN_PTR(rc)); \
return (rc); \
end: \
return (0); \
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);
}
const octet *q;
octet buf[8];
unsigned i;
- char *p; Py_ssize_t n;
+ struct bin in;
+ size_t n;
- if (!PyArg_ParseTuple(arg, "s#:mix", &p, &n)) goto end;
- if (n > 200) VALERR("out of range");
- q = (const octet *)p;
+ if (!PyArg_ParseTuple(arg, "O&:mix", convbin, &in)) goto end;
+ if (in.sz > 200) VALERR("out of range");
+ q = in.p; n = in.sz;
i = 0;
while (n > 8) { LOAD64_L_(t[i], q); i++; q += 8; n -= 8; }
if (n) {
if (!PyArg_ParseTuple(arg, "O&:extract", convuint, &n)) goto end;
if (n > 200) VALERR("out of range");
rc = bytestring_pywrap(0, n);
- q = (octet *)PyString_AS_STRING(rc);
+ q = (octet *)BIN_PTR(rc);
keccak1600_extract(&k->s, t, (n + 7)/8);
i = 0;
while (n > 8) { STORE64_L_(q, t[i]); i++; q += 8; n -= 8; }
};
static const PyTypeObject kxvik_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"Keccak1600", /* @tp_name@ */
sizeof(kxvik_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
PyObject *arg, PyObject *kw)
{
shake_pyobj *rc = 0;
- char *p = 0, *f = 0;
- Py_ssize_t psz = 0, fsz = 0;
+ struct bin p = { 0, 0 }, f = { 0, 0 };
static const char *const kwlist[] = { "perso", "func", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "|s#s#:new", KWLIST,
- &p, &psz, &f, &fsz))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&O&:new", KWLIST,
+ convbin, &p, convbin, &f))
goto end;
rc = (shake_pyobj *)ty->tp_alloc(ty, 0);
- initfn(&rc->h, f, fsz, p, psz);
+ initfn(&rc->h, f.p, f.sz, p.p, p.sz);
rc->st = 0;
end:
return ((PyObject *)rc);
static PyObject *shakemeth_hash(PyObject *me, PyObject *arg)
{
- char *p;
- Py_ssize_t sz;
- if (!PyArg_ParseTuple(arg, "s#:hash", &p, &sz)) return (0);
+ struct bin m;
+ if (!PyArg_ParseTuple(arg, "O&:hash", convbin, &m)) return (0);
if (shake_check(me, 0)) return (0);
- shake_hash(SHAKE_H(me), p, sz);
+ shake_hash(SHAKE_H(me), m.p, m.sz);
RETURN_ME;
}
#define SHAKEMETH_HASHBUF_(n, W, w) \
static PyObject *shakemeth_hashbuf##w(PyObject *me, PyObject *arg) \
{ \
- char *p; \
- Py_ssize_t sz; \
+ struct bin in; \
octet b[SZ_##W]; \
- if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end; \
- if (sz > MASK##n) TYERR("string too long"); \
+ if (!PyArg_ParseTuple(arg, "O&:hashbuf" #w, convbin, &in)) goto end; \
+ if (in.sz > MASK##n) TYERR("string too long"); \
if (shake_check(me, 0)) goto end; \
- STORE##W(b, sz); shake_hash(SHAKE_H(me), b, sizeof(b)); \
- shake_hash(SHAKE_H(me), p, sz); \
+ STORE##W(b, in.sz); shake_hash(SHAKE_H(me), b, sizeof(b)); \
+ shake_hash(SHAKE_H(me), in.p, in.sz); \
RETURN_ME; \
end: \
return (0); \
if (!PyArg_ParseTuple(arg, "O&:done", convszt, &n)) goto end;
if (shake_check(me, 0)) goto end;
rc = bytestring_pywrap(0, n);
- shake_done(SHAKE_H(me), PyString_AS_STRING(rc), n);
+ shake_done(SHAKE_H(me), BIN_PTR(rc), n);
SHAKE_ST(me) = -1;
end:
return (rc);
{
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);
if (!PyArg_ParseTuple(arg, "O&:get", convszt, &sz)) goto end;
if (shake_check(me, 1)) goto end;
rc = bytestring_pywrap(0, sz);
- shake_get(SHAKE_H(me), PyString_AS_STRING(rc), sz);
+ shake_get(SHAKE_H(me), BIN_PTR(rc), sz);
end:
return (rc);
}
static PyObject *shakemeth_mask(PyObject *me, PyObject *arg)
{
PyObject *rc = 0;
- char *p; Py_ssize_t sz;
+ struct bin in;
- if (!PyArg_ParseTuple(arg, "s#:mask", &p, &sz)) goto end;
+ if (!PyArg_ParseTuple(arg, "O&:mask", convbin, &in)) goto end;
if (shake_check(me, 1)) goto end;
- rc = bytestring_pywrap(0, sz);
- shake_mask(SHAKE_H(me), p, PyString_AS_STRING(rc), sz);
+ rc = bytestring_pywrap(0, in.sz);
+ shake_mask(SHAKE_H(me), in.p, BIN_PTR(rc), in.sz);
end:
return (rc);
}
static PyObject *shakeget_state(PyObject *me, void *hunoz)
{
int st = SHAKE_ST(me);
- return (PyString_FromString(st == 0 ? "absorb" :
- st == 1 ? "squeeze" : "dead"));
+ return (TEXT_FROMSTR(st == 0 ? "absorb" :
+ st == 1 ? "squeeze" : "dead"));
}
static const PyMemberDef shake_pymembers[] = {
};
static const PyTypeObject shake_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"Shake", /* @tp_name@ */
sizeof(shake_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject shake128_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"Shake128", /* @tp_name@ */
0, /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject shake256_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"Shake256", /* @tp_name@ */
0, /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
static PyObject *gprp_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
static const char *const kwlist[] = { "key", 0 };
- char *k;
- Py_ssize_t sz;
+ struct bin k;
const prpinfo *prp = GCPRP_PRP(ty);
PyObject *me;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", KWLIST, &k, &sz))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&:new", KWLIST, convbin, &k))
goto end;
- if (keysz(sz, prp->keysz) != sz) VALERR("bad key length");
+ if (keysz(k.sz, prp->keysz) != k.sz) VALERR("bad key length");
me = (PyObject *)ty->tp_alloc(ty, 0);
GPRP_PRP(me) = prp;
- prp->init(GPRP_CTX(me), k, sz);
+ prp->init(GPRP_CTX(me), k.p, k.sz);
Py_INCREF(me);
return (me);
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)
{
}
static PyObject *gcpget_name(PyObject *me, void *hunoz)
- { return (PyString_FromString(GCPRP_PRP(me)->name)); }
+ { return (TEXT_FROMSTR(GCPRP_PRP(me)->name)); }
static PyObject *gcpget_keysz(PyObject *me, void *hunoz)
{ return (keysz_pywrap(GCPRP_PRP(me)->keysz)); }
static PyObject *gcpget_blksz(PyObject *me, void *hunoz)
static PyObject *gpmeth_encrypt(PyObject *me, PyObject *arg)
{
- char *p;
- Py_ssize_t n;
+ struct bin m;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#:encrypt", &p, &n)) goto end;
- if (n != GPRP_PRP(me)->blksz) VALERR("incorrect block length");
- rc = bytestring_pywrap(0, n);
- GPRP_PRP(me)->eblk(GPRP_CTX(me), p, PyString_AS_STRING(rc));
+ if (!PyArg_ParseTuple(arg, "O&:encrypt", convbin, &m)) goto end;
+ if (m.sz != GPRP_PRP(me)->blksz) VALERR("incorrect block length");
+ rc = bytestring_pywrap(0, m.sz);
+ GPRP_PRP(me)->eblk(GPRP_CTX(me), m.p, BIN_PTR(rc));
end:
return (rc);
}
static PyObject *gpmeth_decrypt(PyObject *me, PyObject *arg)
{
- char *p;
- Py_ssize_t n;
+ struct bin c;
PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#:decrypt", &p, &n)) goto end;
- if (n != GPRP_PRP(me)->blksz) VALERR("incorrect block length");
- rc = bytestring_pywrap(0, n);
- GPRP_PRP(me)->dblk(GPRP_CTX(me), p, PyString_AS_STRING(rc));
+ if (!PyArg_ParseTuple(arg, "O&:decrypt", convbin, &c)) goto end;
+ if (c.sz != GPRP_PRP(me)->blksz) VALERR("incorrect block length");
+ rc = bytestring_pywrap(0, c.sz);
+ GPRP_PRP(me)->dblk(GPRP_CTX(me), c.p, BIN_PTR(rc));
end:
return (rc);
}
};
static const PyTypeObject gcprp_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GCPRP", /* @tp_name@ */
sizeof(gcprp_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
};
static const PyTypeObject gprp_pytype_skel = {
- PyObject_HEAD_INIT(0) 0, /* Header */
+ PyVarObject_HEAD_INIT(0, 0) /* Header */
"GPRP", /* @tp_name@ */
sizeof(gprp_pyobj), /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
/*----- 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, \
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)
{
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);
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);
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 -------------------------------------------------*/