buffer.c, ec.c: Fix required size for EC `buffer' encoding.

[catacomb-python] / algorithms.c

diff --git a/algorithms.c b/algorithms.c
index 0f05f75..d60fe3e 100644 (file)
--- a/algorithms.c
+++ b/algorithms.c
@@ -209,7 +209,7 @@ static PyMemberDef keysz_pymembers[] = {
 static PyGetSetDef keyszany_pygetset[] = {
 #define GETSETNAME(op, name) ka##op##_##name
   GET  (min,                   "KSZ.min -> smallest allowed key size")
-  GET  (max,                   "KSZ.min -> largest allowed key size")
+  GET  (max,                   "KSZ.max -> largest allowed key size")
 #undef GETSETNAME
   { 0 }
 };
@@ -217,7 +217,7 @@ static PyGetSetDef keyszany_pygetset[] = {
 static PyMemberDef keyszrange_pymembers[] = {
 #define MEMBERSTRUCT keyszrange_pyobj
   MEMBER(min, T_INT, READONLY, "KSZ.min -> smallest allowed key size")
-  MEMBER(max, T_INT, READONLY, "KSZ.min -> largest 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
@@ -227,7 +227,7 @@ static PyMemberDef keyszrange_pymembers[] = {
 static PyGetSetDef keyszset_pygetset[] = {
 #define GETSETNAME(op, name) ks##op##_##name
   GET  (min,                   "KSZ.min -> smallest allowed key size")
-  GET  (max,                   "KSZ.min -> largest allowed key size")
+  GET  (max,                   "KSZ.max -> largest allowed key size")
 #undef GETSETNAME
   { 0 }
 };
@@ -1568,7 +1568,7 @@ static PyTypeObject poly1305hash_pytype_skel = {
     if (!PyArg_ParseTuple(arg, "s#s#:" #hdance "_prf",                 \
                          &k, &ksz, &n, &nsz))                          \
       goto end;                                                                \
-    if (ksz != DANCE##_KEYSZ) VALERR("bad key length");                        \
+    if (ksz != keysz(ksz, dance##_keysz)) VALERR("bad key length");    \
     if (nsz != HDANCE##_INSZ) VALERR("bad input length");              \
     rc = bytestring_pywrap(0, HSALSA20_OUTSZ);                         \
     dance##_init(&dance, k, ksz, 0);                                   \
@@ -1645,7 +1645,7 @@ static PyObject *kxvikmeth_extract(PyObject *me, PyObject *arg)
   unsigned i;
   unsigned n;
 
-  if (!PyArg_ParseTuple(arg, "O&:mix", convuint, &n)) goto end;
+  if (!PyArg_ParseTuple(arg, "O&:extract", convuint, &n)) goto end;
   if (n > 200) VALERR("out of range");
   rc = bytestring_pywrap(0, n);
   q = (octet *)PyString_AS_STRING(rc);
@@ -1675,10 +1675,14 @@ static int kxvikset_nround(PyObject *me, PyObject *val, void *hunoz)
 {
   kxvik_pyobj *k = (kxvik_pyobj *)me;
   unsigned n;
+  int rc = -1;
 
-  if (!convuint(val, &n)) return (-1);
+  if (!val) NIERR("__del__");
+  if (!convuint(val, &n)) goto end;
   k->n = n;
-  return (0);
+  rc = 0;
+end:
+  return (rc);
 }
 
 static PyGetSetDef kxvik_pygetset[] = {
@@ -1876,7 +1880,7 @@ static PyObject *shakemeth_copy(PyObject *me, PyObject *arg)
   rc->h = *SHAKE_H(me);
   rc->st = SHAKE_ST(me);
 end:
-  return ((PyObject *)me);
+  return ((PyObject *)rc);
 }
 
 static PyObject *shakemeth_get(PyObject *me, PyObject *arg)