X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/8cd9f01dac408893755906282d79284c1ee7ddd6..f52f2db067dc1388b16ab00ddb53e26a381a6e3e:/catcrypt.c?ds=sidebyside diff --git a/catcrypt.c b/catcrypt.c index a1e3495..6e4f245 100644 --- a/catcrypt.c +++ b/catcrypt.c @@ -133,7 +133,7 @@ static int encrypt(int argc, char *argv[]) const char *err; int i; int en; - size_t n; + size_t n, chsz; dstr d = DSTR_INIT; octet *tag, *ct; buf b; @@ -261,6 +261,7 @@ static int encrypt(int argc, char *argv[]) assert(GC_CLASS(c)->blksz <= sizeof(bb)); dstr_ensure(&d, sizeof(bb) + GM_CLASS(m)->hashsz); seq = 0; + chsz = MASK16 - GM_CLASS(m)->hashsz; for (;;) { h = GM_INIT(m); GH_HASHU32(h, seq); @@ -269,7 +270,7 @@ static int encrypt(int argc, char *argv[]) GC_ENCRYPT(cx, 0, bb, GC_CLASS(c)->blksz); GC_SETIV(c, bb); } - n = fread(bb, 1, sizeof(bb), fp); + n = fread(bb, 1, chsz, fp); if (!n) break; buf_init(&b, d.buf, d.sz); tag = buf_get(&b, GM_CLASS(m)->hashsz);