From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 7 May 2017 19:01:47 +0000 (+0100)
Subject: algorithms.c: Check whether `setiv' and `bdry' are implemented before calling.
X-Git-Tag: 1.2.0~22
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/catacomb-python/commitdiff_plain/30eef666012c79fa5cef125e2f6595167b4ed326

algorithms.c: Check whether `setiv' and `bdry' are implemented before calling.

Oops, easy segfault.
---

diff --git a/algorithms.c b/algorithms.c
index cb594ca..5b4f14b 100644
--- a/algorithms.c
+++ b/algorithms.c
@@ -566,6 +566,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 +578,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;