hashsum.c: Document `--progress' in the `--help' display.

[u/mdw/catacomb] / ofb-def.h

diff --git a/ofb-def.h b/ofb-def.h
index 9bc69e8..8250395 100644 (file)
--- a/ofb-def.h
+++ b/ofb-def.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: ofb-def.h,v 1.5 2001/06/17 00:10:51 mdw Exp $
+ * $Id: ofb-def.h,v 1.7 2004/04/08 01:36:15 mdw Exp $
  *
  * Definitions for output feedback mode
  *
  * (c) 1999 Straylight/Edgeware
  */
 
-/*----- Licensing notice --------------------------------------------------* 
+/*----- Licensing notice --------------------------------------------------*
  *
  * This file is part of Catacomb.
  *
@@ -15,38 +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: ofb-def.h,v $
- * Revision 1.5  2001/06/17 00:10:51  mdw
- * Typesetting fixes
- *
- * Revision 1.4  2001/04/03 19:36:36  mdw
- * Don't use @va_arg@ as an argument to @STORE32@!
- *
- * Revision 1.3  2000/06/17 11:48:02  mdw
- * Use secure arena for memory allocation.  Rearrange setiv slightly.
- *
- * Revision 1.2  1999/12/13 15:34:01  mdw
- * Add support for seeding from a generic pseudorandom source.
- *
- * Revision 1.1  1999/12/10 23:16:40  mdw
- * Split mode macros into interface and implementation.
- *
- */
-
 #ifndef CATACOMB_OFB_DEF_H
 #define CATACOMB_OFB_DEF_H
 
@@ -182,7 +162,7 @@ void pre##_ofbinit(pre##_ofbctx *ctx,                                       \
                     const void *key, size_t sz,                        \
                     const void *iv)                                    \
 {                                                                      \
-  static octet zero[PRE##_BLKSZ] = { 0 };                              \
+  static const octet zero[PRE##_BLKSZ] = { 0 };                                \
   pre##_init(&ctx->ctx, key, sz);                                      \
   pre##_ofbsetiv(ctx, iv ? iv : zero);                                 \
 }                                                                      \
@@ -526,22 +506,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)                                                       \