X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/dc088b4d38aba2b3ccf9245fc64edc54b033550d..6311e4f71d2aac179fa3841d47302cdb642e487d:/buffer.c

diff --git a/buffer.c b/buffer.c
index 7f535dc..d0df068 100644
--- a/buffer.c
+++ b/buffer.c
@@ -58,11 +58,18 @@ static void buf_pydealloc(PyObject *me)
   FREEOBJ(me);
 }
 
-static Py_ssize_t rbuf_pysegcount(PyObject *me, Py_ssize_t *nn)
-  { if (nn) *nn = BSZ(BUF_B(me)); return (1); }
-
-static Py_ssize_t rbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)
-  { assert(seg == 0); *q = BCUR(BUF_B(me)); return (BLEFT(BUF_B(me))); }
+#ifdef PY3
+  static int rbuf_pygetbuf(PyObject *me, Py_buffer *vw, int f)
+  {
+    buf *b = BUF_B(me);
+    return (PyBuffer_FillInfo(vw, me, BCUR(b), BLEFT(b), 1, f));
+  }
+#else
+  static Py_ssize_t rbuf_pysegcount(PyObject *me, Py_ssize_t *nn)
+    { if (nn) *nn = BSZ(BUF_B(me)); return (1); }
+  static Py_ssize_t rbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)
+    { assert(seg == 0); *q = BCUR(BUF_B(me)); return (BLEFT(BUF_B(me))); }
+#endif
 
 static PyObject *rbmeth_skip(PyObject *me, PyObject *arg)
 {
@@ -177,6 +184,22 @@ end:
   return (rc);
 }
 
