X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=transform.c;fp=transform.c;h=f55aa447dfd41c1c64c3dfc6b658010057b77d55;hb=20138876b39edc6b9bbcc79789c5aa1a684d3312;hp=8fdf9fd80a350b254bb4e2d7380a31a9babc77f9;hpb=bdd4351ff2fc6dc8b1dad689f751ac46347636cf;p=secnet.git

diff --git a/transform.c b/transform.c
index 8fdf9fd..f55aa44 100644
--- a/transform.c
+++ b/transform.c
@@ -171,6 +171,10 @@ static uint32_t transform_reverse(void *sst, struct buffer_if *buf,
 	return 1;
     }
 
+    if (buf->size < 4 + 16 + 16) {
+	*errmsg="msg too short";
+	return 1;
+    }
 
     /* CBC */
     memset(iv,0,16);
@@ -181,6 +185,7 @@ static uint32_t transform_reverse(void *sst, struct buffer_if *buf,
     /* Assert bufsize is multiple of blocksize */
     if (buf->size&0xf) {
 	*errmsg="msg not multiple of cipher blocksize";
+	return 1;
     }
     serpent_encrypt(&ti->cryptkey,iv,iv);
     for (n=buf->start; n<buf->start+buf->size; n+=16)