@@@ py_buffer/freebin wip

[catacomb-python] / group.c

diff --git a/group.c b/group.c
index 51e0fd9..77c3e9f 100644 (file)
--- a/group.c
+++ b/group.c
@@ -196,8 +196,7 @@ static PyObject *dimeth_gendsa(PyObject *me, PyObject *arg, PyObject *kw)
   unsigned ql, pl;
   unsigned steps = 0;
   dsa_seed ds;
-  char *k;
-  Py_ssize_t ksz;
+  struct bin k;
   struct excinfo exc = EXCINFO_INIT;
   pypgev evt = { { 0 } };
   static const char *const kwlist[] =
@@ -205,12 +204,12 @@ static PyObject *dimeth_gendsa(PyObject *me, PyObject *arg, PyObject *kw)
   PyObject *rc = 0;
 
   evt.exc = &exc;
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&s#|O&O&:gendsa", KWLIST,
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&O&O&|O&O&:gendsa", KWLIST,
                                   convuint, &pl, convuint, &ql,
-                                  &k, &ksz, convpgev, &evt,
-                                  convuint, &steps))
+                                  convbin, &k,
+                                  convpgev, &evt, convuint, &steps))
     goto end;
-  if (dsa_gen(&dp, ql, pl, steps, k, ksz, &ds, evt.ev.proc, evt.ev.ctx))
+  if (dsa_gen(&dp, ql, pl, steps, k.p, k.sz, &ds, evt.ev.proc, evt.ev.ctx))
     PGENERR(&exc);
   rc = Py_BuildValue("(NNl)", fginfo_pywrap(&dp, dhinfo_pytype),
                     bytestring_pywrap(ds.p, ds.sz), (long)ds.count);
@@ -494,6 +493,7 @@ static PyObject *ge_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
   ec p = EC_INIT;
   mp *y = 0;
   ge *xx = 0;
+  size_t n;
   mptext_stringctx sc;
 
   g = GROUP_G(ty);
@@ -508,9 +508,8 @@ static PyObject *ge_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
     if (G_FROMINT(g, xx, y))
       TYERR("can't convert from integer");
     MP_DROP(y);
-  } else if (PyString_Check(x)) {
-    sc.buf = PyString_AS_STRING(x);
-    sc.lim = sc.buf + PyString_GET_SIZE(x);
+  } else if (TEXT_CHECK(x)) {
+    TEXT_PTRLEN(x, sc.buf, n); sc.lim = sc.buf + n;
     if (G_READ(g, xx, &mptext_stringops, &sc) || sc.buf < sc.lim)
       VALERR("malformed group element string");
   } else
@@ -590,7 +589,10 @@ static PyObject *ge_pyexp(PyObject *x, PyObject *n, PyObject *m)
   mp *nn;
   ge *z;
 
-  if (m != Py_None || !GE_PYCHECK(x) || (nn = getmp(n)) == 0)
+  if (m != Py_None || !GE_PYCHECK(x)) RETURN_NOTIMPL;
+  if (FE_PYCHECK(n) && FE_F(n)->ops->ty == FTY_PRIME)
+    nn = F_OUT(FE_F(n), MP_NEW, FE_X(n));
+  else if ((nn = implicitmp(n)) == 0)
     RETURN_NOTIMPL;
   z = G_CREATE(GE_G(x));
   G_EXP(GE_G(x), z, GE_X(x), nn);
@@ -662,11 +664,12 @@ static PyObject *ge_pystr(PyObject *me)
   PyObject *rc;
 
   group_writedstr(GE_G(me), GE_X(me), &d);
-  rc = PyString_FromStringAndSize(d.buf, d.len);
+  rc = TEXT_FROMSTRLEN(d.buf, d.len);
   DDESTROY(&d);
   return (rc);
 }
 
+#ifdef PY2
 static PyObject *ge_pylong(PyObject *me)
 {
   mp *x = 0;
@@ -679,6 +682,7 @@ end:
   mp_drop(x);
   return (rc);
 }
+#endif
 
 static PyObject *ge_pyint(PyObject *me)
 {
@@ -747,10 +751,10 @@ static PyObject *gemeth_tobuf(PyObject *me)
 
   n = GE_G(me)->noctets + 4;
   rc = bytestring_pywrap(0, n);
-  buf_init(&b, PyString_AS_STRING(rc), n);
+  buf_init(&b, BIN_PTR(rc), n);
   G_TOBUF(GE_G(me), &b, GE_X(me));
   assert(BOK(&b));
-  _PyString_Resize(&rc, BLEN(&b));
+  BIN_SETLEN(rc, BLEN(&b));
   return (rc);
 }
 
