X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/c41d03718b8dc50076405c3d0f3136cfaa1cb21b..6438edb82bafab97b8aad35ce7ce3d787dde9a99:/pubkey.c

diff --git a/pubkey.c b/pubkey.c
index 9c43ca7..2c906cd 100644
--- a/pubkey.c
+++ b/pubkey.c
@@ -86,8 +86,7 @@ static PyObject *dsa_setup(PyTypeObject *ty, PyObject *G, PyObject *u,
   g->rng = rng; Py_INCREF(rng); g->hash = hash; Py_INCREF(hash);
   return ((PyObject *)g);
 end:
-  if (p) Py_DECREF(p);
-  FREEOBJ(g);
+  Py_XDECREF(p); FREEOBJ(g);
   return (0);
 }
 
@@ -109,11 +108,8 @@ end:
   return (rc);
 }
 
-static PyObject *dsameth_beginhash(PyObject *me, PyObject *arg)
-{
-  if (!PyArg_ParseTuple(arg, ":beginhash")) return (0);
-  return (ghash_pywrap(DSA_HASH(me), gdsa_beginhash(DSA_D(me))));
-}
+static PyObject *dsameth_beginhash(PyObject *me)
+  { return (ghash_pywrap(DSA_HASH(me), gdsa_beginhash(DSA_D(me)))); }
 
 static PyObject *dsameth_endhash(PyObject *me, PyObject *arg)
 {
@@ -189,23 +185,23 @@ end:
   return (rc);
 }
 
