X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/04b75d719e7435aac5a943ec083bb6c0789e4afd..a9410db7436274a5623ee1dd61f6e45b20f7164c:/algorithms.c?ds=sidebyside

diff --git a/algorithms.c b/algorithms.c
index dd0bd0a..a195de9 100644
--- a/algorithms.c
+++ b/algorithms.c
@@ -121,13 +121,20 @@ static PyObject *keyszrange_pynew(PyTypeObject *ty,
 				  PyObject *arg, PyObject *kw)
 {
   static const char *const kwlist[] = { "default", "min", "max", "mod", 0 };
-  int dfl, min = 0, max = 0, mod = 1;
+  int dfl, min = 0, max, mod = 1;
+  PyObject *maxobj = Py_None;
   keyszrange_pyobj *o;
 
-  if (!PyArg_ParseTupleAndKeywords(arg, kw, "i|iii:new", KWLIST,
-				   &dfl, &min, &max, &mod))
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "i|iOi:new", KWLIST,
+				   &dfl, &min, &maxobj, &mod))
     goto end;
-  if (dfl < 0 || min < 0) VALERR("key size cannot be negative");
+  if (maxobj == Py_None)
+    max = 0;
+  else {
+    max = PyInt_AsLong(maxobj);
+    if (max == -1 && PyErr_Occurred()) goto end;
+  }
+  if (dfl < 0 || min < 0 || max < 0) VALERR("key size cannot be negative");
   if (min > dfl || (max && dfl > max)) VALERR("bad key size bounds");
   if (mod <= 0 || dfl%mod || min%mod || max%mod)
     VALERR("bad key size modulus");
@@ -187,7 +194,15 @@ end:
 
 static PyObject *kaget_min(PyObject *me, void *hunoz)
   { return (PyInt_FromLong(0)); }
-#define kaget_max kaget_min
+static PyObject *kaget_max(PyObject *me, void *hunoz)
+  { RETURN_NONE; }
+
+static PyObject *krget_max(PyObject *me, void *hunoz)
+{
+  int max = ((keyszrange_pyobj *)me)->max;
+  if (max) return (PyInt_FromLong(max));
+  else RETURN_NONE;
+}
 
 static PyObject *ksget_min(PyObject *me, void *hunoz)
 {
@@ -273,13 +288,19 @@ static const PyGetSetDef keyszany_pygetset[] = {
 static const PyMemberDef keyszrange_pymembers[] = {
 #define MEMBERSTRUCT keyszrange_pyobj
   MEMBER(min,	T_INT,    READONLY, "KSZ.min -> smallest allowed key size")
-  MEMBER(max,	T_INT,	  READONLY, "KSZ.max -> largest allowed key size")
   MEMBER(mod,	T_INT,	  READONLY,
 			    "KSZ.mod -> key size must be a multiple of this")
 #undef MEMBERSTRUCT
   { 0 }
 };
 
+static const PyGetSetDef keyszrange_pygetset[] = {
+#define GETSETNAME(op, name) kr##op##_##name
+  GET	(max,		"KSZ.max -> largest allowed key size")
+#undef GETSETNAME
+  { 0 }
+};
+
 static const PyGetSetDef keyszset_pygetset[] = {
 #define GETSETNAME(op, name) ks##op##_##name
   GET	(min,		"KSZ.min -> smallest allowed key size")
@@ -429,7 +450,7 @@ static const PyTypeObject keyszrange_pytype_skel = {
   0,					/* @tp_iternext@ */
   0,					/* @tp_methods@ */
   PYMEMBERS(keyszrange),		/* @tp_members@ */
-  0,					/* @tp_getset@ */
+  PYGETSET(keyszrange),			/* @tp_getset@ */
   0,					/* @tp_base@ */
   0,					/* @tp_dict@ */
   0,					/* @tp_descr_get@ */
@@ -3063,11 +3084,13 @@ end:
   return (0);
 }
 
-static PyObject *shakemeth_done(PyObject *me, PyObject *arg)
+static PyObject *shakemeth_done(PyObject *me, PyObject *arg, PyObject *kw)
 {
   PyObject *rc = 0;
-  size_t n;
-  if (!PyArg_ParseTuple(arg, "O&:done", convszt, &n)) goto end;
+  size_t n = 100 - SHAKE_H(me)->h.r/2;
+  static const char *const kwlist[] = { "hsz", 0 };
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:done", KWLIST, convszt, &n))
+    goto end;
   if (shake_check(me, 0)) goto end;
   rc = bytestring_pywrap(0, n);
   shake_done(SHAKE_H(me), BIN_PTR(rc), n);
@@ -3147,7 +3170,7 @@ static const PyMethodDef shake_pymethods[] = {
 #undef METHBUF_
   METH	(hashstrz,	"S.hashstrz(STRING)")
   NAMETH(xof,		"S.xof()")
-  METH	(done,		"S.done(LEN) -> H")
+  KWMETH(done,		"S.done([hsz = CAP]) -> H")
   METH	(get,		"S.get(LEN) -> H")
   METH	(mask,		"S.mask(M) -> C")
 #undef METHNAME