ec.c (ec2osp, os2ecp): Collect flags correctly.

[catacomb-python] / ec.c

diff --git a/ec.c b/ec.c
index 7fd369d95206bc41099b63608bb527122d63ac14..4ee4d05ea4259e1d06c961ac91b9bcd8d22ce3c0 100644 (file)
--- a/ec.c
+++ b/ec.c
@@ -298,11 +298,12 @@ static PyObject *epmeth_ec2osp(PyObject *me, PyObject *arg, PyObject *kw)
   char *p;
   ec_curve *c = ECPT_C(me);
   ec pp = EC_INIT;
   char *p;
   ec_curve *c = ECPT_C(me);
   ec pp = EC_INIT;

-  int f = EC_EXPLY;
+  unsigned f = EC_EXPLY;

   int len;
   char *kwlist[] = { "flags", 0 };
 
   int len;
   char *kwlist[] = { "flags", 0 };
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|i:ec2osp", kwlist, &f))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:ec2osp", kwlist,
+                                  convuint, &f))

     return (0);
   len = c->f->noctets * 2 + 1;
   rc = bytestring_pywrap(0, len);
     return (0);
   len = c->f->noctets * 2 + 1;
   rc = bytestring_pywrap(0, len);


@@ -866,12 +867,12 @@ static PyObject *meth__ECPtCurve_os2ecp(PyObject *me,
   buf b;
   PyObject *rc = 0;
   ec_curve *cc;
   buf b;
   PyObject *rc = 0;
   ec_curve *cc;

-  int f = EC_XONLY | EC_LSB | EC_SORT | EC_EXPLY;
+  unsigned f = EC_XONLY | EC_LSB | EC_SORT | EC_EXPLY;

   ec pp = EC_INIT;
   char *kwlist[] = { "class", "buf", "flags", 0 };
 
   ec pp = EC_INIT;
   char *kwlist[] = { "class", "buf", "flags", 0 };
 

-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|f:os2ecp", kwlist,
-                                  &me, &p, &len, &f))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|O&:os2ecp", kwlist,
+                                  &me, &p, &len, convuint, &f))

     return (0);
   buf_init(&b, p, len);
   cc = ECCURVE_C(me);
     return (0);
   buf_init(&b, p, len);
   cc = ECCURVE_C(me);