~mdw
/
catacomb-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pyke/mapping.c, key.c: Make the mapping code more intrusive and complete.
[catacomb-python]
/
algorithms.c
diff --git
a/algorithms.c
b/algorithms.c
index
858597a
..
f792087
100644
(file)
--- a/
algorithms.c
+++ b/
algorithms.c
@@
-295,7
+295,7
@@
static const PyMemberDef keyszset_pymembers[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject keysz_pytype_skel = {
+static
const
PyTypeObject keysz_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"KeySZ", /* @tp_name@ */
sizeof(keysz_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"KeySZ", /* @tp_name@ */
sizeof(keysz_pyobj), /* @tp_basicsize@ */
@@
-343,7
+343,7
@@
static PyTypeObject keysz_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject keyszany_pytype_skel = {
+static
const
PyTypeObject keyszany_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"KeySZAny", /* @tp_name@ */
sizeof(keysz_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"KeySZAny", /* @tp_name@ */
sizeof(keysz_pyobj), /* @tp_basicsize@ */
@@
-392,7
+392,7
@@
static PyTypeObject keyszany_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject keyszrange_pytype_skel = {
+static
const
PyTypeObject keyszrange_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"KeySZRange", /* @tp_name@ */
sizeof(keyszrange_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"KeySZRange", /* @tp_name@ */
sizeof(keyszrange_pyobj), /* @tp_basicsize@ */
@@
-442,7
+442,7
@@
static PyTypeObject keyszrange_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject keyszset_pytype_skel = {
+static
const
PyTypeObject keyszset_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"KeySZSet", /* @tp_name@ */
sizeof(keyszset_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"KeySZSet", /* @tp_name@ */
sizeof(keyszset_pyobj), /* @tp_basicsize@ */
@@
-669,7
+669,7
@@
static const PyMethodDef gcipher_pymethods[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject gccipher_pytype_skel = {
+static
const
PyTypeObject gccipher_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GCCipher", /* @tp_name@ */
sizeof(gccipher_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GCCipher", /* @tp_name@ */
sizeof(gccipher_pyobj), /* @tp_basicsize@ */
@@
-717,7
+717,7
@@
static PyTypeObject gccipher_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gcipher_pytype_skel = {
+static
const
PyTypeObject gcipher_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GCipher", /* @tp_name@ */
sizeof(gcipher_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GCipher", /* @tp_name@ */
sizeof(gcipher_pyobj), /* @tp_basicsize@ */
@@
-1552,7
+1552,7
@@
static const PyMethodDef gaeaddec_pymethods[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject gcaead_pytype_skel = {
+static
const
PyTypeObject gcaead_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GCAEAD", /* @tp_name@ */
sizeof(gcaead_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GCAEAD", /* @tp_name@ */
sizeof(gcaead_pyobj), /* @tp_basicsize@ */
@@
-1600,7
+1600,7
@@
static PyTypeObject gcaead_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gaeadkey_pytype_skel = {
+static
const
PyTypeObject gaeadkey_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEKey", /* @tp_name@ */
sizeof(gaeadkey_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEKey", /* @tp_name@ */
sizeof(gaeadkey_pyobj), /* @tp_basicsize@ */
@@
-1648,7
+1648,7
@@
static PyTypeObject gaeadkey_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gcaeadaad_pytype_skel = {
+static
const
PyTypeObject gcaeadaad_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEAADClass", /* @tp_name@ */
sizeof(gcaeadaad_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEAADClass", /* @tp_name@ */
sizeof(gcaeadaad_pyobj), /* @tp_basicsize@ */
@@
-1696,7
+1696,7
@@
static PyTypeObject gcaeadaad_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gaeadaad_pytype_skel = {
+static
const
PyTypeObject gaeadaad_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEAAD", /* @tp_name@ */
sizeof(gaeadaad_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEAAD", /* @tp_name@ */
sizeof(gaeadaad_pyobj), /* @tp_basicsize@ */
@@
-1744,7
+1744,7
@@
static PyTypeObject gaeadaad_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gcaeadenc_pytype_skel = {
+static
const
PyTypeObject gcaeadenc_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEEncClass", /* @tp_name@ */
sizeof(gcaeadenc_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEEncClass", /* @tp_name@ */
sizeof(gcaeadenc_pyobj), /* @tp_basicsize@ */
@@
-1792,7
+1792,7
@@
static PyTypeObject gcaeadenc_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gaeadenc_pytype_skel = {
+static
const
PyTypeObject gaeadenc_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEEnc", /* @tp_name@ */
sizeof(gaeadenc_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEEnc", /* @tp_name@ */
sizeof(gaeadenc_pyobj), /* @tp_basicsize@ */
@@
-1840,7
+1840,7
@@
static PyTypeObject gaeadenc_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gcaeaddec_pytype_skel = {
+static
const
PyTypeObject gcaeaddec_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEDecClass", /* @tp_name@ */
sizeof(gcaeaddec_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEDecClass", /* @tp_name@ */
sizeof(gcaeaddec_pyobj), /* @tp_basicsize@ */
@@
-1888,7
+1888,7
@@
static PyTypeObject gcaeaddec_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gaeaddec_pytype_skel = {
+static
const
PyTypeObject gaeaddec_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEDec", /* @tp_name@ */
sizeof(gaeaddec_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GAEDec", /* @tp_name@ */
sizeof(gaeaddec_pyobj), /* @tp_basicsize@ */
@@
-2086,7
+2086,7
@@
static const PyMethodDef ghash_pymethods[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject gchash_pytype_skel = {
+static
const
PyTypeObject gchash_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GCHash", /* @tp_name@ */
sizeof(gchash_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GCHash", /* @tp_name@ */
sizeof(gchash_pyobj), /* @tp_basicsize@ */
@@
-2134,7
+2134,7
@@
static PyTypeObject gchash_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject ghash_pytype_skel = {
+static
const
PyTypeObject ghash_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GHash", /* @tp_name@ */
sizeof(ghash_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GHash", /* @tp_name@ */
sizeof(ghash_pyobj), /* @tp_basicsize@ */
@@
-2300,7
+2300,7
@@
static const PyGetSetDef gcmac_pygetset[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject gcmac_pytype_skel = {
+static
const
PyTypeObject gcmac_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GCMAC", /* @tp_name@ */
sizeof(gchash_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GCMAC", /* @tp_name@ */
sizeof(gchash_pyobj), /* @tp_basicsize@ */
@@
-2348,7
+2348,7
@@
static PyTypeObject gcmac_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gmac_pytype_skel = {
+static
const
PyTypeObject gmac_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GMAC", /* @tp_name@ */
sizeof(gmac_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GMAC", /* @tp_name@ */
sizeof(gmac_pyobj), /* @tp_basicsize@ */
@@
-2396,7
+2396,7
@@
static PyTypeObject gmac_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gmhash_pytype_skel = {
+static
const
PyTypeObject gmhash_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GMACHash", /* @tp_name@ */
sizeof(ghash_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GMACHash", /* @tp_name@ */
sizeof(ghash_pyobj), /* @tp_basicsize@ */
@@
-2646,7
+2646,7
@@
static const PyMethodDef poly1305hash_pymethods[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject poly1305cls_pytype_skel = {
+static
const
PyTypeObject poly1305cls_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"Poly1305Class", /* @tp_name@ */
sizeof(PyHeapTypeObject), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"Poly1305Class", /* @tp_name@ */
sizeof(PyHeapTypeObject), /* @tp_basicsize@ */
@@
-2694,7
+2694,7
@@
static PyTypeObject poly1305cls_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject poly1305key_pytype_skel = {
+static
const
PyTypeObject poly1305key_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"poly1305", /* @tp_name@ */
sizeof(poly1305key_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"poly1305", /* @tp_name@ */
sizeof(poly1305key_pyobj), /* @tp_basicsize@ */
@@
-2742,7
+2742,7
@@
static PyTypeObject poly1305key_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject poly1305hash_pytype_skel = {
+static
const
PyTypeObject poly1305hash_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"Poly1305Hash", /* @tp_name@ */
sizeof(poly1305hash_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"Poly1305Hash", /* @tp_name@ */
sizeof(poly1305hash_pyobj), /* @tp_basicsize@ */
@@
-2922,7
+2922,7
@@
static const PyMethodDef kxvik_pymethods[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject kxvik_pytype_skel = {
+static
const
PyTypeObject kxvik_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"Keccak1600", /* @tp_name@ */
sizeof(kxvik_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"Keccak1600", /* @tp_name@ */
sizeof(kxvik_pyobj), /* @tp_basicsize@ */
@@
-3167,7
+3167,7
@@
static const PyMethodDef shake_pymethods[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject shake_pytype_skel = {
+static
const
PyTypeObject shake_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"Shake", /* @tp_name@ */
sizeof(shake_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"Shake", /* @tp_name@ */
sizeof(shake_pyobj), /* @tp_basicsize@ */
@@
-3215,7
+3215,7
@@
static PyTypeObject shake_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject shake128_pytype_skel = {
+static
const
PyTypeObject shake128_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"Shake128", /* @tp_name@ */
0, /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"Shake128", /* @tp_name@ */
0, /* @tp_basicsize@ */
@@
-3263,7
+3263,7
@@
static PyTypeObject shake128_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject shake256_pytype_skel = {
+static
const
PyTypeObject shake256_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"Shake256", /* @tp_name@ */
0, /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"Shake256", /* @tp_name@ */
0, /* @tp_basicsize@ */
@@
-3460,7
+3460,7
@@
static const PyMethodDef gprp_pymethods[] = {
{ 0 }
};
{ 0 }
};
-static PyTypeObject gcprp_pytype_skel = {
+static
const
PyTypeObject gcprp_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GCPRP", /* @tp_name@ */
sizeof(gcprp_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GCPRP", /* @tp_name@ */
sizeof(gcprp_pyobj), /* @tp_basicsize@ */
@@
-3508,7
+3508,7
@@
static PyTypeObject gcprp_pytype_skel = {
0 /* @tp_is_gc@ */
};
0 /* @tp_is_gc@ */
};
-static PyTypeObject gprp_pytype_skel = {
+static
const
PyTypeObject gprp_pytype_skel = {
PyObject_HEAD_INIT(0) 0, /* Header */
"GPRP", /* @tp_name@ */
sizeof(gprp_pyobj), /* @tp_basicsize@ */
PyObject_HEAD_INIT(0) 0, /* Header */
"GPRP", /* @tp_name@ */
sizeof(gprp_pyobj), /* @tp_basicsize@ */
@@
-3558,6
+3558,12
@@
static PyTypeObject gprp_pytype_skel = {
/*----- Main code ---------------------------------------------------------*/
/*----- 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, \
static const PyMethodDef methods[] = {
#define METHNAME(func) meth_##func
#define METH_HDANCE(hdance, HDance) METH(hdance##_prf, \
@@
-3651,6
+3657,7
@@
void algorithms_pyinsert(PyObject *mod)
INSERT("GCPRP", gcprp_pytype);
INSERT("GPRP", gprp_pytype);
INSERT("gcprps", gcprps());
INSERT("GCPRP", gcprp_pytype);
INSERT("GPRP", gprp_pytype);
INSERT("gcprps", gcprps());
+ setconstants(mod, consts);
}
/*----- That's all, folks -------------------------------------------------*/
}
/*----- That's all, folks -------------------------------------------------*/