X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/f9e5133271af9c7a63be8584e4c2705adb241bc2..f0c52873e4c1e3a16bb2d5a086df2526f698e4ac:/catcrypt.c

diff --git a/catcrypt.c b/catcrypt.c
index 8468552..d10739d 100644
--- a/catcrypt.c
+++ b/catcrypt.c
@@ -7,7 +7,7 @@
  * (c) 2004 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,12 +15,12 @@
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
- * 
+ *
  * Catacomb is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Library General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Library General Public
  * License along with Catacomb; if not, write to the Free
  * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
@@ -133,12 +133,12 @@ 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;
   size_t seq;
-  char bb[16384];
+  char bb[65536];
   unsigned f = 0;
   key_file kf;
   key *k;
@@ -160,8 +160,8 @@ static int encrypt(int argc, char *argv[])
       { "sign-key",	OPTF_ARGREQ,	0,	's' },
       { "armour",	0,		0,	'a' },
       { "armor",	0,		0,	'a' },
-      { "format", 	OPTF_ARGREQ,	0,	'f' },
-      { "output", 	OPTF_ARGREQ,	0,	'o' },
+      { "format",	OPTF_ARGREQ,	0,	'f' },
+      { "output",	OPTF_ARGREQ,	0,	'o' },
       { "nocheck",	0,		0,	'C' },
       { 0,		0,		0,	0 }
     };
@@ -254,13 +254,14 @@ static int encrypt(int argc, char *argv[])
     buf_init(&b, d.buf, d.len);
     BSTEP(&b, d.len);
     chunk_write(e, &b);
-  }  
+  }
 
   /* --- Now do the main crypto --- */
 
   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);
@@ -352,8 +353,8 @@ static int decrypt(int argc, char *argv[])
       { "verbose",	0,		0,	'v' },
       { "quiet",	0,		0,	'q' },
       { "nocheck",	0,		0,	'C' },
-      { "format", 	OPTF_ARGREQ,	0,	'f' },
-      { "output", 	OPTF_ARGREQ,	0,	'o' },
+      { "format",	OPTF_ARGREQ,	0,	'f' },
+      { "output",	OPTF_ARGREQ,	0,	'o' },
       { 0,		0,		0,	0 }
     };
     i = mdwopt(argc, argv, "abf:o:qvC", opt, 0, 0, 0);
@@ -529,19 +530,18 @@ static int decrypt(int argc, char *argv[])
     if (ferror(rfp) || fclose(rfp))
       die(EXIT_FAILURE, "error unbuffering output: %s", strerror(errno));
   }
-  if (ofp && (fflush(ofp) || ferror(ofp) || fclose(ofp)))
-      die(EXIT_FAILURE, "error writing output: %s", strerror(errno));    
 
   e->ops->decdone(e);
   if (verb && ofp != stdout)
     printf("OK decrypted successfully\n");
+  if (ofp && (fflush(ofp) || ferror(ofp) || fclose(ofp)))
+      die(EXIT_FAILURE, "error writing output: %s", strerror(errno));
   freeenc(e);
   GC_DESTROY(c);
   GC_DESTROY(cx);
   GM_DESTROY(m);
   freekem(km);
   if (fp != stdin) fclose(fp);
-  if (of) fclose(ofp);
   key_close(&kf);
   dstr_destroy(&d);
   return (0);