-static PyMethodDef dsapub_pymethods[] = {
+static const PyMethodDef dsapub_pymethods[] = {
 #define METHNAME(name) dsameth_##name
-  METH	(beginhash,		"D.beginhash() -> hash object")
-  METH	(endhash,		"D.endhash(H) -> BYTES")
-  METH	(verify,		"D.verify(MSG, (R, S)) -> true/false")
+  NAMETH(beginhash,	"D.beginhash() -> hash object")
+  METH	(endhash,	"D.endhash(H) -> BYTES")
+  METH	(verify,	"D.verify(MSG, (R, S)) -> true/false")
 #undef METHNAME
   { 0 }
 };
 
-static PyMethodDef dsapriv_pymethods[] = {
+static const PyMethodDef dsapriv_pymethods[] = {
 #define METHNAME(name) dsameth_##name
-  KWMETH(sign,			"D.sign(MSG, k = K) -> R, S")
+  KWMETH(sign,		"D.sign(MSG, [k = K]) -> R, S")
 #undef METHNAME
   { 0 }
 };
 
-static PyMemberDef dsapub_pymembers[] = {
+static const PyMemberDef dsapub_pymembers[] = {
 #define MEMBERSTRUCT dsa_pyobj
   MEMBER(G,	T_OBJECT, READONLY, "D.G -> group to work in")
   MEMBER(p,	T_OBJECT, READONLY, "D.p -> public key (group element")
@@ -215,7 +211,7 @@ static PyMemberDef dsapub_pymembers[] = {
   { 0 }
 };
 
-static PyMemberDef dsapriv_pymembers[] = {
+static const PyMemberDef dsapriv_pymembers[] = {
 #define MEMBERSTRUCT dsa_pyobj
   MEMBER(u,	T_OBJECT, READONLY, "D.u -> private key (exponent)")
 #undef MEMBERSTRUCT
@@ -247,7 +243,7 @@ static PyTypeObject dsapub_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"DSAPub(GROUP, P, [hash = sha], [rng = rand]): DSA public key.",
+  "DSAPub(GROUP, P, [hash = sha], [rng = rand]): DSA public key.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -255,8 +251,8 @@ static PyTypeObject dsapub_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  dsapub_pymethods,			/* @tp_methods@ */
-  dsapub_pymembers,			/* @tp_members@ */
+  PYMETHODS(dsapub),			/* @tp_methods@ */
+  PYMEMBERS(dsapub),			/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
@@ -295,7 +291,8 @@ static PyTypeObject dsapriv_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"DSAPriv(GROUP, U, [p = u G], [hash = sha], [rng = rand]): DSA private key.",
+  "DSAPriv(GROUP, U, [p = u G], [hash = sha], [rng = rand]): "
+							  "DSA private key.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -303,8 +300,8 @@ static PyTypeObject dsapriv_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  dsapriv_pymethods,			/* @tp_methods@ */
-  dsapriv_pymembers,			/* @tp_members@ */
+  PYMETHODS(dsapriv),			/* @tp_methods@ */
+  PYMEMBERS(dsapriv),			/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
@@ -363,11 +360,8 @@ end:
   return (rc);
 }
 
-static PyObject *kcdsameth_beginhash(PyObject *me, PyObject *arg)
-{
-  if (!PyArg_ParseTuple(arg, ":beginhash")) return (0);
-  return (ghash_pywrap(DSA_HASH(me), gkcdsa_beginhash(DSA_D(me))));
-}
+static PyObject *kcdsameth_beginhash(PyObject *me)
+  { return (ghash_pywrap(DSA_HASH(me), gkcdsa_beginhash(DSA_D(me)))); }
 
 static PyObject *kcdsameth_endhash(PyObject *me, PyObject *arg)
 {
@@ -426,18 +420,18 @@ end:
   return (rc);
 }
 
-static PyMethodDef kcdsapub_pymethods[] = {
+static const PyMethodDef kcdsapub_pymethods[] = {
 #define METHNAME(name) kcdsameth_##name
-  METH	(beginhash,		"D.beginhash() -> hash object")
-  METH	(endhash,		"D.endhash(H) -> BYTES")
-  METH	(verify,		"D.verify(MSG, (R, S)) -> true/false")
+  NAMETH(beginhash,	"D.beginhash() -> hash object")
+  METH	(endhash,	"D.endhash(H) -> BYTES")
+  METH	(verify,	"D.verify(MSG, (R, S)) -> true/false")
 #undef METHNAME
   { 0 }
 };
 
-static PyMethodDef kcdsapriv_pymethods[] = {
+static const PyMethodDef kcdsapriv_pymethods[] = {
 #define METHNAME(name) kcdsameth_##name
-  KWMETH(sign,			"D.sign(MSG, k = K) -> R, S")
+  KWMETH(sign,		"D.sign(MSG, [k = K]) -> R, S")
 #undef METHNAME
   { 0 }
 };
@@ -467,7 +461,7 @@ static PyTypeObject kcdsapub_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"KCDSAPub(GROUP, P, [hash = sha], [rng = rand]): KCDSA public key.",
+  "KCDSAPub(GROUP, P, [hash = sha], [rng = rand]): KCDSA public key.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -475,8 +469,8 @@ static PyTypeObject kcdsapub_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  kcdsapub_pymethods,			/* @tp_methods@ */
-  dsapub_pymembers,			/* @tp_members@ */
+  PYMETHODS(kcdsapub),			/* @tp_methods@ */
+  PYMEMBERS(dsapub),			/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
@@ -515,7 +509,8 @@ static PyTypeObject kcdsapriv_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"KCDSAPriv(GROUP, U, [p = u G], [hash = sha], [rng = rand]): KCDSA private key.",
+  "KCDSAPriv(GROUP, U, [p = u G], [hash = sha], [rng = rand]): "
+							"KCDSA private key.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -523,8 +518,8 @@ static PyTypeObject kcdsapriv_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  kcdsapriv_pymethods,			/* @tp_methods@ */
-  dsapriv_pymembers,			/* @tp_members@ */
+  PYMETHODS(kcdsapriv),			/* @tp_methods@ */
+  PYMEMBERS(dsapriv),			/* @tp_members@ */
   0,					/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
@@ -649,7 +644,7 @@ static PyObject *rsapriv_pynew(PyTypeObject *ty,
     goto end;
   if ((rp.n && !MP_ODDP(rp.n)) ||
       (rp.p && !MP_ODDP(rp.p)) ||
-      (rp.p && !MP_ODDP(rp.q)))
+      (rp.q && !MP_ODDP(rp.q)))
     VALERR("RSA modulus and factors must be odd");
   if (rsa_recover(&rp)) VALERR("couldn't construct private key");
   if (rng != Py_None && !GRAND_PYCHECK(rng))
@@ -725,28 +720,29 @@ end:
   return (rc);
 }
 
-static PyObject *meth__RSAPriv_generate(PyObject *me,
-					PyObject *arg, PyObject *kw)
+static PyObject *rsameth_generate(PyObject *me, PyObject *arg, PyObject *kw)
 {
   grand *r = &rand_global;
   unsigned nbits;
   unsigned n = 0;
   rsa_priv rp;
   mp *e = 0;
-  pgev evt = { 0 };
+  struct excinfo exc = EXCINFO_INIT;
+  pypgev evt = { { 0 } };
   static const char *const kwlist[] =
-    { "class", "nbits", "event", "rng", "nsteps", "e", 0 };
+    { "nbits", "event", "rng", "nsteps", "e", 0 };
   PyObject *rc = 0;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&|O&O&O&O&:generate", KWLIST,
-				   &me, convuint, &nbits, convpgev, &evt,
+  evt.exc = &exc;
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&O&O&O&:generate", KWLIST,
+				   convuint, &nbits, convpgev, &evt,
 				   convgrand, &r, convuint, &n,
 				   convmp, &e))
     goto end;
   if (e) MP_COPY(e);
   else e = mp_fromulong(MP_NEW, 65537);
-  if (rsa_gen_e(&rp, nbits, e, r, n, evt.proc, evt.ctx))
-    PGENERR;
+  if (rsa_gen_e(&rp, nbits, e, r, n, evt.ev.proc, evt.ev.ctx))
+    PGENERR(&exc);
   rc = rsapriv_pywrap(&rp);
 end:
   droppgev(&evt);
@@ -754,37 +750,39 @@ end:
   return (rc);
 }
 
-static PyGetSetDef rsapub_pygetset[] = {
+static const PyGetSetDef rsapub_pygetset[] = {
 #define GETSETNAME(op, name) rsa##op##_##name
-  GET	(n,			"R.n -> N")
-  GET	(e,			"R.e -> E")
+  GET	(n,		"R.n -> N")
+  GET	(e,		"R.e -> E")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyMethodDef rsapub_pymethods[] = {
+static const PyMethodDef rsapub_pymethods[] = {
 #define METHNAME(name) rsameth_##name
-  METH	(pubop,			"R.pubop(X) -> X^E (mod N)")
+  METH	(pubop,		"R.pubop(X) -> X^E (mod N)")
 #undef METHNAME
   { 0 }
 };
 
-static PyGetSetDef rsapriv_pygetset[] = {
+static const PyGetSetDef rsapriv_pygetset[] = {
 #define GETSETNAME(op, name) rsa##op##_##name
-  GET	(d,			"R.d -> D")
-  GET	(p,			"R.p -> P")
-  GET	(q,			"R.q -> Q")
-  GET	(dp,			"R.dp -> D mod (P - 1)")
-  GET	(dq,			"R.dq -> D mod (Q - 1)")
-  GET	(q_inv,			"R.q_inv -> Q^{-1} mod P")
-  GETSET(rng,			"R.rng -> random number source for blinding")
+  GET	(d,		"R.d -> D")
+  GET	(p,		"R.p -> P")
+  GET	(q,		"R.q -> Q")
+  GET	(dp,		"R.dp -> D mod (P - 1)")
+  GET	(dq,		"R.dq -> D mod (Q - 1)")
+  GET	(q_inv,		"R.q_inv -> Q^{-1} mod P")
+  GETSET(rng,		"R.rng -> random number source for blinding")
 #undef GETSETNAME
   { 0 }
 };
 
-static PyMethodDef rsapriv_pymethods[] = {
+static const PyMethodDef rsapriv_pymethods[] = {
 #define METHNAME(name) rsameth_##name
-  KWMETH(privop,		"R.privop(X, rng = None) -> X^D (mod N)")
+  KWMETH(privop,		"R.privop(X, [rng = None]) -> X^D (mod N)")
+  KWSMTH(generate, "generate(NBITS, [event = pgen_nullev], [rng = rand], "
+							"[nsteps = 0]) -> R")
 #undef METHNAME
   { 0 }
 };
@@ -814,7 +812,7 @@ static PyTypeObject rsapub_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"RSAPub(N, E): RSA public key.",
+  "RSAPub(N, E): RSA public key.",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -822,9 +820,9 @@ static PyTypeObject rsapub_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  rsapub_pymethods,			/* @tp_methods@ */
+  PYMETHODS(rsapub),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  rsapub_pygetset,			/* @tp_getset@ */
+  PYGETSET(rsapub),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -862,8 +860,8 @@ static PyTypeObject rsapriv_pytype_skel = {
     Py_TPFLAGS_BASETYPE,
 
   /* @tp_doc@ */
-"RSAPriv(..., [rng = rand]): RSA private key.\n\
-  Keywords: n, e, d, p, q, dp, dq, q_inv; must provide enough",
+  "RSAPriv(..., [rng = rand]): RSA private key.\n"
+  "  Keywords: n, e, d, p, q, dp, dq, q_inv; must provide enough",
 
   0,					/* @tp_traverse@ */
   0,					/* @tp_clear@ */
@@ -871,9 +869,9 @@ static PyTypeObject rsapriv_pytype_skel = {
   0,					/* @tp_weaklistoffset@ */
   0,					/* @tp_iter@ */
   0,					/* @tp_iternext@ */
-  rsapriv_pymethods,			/* @tp_methods@ */
+  PYMETHODS(rsapriv),			/* @tp_methods@ */
   0,					/* @tp_members@ */
-  rsapriv_pygetset,			/* @tp_getset@ */
+  PYGETSET(rsapriv),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -1258,32 +1256,26 @@ EDDSAS(DEFEDDSA)
 
 /*----- Global stuff ------------------------------------------------------*/
 
-static PyMethodDef methods[] = {
+static const PyMethodDef methods[] = {
 #define METHNAME(name) meth_##name
-  KWMETH(_p1crypt_encode,		0)
-  KWMETH(_p1crypt_decode,		0)
-  KWMETH(_p1sig_encode,			0)
-  KWMETH(_p1sig_decode,			0)
-  KWMETH(_oaep_encode,			0)
-  KWMETH(_oaep_decode,			0)
-  KWMETH(_pss_encode,			0)
-  KWMETH(_pss_decode,			0)
-  KWMETH(_RSAPriv_generate,		"\
-generate(NBITS, [event = pgen_nullev, rng = rand, nsteps = 0]) -> R")
+  KWMETH(_p1crypt_encode, 0)
+  KWMETH(_p1crypt_decode, 0)
+  KWMETH(_p1sig_encode,	0)
+  KWMETH(_p1sig_decode,	0)
+  KWMETH(_oaep_encode,	0)
+  KWMETH(_oaep_decode,	0)
+  KWMETH(_pss_encode,	0)
+  KWMETH(_pss_decode,	0)
 #define DEFMETH(X, x)							\
-  METH  (x,				"\
-" #x "(KEY, PUBLIC) -> SHARED")
+  METH	(x,		"" #x "(KEY, PUBLIC) -> SHARED")
   XDHS(DEFMETH)
 #undef DEFMETH
 #define DEFMETH(ED, ed, phdflt, sigver)					\
-  METH  (ed##_pubkey,			"\
-" #ed "_pubkey(KEY) -> PUBLIC")						\
-  KWMETH(ed##_sign,			"\
-" #ed "_sign(KEY, MSG, [pub = PUBLIC, "					\
-	 "perso = STRING, phflag = BOOL]) -> SIG")			\
-  KWMETH(ed##_verify,			"\
-" #ed "_verify(PUBLIC, MSG, SIG, "					\
-	 "[perso = STRING, phflag = BOOL]) -> BOOL")
+  METH	(ed##_pubkey,	"" #ed "_pubkey(KEY) -> PUBLIC")		\
+  KWMETH(ed##_sign,	"" #ed "_sign(KEY, MSG, [pub = PUBLIC], "	\
+			   "[perso = STRING], [phflag = BOOL]) -> SIG")	\
+  KWMETH(ed##_verify,	"" #ed "_verify(PUBLIC, MSG, SIG, "		\
+			  "[perso = STRING], [phflag = BOOL]) -> BOOL")
   EDDSAS(DEFMETH)
 #undef DEFMETH
 #undef METHNAME