X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/6b54260d1f5312a3ec58be3ee1eb168ddf9cf2e2..457b4e971a2795898c83a53ae4c27d6a893690d1:/algorithms.c

diff --git a/algorithms.c b/algorithms.c
index 3f9d4b7..5703901 100644
--- a/algorithms.c
+++ b/algorithms.c
@@ -35,21 +35,31 @@ PyTypeObject *keysz_pytype;
 PyTypeObject *keyszany_pytype, *keyszrange_pytype, *keyszset_pytype;
 PyObject *sha_pyobj, *has160_pyobj;
 
+#ifndef KSZ_OPMASK
+#  define KSZ_OPMASK 0x1f
+#endif
+
+#ifndef KSZ_16BIT
+#  define KSZ_16BIT 0x20
+#endif
+
 PyObject *keysz_pywrap(const octet *k)
 {
-  switch (k[0]) {
+  unsigned op = *k++;
+#define ARG(i) (op&KSZ_16BIT ? LOAD16(k + 2*(i)) : k[i])
+  switch (op&KSZ_OPMASK) {
     case KSZ_ANY: {
       keysz_pyobj *o = PyObject_New(keysz_pyobj, keyszany_pytype);
-      o->dfl = k[1];
+      o->dfl = ARG(0);
       return ((PyObject *)o);
     } break;
     case KSZ_RANGE: {
       keyszrange_pyobj *o =
 	PyObject_New(keyszrange_pyobj, keyszrange_pytype);
-      o->dfl = k[1];
-      o->min = k[2];
-      o->max = k[3];
-      o->mod = k[4];
+      o->dfl = ARG(0);
+      o->min = ARG(1);
+      o->max = ARG(2);
+      o->mod = ARG(3);
       if (!o->mod) o->mod = 1;
       return ((PyObject *)o);
     } break;
@@ -57,16 +67,17 @@ PyObject *keysz_pywrap(const octet *k)
       keyszset_pyobj *o =
 	PyObject_New(keyszset_pyobj, keyszset_pytype);
       int i, n;
-      o->dfl = k[1];
-      for (i = 0; k[i + 1]; i++) ;
+      o->dfl = ARG(0);
+      for (i = 0; ARG(i); i++) ;
       n = i; o->set = PyTuple_New(n);
       for (i = 0; i < n; i++)
-	PyTuple_SET_ITEM(o->set, i, PyInt_FromLong(k[i + 1]));
+	PyTuple_SET_ITEM(o->set, i, PyInt_FromLong(ARG(i)));
       return ((PyObject *)o);
     } break;
     default:
       abort();
   }
+#undef ARG
 }
 
 static PyObject *keyszany_pynew(PyTypeObject *ty,
@@ -566,6 +577,7 @@ static PyObject *gcmeth_setiv(PyObject *me, PyObject *arg)
   Py_ssize_t sz;
 
   if (!PyArg_ParseTuple(arg, "s#:setiv", &p, &sz)) goto end;
+  if (!GCIPHER_C(me)->ops->setiv) VALERR("`setiv' not supported");
   if (!GC_CLASS(GCIPHER_C(me))->blksz) VALERR("not a block cipher mode");
   if (sz != GC_CLASS(GCIPHER_C(me))->blksz) VALERR("bad IV length");
   GC_SETIV(GCIPHER_C(me), p);
@@ -577,6 +589,7 @@ end:
 static PyObject *gcmeth_bdry(PyObject *me, PyObject *arg)
 {
   if (!PyArg_ParseTuple(arg, ":bdry")) goto end;
+  if (!GCIPHER_C(me)->ops->bdry) VALERR("`bdry' not supported");
   if (!GC_CLASS(GCIPHER_C(me))->blksz) VALERR("not a block cipher mode");
   GC_BDRY(GCIPHER_C(me));
   RETURN_ME;
@@ -1297,7 +1310,7 @@ static PyObject *polymeth_hash(PyObject *me, PyObject *arg)
     uint##n x;								\
     octet b[SZ_##W];							\
     if (!PyArg_ParseTuple(arg, "O&:hashu" #w, convu##n, &x)) goto end;	\
-    STORE##W(b, n); poly1305_hash(P1305_CTX(me), b, sizeof(b));		\
+    STORE##W(b, x); poly1305_hash(P1305_CTX(me), b, sizeof(b));		\
     RETURN_ME;								\
   end:									\
     return (0);								\
@@ -1312,7 +1325,7 @@ DOUINTCONV(POLYMETH_HASHU_)
     octet b[SZ_##W];							\
     if (!PyArg_ParseTuple(arg, "s#:hashbuf" #w, &p, &sz)) goto end;	\
     if (sz > MASK##n) TYERR("string too long");				\
-    STORE##W(b, n); poly1305_hash(P1305_CTX(me), b, sizeof(b));		\
+    STORE##W(b, sz); poly1305_hash(P1305_CTX(me), b, sizeof(b));	\
     poly1305_hash(P1305_CTX(me), p, sz);				\
     RETURN_ME;								\
   end:									\
@@ -1335,6 +1348,13 @@ static PyObject *polymeth_flush(PyObject *me, PyObject *arg)
   RETURN_ME;
 }
 
+static PyObject *polymeth_flushzero(PyObject *me, PyObject *arg)
+{
+  if (!PyArg_ParseTuple(arg, ":flushzero")) return (0);
+  poly1305_flushzero(P1305_CTX(me));
+  RETURN_ME;
+}
+
 static PyObject *polymeth_concat(PyObject *me, PyObject *arg)
 {
   PyObject *pre, *suff;
@@ -1385,6 +1405,7 @@ static PyMethodDef poly1305hash_pymethods[] = {
 #undef METHBUF_
   METH	(hashstrz,		"P.hashstrz(STRING)")
   METH  (flush,			"P.flush()")
+  METH  (flushzero,		"P.flushzero()")
   METH  (concat,		"P.concat(PREFIX, SUFFIX)")
   METH	(done,			"P.done() -> TAG")
 #undef METHNAME