@@ -762,14 +766,14 @@ static PyObject *gemeth_toraw(PyObject *me)
 
   n = GE_G(me)->noctets;
   rc = bytestring_pywrap(0, n);
-  buf_init(&b, PyString_AS_STRING(rc), n);
+  buf_init(&b, BIN_PTR(rc), n);
   G_TORAW(GE_G(me), &b, GE_X(me));
   assert(BOK(&b));
-  _PyString_Resize(&rc, BLEN(&b));
+  BIN_SETLEN(rc, BLEN(&b));
   return (rc);
 }
 
-static PyObject *gmexp_exp(PyObject *me, void *pp, int n)
+static PyObject *gmexp_exp(PyObject *me, void *pp, size_t n)
 {
   ge *z = G_CREATE(GROUP_G(me));
   G_MEXP(GROUP_G(me), z, pp, n);
@@ -820,14 +824,13 @@ end:
 static PyObject *gemeth_frombuf(PyObject *me, PyObject *arg)
 {
   buf b;
-  char *p;
-  Py_ssize_t n;
+  struct bin in;
   group *g;
   ge *x = 0;
 
-  if (!PyArg_ParseTuple(arg, "s#:frombuf", &p, &n)) return (0);
+  if (!PyArg_ParseTuple(arg, "O&:frombuf", convbin, &in)) return (0);
   g = GROUP_G(me);
-  buf_init(&b, p, n);
+  buf_init(&b, (/*unconst*/ void *)in.p, in.sz);
   x = G_CREATE(g);
   if (G_FROMBUF(g, &b, x)) VALERR("invalid data");
   return (Py_BuildValue("(NN)", ge_pywrap(me, x), bytestring_pywrapbuf(&b)));
@@ -839,14 +842,13 @@ end:
 static PyObject *gemeth_fromraw(PyObject *me, PyObject *arg)
 {
   buf b;
-  char *p;
-  Py_ssize_t n;
+  struct bin in;
   group *g;
   ge *x = 0;
 
-  if (!PyArg_ParseTuple(arg, "s#:fromraw", &p, &n)) return (0);
+  if (!PyArg_ParseTuple(arg, "O&:fromraw", convbin, &in)) return (0);
   g = GROUP_G(me);
-  buf_init(&b, p, n);
+  buf_init(&b, (/*unconst*/ void *)in.p, in.sz);
   x = G_CREATE(g);
   if (G_FROMRAW(g, &b, x)) VALERR("invalid data");
   return (Py_BuildValue("(NN)", ge_pywrap(me, x), bytestring_pywrapbuf(&b)));
@@ -912,7 +914,7 @@ static PyObject *gget_g(PyObject *me, void *hunoz)
   G_COPY(g, x, g->g); return (ge_pywrap(me, x));
 }
 
-static long ge_pyhash(PyObject *me)
+static Py_hash_t ge_pyhash(PyObject *me)
 {
   buf b;
   size_t sz = GE_G(me)->noctets + 4;
@@ -960,7 +962,9 @@ static const PyNumberMethods ge_pynumber = {
   0,                                   /* @nb_add@ */
   0,                                   /* @nb_subtract@ */
   ge_pymul,                            /* @nb_multiply@ */
+#ifdef PY2
   ge_pydiv,                            /* @nb_divide@ */
+#endif
   0,                                   /* @nb_remainder@ */
   0,                                   /* @nb_divmod@ */
   ge_pyexp,                            /* @nb_power@ */
@@ -974,17 +978,23 @@ static const PyNumberMethods ge_pynumber = {
   0,                                   /* @nb_and@ */
   0,                                   /* @nb_xor@ */
   0,                                   /* @nb_or@ */
+#ifdef PY2
   0,                                   /* @nb_coerce@ */
+#endif
   ge_pyint,                            /* @nb_int@ */
-  ge_pylong,                           /* @nb_long@ */
+  PY23(ge_pylong, 0),                  /* @nb_long@ */
   0 /* meaningless */,                 /* @nb_float@ */
+#ifdef PY2
   0,                                   /* @nb_oct@ */
   0,                                   /* @nb_hex@ */
+#endif
 
   0,                                   /* @nb_inplace_add@ */
   0,                                   /* @nb_inplace_subtract@ */
   0,                                   /* @nb_inplace_multiply@ */
+#ifdef PY2
   0,                                   /* @nb_inplace_divide@ */
+#endif
   0,                                   /* @nb_inplace_remainder@ */
   0,                                   /* @nb_inplace_power@ */
   0,                                   /* @nb_inplace_lshift@ */