ct.c, ct.h: New constant-time operations.

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

diff --git a/counter-def.h b/counter-def.h
index e0336a4..129efd9 100644 (file)
--- a/counter-def.h
+++ b/counter-def.h
@@ -1,13 +1,13 @@
 /* -*-c-*-
  *
- * $Id: counter-def.h,v 1.2 2001/06/17 00:10:51 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,29 +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.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
 
@@ -166,7 +155,7 @@ void pre##_counterinit(pre##_counterctx *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##_countersetiv(ctx, iv ? iv : zero);                             \
 }                                                                      \
@@ -222,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)                                            \
@@ -505,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)                                                       \