X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/b817bfc642225b8c3c0b6a7e42d1fb949b61a606..6a7dce9165a4a707382e49877334353618fcad9a:/ecb-def.h

diff --git a/ecb-def.h b/ecb-def.h
index 49a232b..08a25f6 100644
--- a/ecb-def.h
+++ b/ecb-def.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: ecb-def.h,v 1.3 2004/04/08 01:36:15 mdw Exp $
+ * $Id: ecb-def.h,v 1.4 2004/04/17 09:58:37 mdw Exp $
  *
  * Definitions electronic code book mode
  *
  * (c) 1999 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,
@@ -148,11 +148,17 @@ void pre##_ecbencrypt(pre##_ecbctx *ctx,				\
 									\
   while (sz >= 2 * PRE##_BLKSZ || sz == PRE##_BLKSZ) {			\
     uint32 x[PRE##_BLKSZ / 4];						\
-    BLKC_LOAD(PRE, x, s);						\
+    if (!s)								\
+      BLKC_ZERO(PRE, x);						\
+    else {								\
+      BLKC_LOAD(PRE, x, s);						\
+      s += PRE##_BLKSZ;							\
+    }									\
     pre##_eblk(&ctx->ctx, x, x);					\
-    BLKC_STORE(PRE, d, x);						\
-    s += PRE##_BLKSZ;							\
-    d += PRE##_BLKSZ;							\
+    if (d) {								\
+      BLKC_STORE(PRE, d, x);						\
+      d += PRE##_BLKSZ;							\
+    }									\
     sz -= PRE##_BLKSZ;							\
   }									\
 									\
@@ -177,7 +183,12 @@ void pre##_ecbencrypt(pre##_ecbctx *ctx,				\
      * out yet, because I've not read the partial plaintext block.	\
      */									\
 									\
-    BLKC_LOAD(PRE, x, s);						\
+    if (!s)								\
+      BLKC_ZERO(PRE, x);						\
+    else {								\
+      BLKC_LOAD(PRE, x, s);						\
+      s += PRE##_BLKSZ;							\
+    }									\
     pre##_eblk(&ctx->ctx, x, x);					\
     BLKC_STORE(PRE, b, x);						\
 									\
@@ -188,16 +199,15 @@ void pre##_ecbencrypt(pre##_ecbctx *ctx,				\
      * ciphertext block.						\
      */									\
 									\
-    s += PRE##_BLKSZ;							\
-    d += PRE##_BLKSZ;							\
+    if (d) d += PRE##_BLKSZ;						\
     for (i = 0; i < sz; i++) {						\
       register octet y = b[i];						\
       b[i] = s[i];							\
-      d[i] = y;								\
+      if (d) d[i] = y;							\
     }									\
     BLKC_LOAD(PRE, x, b);						\
     pre##_eblk(&ctx->ctx, x, x);					\
-    BLKC_STORE(PRE, d - PRE##_BLKSZ, x);				\
+    if (d) BLKC_STORE(PRE, d - PRE##_BLKSZ, x);				\
   }									\
 									\
   /* --- Done --- */							\
@@ -421,22 +431,22 @@ int main(void)								\
     if (memcmp(pt, text, sizeof(text)) == 0) {				\
       done++;								\
       if (sizeof(text) < 40 || done % 8 == 0)				\
-        fputc('.', stdout);						\
+	fputc('.', stdout);						\
       if (done % 480 == 0)						\
-        fputs("\n\t", stdout);						\
+	fputs("\n\t", stdout);						\
       fflush(stdout);							\
     } else {								\
       printf("\nError (sz = %lu)\n", (unsigned long)sz);		\
       status = 1;							\
       printf("\tplaintext      = "); hexdump(text, sz);			\
-        printf(", "); hexdump(text + sz, rest);				\
-        fputc('\n', stdout);						\
+	printf(", "); hexdump(text + sz, rest);				\
+	fputc('\n', stdout);						\
       printf("\tciphertext     = "); hexdump(ct, sz);			\
-        printf(", "); hexdump(ct + sz, rest);				\
-        fputc('\n', stdout);						\
+	printf(", "); hexdump(ct + sz, rest);				\
+	fputc('\n', stdout);						\
       printf("\trecovered text = "); hexdump(pt, sz);			\
-        printf(", "); hexdump(pt + sz, rest);				\
-        fputc('\n', stdout);						\
+	printf(", "); hexdump(pt + sz, rest);				\
+	fputc('\n', stdout);						\
       fputc('\n', stdout);						\
     }									\
   next:									\