Miscellaneous constification.

[u/mdw/catacomb] / blkc.h

diff --git a/blkc.h b/blkc.h
index 1debf54..5a7d3ec 100644 (file)
--- a/blkc.h
+++ b/blkc.h
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: blkc.h,v 1.3 2000/06/17 10:47:06 mdw Exp $
+ * $Id: blkc.h,v 1.6 2004/04/02 01:03:49 mdw Exp $
  *
  * Common definitions for block ciphers
  *
@@ -30,6 +30,17 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: blkc.h,v $
+ * Revision 1.6  2004/04/02 01:03:49  mdw
+ * Miscellaneous constification.
+ *
+ * Revision 1.5  2001/05/07 17:28:42  mdw
+ * Support block ciphers with larger blocks.
+ *
+ * Revision 1.4  2001/04/29 17:39:15  mdw
+ * Removed `-sched' tests.  Reorganized so that we can theoretically have
+ * multiple tests in the same file.  (This isn't so useful in production,
+ * but it's handy when doing test builds.)
+ *
  * Revision 1.3  2000/06/17 10:47:06  mdw
  * Slight support for 96-bit ciphers.  Support for counter-mode ciphers.
  *
@@ -206,6 +217,16 @@
 #define BLKC_SKEL_128(PRE, decl, op, guts)                             \
   BLKC_SKEL(PRE, decl, guts(op, 0); guts(op, 1); guts(op, 2); guts(op, 3);)
 
+#define BLKC_SKEL_192(PRE, decl, op, guts)                             \
+  BLKC_SKEL(PRE, decl,                                                 \
+           guts(op, 0); guts(op, 1); guts(op, 2); guts(op, 3);         \
+           guts(op, 4); guts(op, 5);)
+
+#define BLKC_SKEL_256(PRE, decl, op, guts)                             \
+  BLKC_SKEL(PRE, decl,                                                 \
+           guts(op, 0); guts(op, 1); guts(op, 2); guts(op, 3);         \
+           guts(op, 4); guts(op, 5); guts(op, 6); guts(op, 7);)
+
 #define BLKC_STORE_GUTS(op, i) op(_p + 4 * i, _w[i])
 #define BLKC_XSTORE_GUTS(op, i) op(_p + 4 * i, _w[i] ^ _wx[i])
 #define BLKC_LOAD_GUTS(op, i) _w[i] = op(_p + 4 * i)
@@ -252,9 +273,9 @@
 #include <mLib/quis.h>
 #include <mLib/testrig.h>
 
-#define BLKC_TEST(PRE, pre)                                            \
+#define BLKC_VERIFY(PRE, pre)                                          \
                                                                        \
-static int verify(dstr *v)                                             \
+static int pre##_verify(dstr *v)                                       \
 {                                                                      \
   pre##_ctx k;                                                         \
   uint32 p[PRE##_BLKSZ / 4];                                           \
@@ -306,11 +327,14 @@ static int verify(dstr *v)                                                \
   /* --- Return --- */                                                 \
                                                                        \
   return (ok);                                                         \
-}                                                                      \
+}
+
+#define BLKC_TEST(PRE, pre)                                            \
+                                                                       \
+BLKC_VERIFY(PRE, pre)                                                  \
                                                                        \
-static test_chunk defs[] = {                                           \
-  { #pre, verify, { &type_hex, &type_hex, &type_hex, 0 } },            \
-  { #pre "-sched", verify, { &type_hex, &type_hex, &type_hex, 0 } },   \
+static const test_chunk defs[] = {                                     \
+  { #pre, pre##_verify, { &type_hex, &type_hex, &type_hex, 0 } },      \
   { 0, 0, { 0 } }                                                      \
 };                                                                     \
                                                                        \
@@ -321,6 +345,7 @@ int main(int argc, char *argv[])                                    \
 }
 
 #else
+#  define BLKC_VERIFY(PRE, pre)
 #  define BLKC_TEST(PRE, pre)
 #endif