X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/4e66da02f19648ee1be862e67ba1d1fc5549fb7f..d4bb7fded5f9a4b0db99f82e88f22effe94f2ff7:/counter-def.h

diff --git a/counter-def.h b/counter-def.h
index e9ee952..129efd9 100644
--- a/counter-def.h
+++ b/counter-def.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: counter-def.h,v 1.3 2004/04/02 01:03:49 mdw Exp $
+ * $Id: counter-def.h,v 1.4 2004/04/08 01:36:15 mdw Exp $
  *
  * Block cipher counter mode (or long cycle mode)
  *
  * (c) 2000 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,32 +15,18 @@
  * 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,
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: counter-def.h,v $
- * Revision 1.3  2004/04/02 01:03:49  mdw
- * Miscellaneous constification.
- *
- * Revision 1.2  2001/06/17 00:10:51  mdw
- * Typesetting fixes
- *
- * Revision 1.1  2000/06/17 10:51:42  mdw
- * Counter mode ciphers and pseudo-random generator.
- *
- */
-
 #ifndef CATACOMB_COUNTER_DEF_H
 #define CATACOMB_COUNTER_DEF_H
 
@@ -225,7 +211,7 @@ void pre##_counterencrypt(pre##_counterctx *ctx,			\
   {									\
     uint32 n[PRE##_BLKSZ / 4];						\
 									\
-    for (;;) {  							\
+    for (;;) {								\
       pre##_eblk(&ctx->ctx, ctx->n, n);					\
       BLKC_STEP(PRE, ctx->n);						\
       if (sz < PRE##_BLKSZ)						\
@@ -508,22 +494,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);						\
     }									\
     if (sz < 63)							\