+static PyObject *rbmeth_os2ecp(PyObject *me, PyObject *arg, PyObject *kw)
+{
+  PyObject *cobj;
+  ec pt = EC_INIT;
+  unsigned f = EC_XONLY | EC_LSB | EC_SORT | EC_EXPLY;
+  PyObject *rc = 0;
+  static const char *const kwlist[] = { "curve", "flags", 0 };
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O&:os2ecp", KWLIST,
+				   eccurve_pytype, &cobj, convuint, &f))
+    goto end;
+  if (ec_os2ecp(ECCURVE_C(cobj), f, BUF_B(me), &pt)) VALERR("bad point");
+  rc = ecpt_pywrapout(cobj, &pt);
+end:
+  return (rc);
+}
+
 static PyObject *rbmeth_getge(PyObject *me, PyObject *arg)
 {
   PyObject *gobj;
@@ -250,6 +273,7 @@ static const PyMethodDef rbuf_pymethods[] = {
   NAMETH(getgf,		"RBUF.getgf() -> X")
   KWMETH(getecpt,	"RBUF.getecpt([curve = None]) -> P")
   METH	(getecptraw,	"RBUF.getecptraw(CURVE) -> P")
+  KWMETH(os2ecp,	"RBUF.os2ecp(CURVE, [flags = ...]) -> P")
   METH	(getge,		"RBUF.getge(GROUP) -> X")
   METH	(getgeraw,	"RBUF.getgeraw(GROUP) -> X")
 #undef METHNAME
@@ -257,10 +281,15 @@ static const PyMethodDef rbuf_pymethods[] = {
 };
 
 static const PyBufferProcs rbuf_pybuffer = {
+#ifdef PY3
+  rbuf_pygetbuf,			/* @bf_getbuffer@ */
+  0,					/* @bf_releasebuffer@ */
+#else
   rbuf_pyreadbuf,			/* @bf_getreadbuffer@ */
   0,					/* @bf_getwritebuffer@ */
   rbuf_pysegcount,			/* @bf_getsegcount@ */
   0					/* @bf_getcharbuffer@ */
+#endif
 };
 
 static const PyTypeObject rbuf_pytype_skel = {
@@ -356,11 +385,21 @@ end:
   return ((PyObject *)me);
 }
 
-static Py_ssize_t wbuf_pysegcount(PyObject *me, Py_ssize_t *nn)
-  { if (nn) *nn = BLEN(BUF_B(me)); return (1); }
-
-static Py_ssize_t wbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)
-  { assert(seg == 0); *q = BBASE(BUF_B(me)); return (BLEN(BUF_B(me))); }
+#ifdef PY3
+  static int wbuf_pygetbuf(PyObject *me, Py_buffer *vw, int f)
+  {
+    buf *b = BUF_B(me);
+    if (PyBuffer_FillInfo(vw, me, BBASE(b), BLEN(b), 0, f)) return (-1);
+    BUF_LK(me)++; return (0);
+  }
+  static void wbuf_pyrlsbuf(PyObject *me, Py_buffer *vw)
+    { BUF_LK(me)--; }
+#else
+  static Py_ssize_t wbuf_pysegcount(PyObject *me, Py_ssize_t *nn)
+    { if (nn) *nn = BLEN(BUF_B(me)); return (1); }
+  static Py_ssize_t wbuf_pyreadbuf(PyObject *me, Py_ssize_t seg, void **q)
+    { assert(seg == 0); *q = BBASE(BUF_B(me)); return (BLEN(BUF_B(me))); }
+#endif
 
 static PyObject *wbmeth_zero(PyObject *me, PyObject *arg)
 {
@@ -443,16 +482,37 @@ static PyObject *wbmeth_putecpt(PyObject *me, PyObject *arg)
 static PyObject *wbmeth_putecptraw(PyObject *me, PyObject *arg)
 {
   PyObject *ptobj;
+  ec_curve *cc;
   ec pt = EC_INIT;
   if (!PyArg_ParseTuple(arg, "O!:putecptraw", ecptcurve_pytype, &ptobj))
     return (0);
-  EC_OUT(ECPT_C(ptobj), &pt, ECPT_P(ptobj));
-  if (ensurebuf(me, ECPT_C(ptobj)->f->noctets * 2 + 1)) return (0);
-  ec_putraw(ECPT_C(ptobj), BUF_B(me), &pt); assert(BOK(BUF_B(me)));
+  cc = ECPT_C(ptobj);
+  EC_OUT(cc, &pt, ECPT_P(ptobj));
+  if (ensurebuf(me, 2*cc->f->noctets + 1)) return (0);
+  ec_putraw(cc, BUF_B(me), &pt); assert(BOK(BUF_B(me)));
   EC_DESTROY(&pt);
   RETURN_ME;
 }
 
+static PyObject *wbmeth_ec2osp(PyObject *me, PyObject *arg, PyObject *kw)
+{
+  PyTypeObject *ptobj;
+  ec_curve *cc;
+  ec pt = EC_INIT;
+  unsigned f = EC_EXPLY;
+  static const char *const kwlist[] = { "point", "flags", 0 };
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!|O&:os2ecp", KWLIST,
+				   ecptcurve_pytype, &ptobj, convuint, &f))
+    goto end;
+  cc = ECPT_C(ptobj);
+  EC_OUT(cc, &pt, ECPT_P(ptobj));
+  if (ensurebuf(me, 2*cc->f->noctets + 1)) return (0);
+  if (ec_ec2osp(cc, f, BUF_B(me), &pt)) VALERR("invalid flags");
+  RETURN_ME;
+end:
+  return (0);
+}
+
 static PyObject *wbmeth_putge(PyObject *me, PyObject *arg)
 {
   PyObject *geobj;
@@ -499,6 +559,7 @@ static const PyMethodDef wbuf_pymethods[] = {
   METH	(putgf,		"WBUF.putgf(X)")
   METH	(putecpt,	"WBUF.putecpt(P)")
   METH	(putecptraw,	"WBUF.putecptraw(P)")
+  KWMETH(ec2osp,	"WBUF.ec2osp(P, [flags = EC_EXPLY])")
   METH	(putge,		"WBUF.putge(X)")
   METH	(putgeraw,	"WBUF.putgeraw(X)")
 #undef METHNAME
@@ -506,10 +567,15 @@ static const PyMethodDef wbuf_pymethods[] = {
 };
 
 static const PyBufferProcs wbuf_pybuffer = {
+#ifdef PY3
+  wbuf_pygetbuf,			/* @bf_getbuffer@ */
+  wbuf_pyrlsbuf				/* @bf_releasebuffer@ */
+#else
   wbuf_pyreadbuf,			/* @bf_getreadbuffer@ */
   0,					/* @bf_getwritebuffer@ */
   wbuf_pysegcount,			/* @bf_getsegcount@ */
   0					/* @bf_getcharbuffer@ */
+#endif
 };
 
 static const PyTypeObject wbuf_pytype_skel = {