X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/c263b05cca879ab1bdca5823df0413604d39d4c6..d6d78edc37c28e4cae1166fd53a21e3e5293f62b:/pubkey.c?ds=sidebyside

diff --git a/pubkey.c b/pubkey.c
index 05fc397..2b0b29e 100644
--- a/pubkey.c
+++ b/pubkey.c
@@ -219,7 +219,7 @@ static const PyMemberDef dsapriv_pymembers[] = {
 };
 
 static const PyTypeObject dsapub_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "DSAPub",				/* @tp_name@ */
   sizeof(dsa_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -267,7 +267,7 @@ static const PyTypeObject dsapub_pytype_skel = {
 };
 
 static const PyTypeObject dsapriv_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "DSAPriv",				/* @tp_name@ */
   sizeof(dsa_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -437,7 +437,7 @@ static const PyMethodDef kcdsapriv_pymethods[] = {
 };
 
 static const PyTypeObject kcdsapub_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "KCDSAPub",				/* @tp_name@ */
   sizeof(dsa_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -485,7 +485,7 @@ static const PyTypeObject kcdsapub_pytype_skel = {
 };
 
 static const PyTypeObject kcdsapriv_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "KCDSAPriv",				/* @tp_name@ */
   sizeof(dsa_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -788,7 +788,7 @@ static const PyMethodDef rsapriv_pymethods[] = {
 };
 
 static const PyTypeObject rsapub_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "RSAPub",				/* @tp_name@ */
   sizeof(rsapub_pyobj),			/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -836,7 +836,7 @@ static const PyTypeObject rsapub_pytype_skel = {
 };
 
 static const PyTypeObject rsapriv_pytype_skel = {
-  PyObject_HEAD_INIT(0) 0,		/* Header */
+  PyVarObject_HEAD_INIT(0, 0)		/* Header */
   "RSAPriv",				/* @tp_name@ */
   sizeof(rsapriv_pyobj),		/* @tp_basicsize@ */
   0,					/* @tp_itemsize@ */
@@ -1256,6 +1256,16 @@ EDDSAS(DEFEDDSA)
 
 /*----- Global stuff ------------------------------------------------------*/
 
+static const struct nameval consts[] = {
+  CONST(X25519_KEYSZ), CONST(X25519_PUBSZ), CONST(X25519_OUTSZ),
+  CONST(X448_KEYSZ), CONST(X448_PUBSZ), CONST(X448_OUTSZ),
+  CONST(ED25519_KEYSZ), CONST(ED25519_PUBSZ), CONST(ED25519_SIGSZ),
+    CONST(ED25519_MAXPERSOSZ),
+  CONST(ED448_KEYSZ), CONST(ED448_PUBSZ), CONST(ED448_SIGSZ),
+    CONST(ED448_MAXPERSOSZ),
+  { 0 }
+};
+
 static const PyMethodDef methods[] = {
 #define METHNAME(name) meth_##name
   KWMETH(_p1crypt_encode, 0)
@@ -1301,6 +1311,7 @@ void pubkey_pyinsert(PyObject *mod)
   INSERT("KCDSAPriv", kcdsapriv_pytype);
   INSERT("RSAPub", rsapub_pytype);
   INSERT("RSAPriv", rsapriv_pytype);
+  setconstants(mod, consts);
 }
 
 /*----- That's all, folks -------------------------------------------------*/