catacomb/__init__.py: Import `sys' as a whole.

[catacomb-python] / pubkey.c

diff --git a/pubkey.c b/pubkey.c
index 90a29b3df5e5a5e8144d003644f52f37a116ea7e..44454df23129df861176c61ea1891fc448078487 100644 (file)
--- a/pubkey.c
+++ b/pubkey.c
@@ -65,8 +65,12 @@ static PyObject *dsa_setup(PyTypeObject *ty, PyObject *G, PyObject *u,
   if (!u) {
     g->d.u = 0;
     u = Py_None;
   if (!u) {
     g->d.u = 0;
     u = Py_None;

-  } else if ((g->d.u = getmp(u)) == 0)
-    goto end;
+  } else {
+    if ((g->d.u = getmp(u)) == 0)
+      goto end;
+    if (MP_PYCHECK(u)) Py_INCREF(u);
+    else u = mp_pywrap(g->d.u);
+  }

   if (!p) {
     assert(g->d.u); assert(calcpub);
     pp = G_CREATE(GROUP_G(G));
   if (!p) {
     assert(g->d.u); assert(calcpub);
     pp = G_CREATE(GROUP_G(G));


@@ -78,7 +82,7 @@ static PyObject *dsa_setup(PyTypeObject *ty, PyObject *G, PyObject *u,
   g->d.p = GE_X(p);
   g->d.r = GRAND_R(rng);
   g->d.h = GCHASH_CH(hash);
   g->d.p = GE_X(p);
   g->d.r = GRAND_R(rng);
   g->d.h = GCHASH_CH(hash);

-  g->G = G; Py_INCREF(G); g->u = u; Py_INCREF(u); g->p = p;
+  g->G = G; Py_INCREF(G); g->u = u; g->p = p;

   g->rng = rng; Py_INCREF(rng); g->hash = hash; Py_INCREF(hash);
   return ((PyObject *)g);
 end:
   g->rng = rng; Py_INCREF(rng); g->hash = hash; Py_INCREF(hash);
   return ((PyObject *)g);
 end:


@@ -196,7 +200,7 @@ static PyMethodDef dsapub_pymethods[] = {
 
 static PyMethodDef dsapriv_pymethods[] = {
 #define METHNAME(name) dsameth_##name
 
 static 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 }
 };
 #undef METHNAME
   { 0 }
 };


@@ -433,7 +437,7 @@ static PyMethodDef kcdsapub_pymethods[] = {
 
 static PyMethodDef kcdsapriv_pymethods[] = {
 #define METHNAME(name) kcdsameth_##name
 
 static 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 }
 };
 #undef METHNAME
   { 0 }
 };


@@ -779,7 +783,7 @@ static PyGetSetDef rsapriv_pygetset[] = {
 
 static PyMethodDef rsapriv_pymethods[] = {
 #define METHNAME(name) rsameth_##name
 
 static 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)")

 #undef METHNAME
   { 0 }
 };
 #undef METHNAME
   { 0 }
 };


@@ -1257,7 +1261,7 @@ static PyMethodDef methods[] = {
   KWMETH(_pss_encode,                  0)
   KWMETH(_pss_decode,                  0)
   KWMETH(_RSAPriv_generate,            "\
   KWMETH(_pss_encode,                  0)
   KWMETH(_pss_decode,                  0)
   KWMETH(_RSAPriv_generate,            "\

-generate(NBITS, [event = pgen_nullev, rng = rand, nsteps = 0]) -> R")
+generate(NBITS, [event = pgen_nullev], [rng = rand], [nsteps = 0]) -> R")

 #define DEFMETH(X, x)                                                  \
   METH  (x,                            "\
 " #x "(KEY, PUBLIC) -> SHARED")
 #define DEFMETH(X, x)                                                  \
   METH  (x,                            "\
 " #x "(KEY, PUBLIC) -> SHARED")


@@ -1267,11 +1271,11 @@ generate(NBITS, [event = pgen_nullev, rng = rand, nsteps = 0]) -> R")
   METH  (ed##_pubkey,                  "\
 " #ed "_pubkey(KEY) -> PUBLIC")                                                \
   KWMETH(ed##_sign,                    "\
   METH  (ed##_pubkey,                  "\
 " #ed "_pubkey(KEY) -> PUBLIC")                                                \
   KWMETH(ed##_sign,                    "\

-" #ed "_sign(KEY, MSG, [pub = PUBLIC, "                                        \
-        "perso = STRING, phflag = BOOL]) -> SIG")                      \
+" #ed "_sign(KEY, MSG, [pub = PUBLIC], "                               \
+        "[perso = STRING], [phflag = BOOL]) -> SIG")                   \

   KWMETH(ed##_verify,                  "\
 " #ed "_verify(PUBLIC, MSG, SIG, "                                     \
   KWMETH(ed##_verify,                  "\
 " #ed "_verify(PUBLIC, MSG, SIG, "                                     \

-        "[perso = STRING, phflag = BOOL]) -> BOOL")
+        "[perso = STRING], [phflag = BOOL]) -> BOOL")

   EDDSAS(DEFMETH)
 #undef DEFMETH
 #undef METHNAME
   EDDSAS(DEFMETH)
 #undef DEFMETH
 #undef METHNAME