X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/c5885da83814455af8341d1697d6848ddb0c1a91..b817bfc642225b8c3c0b6a7e42d1fb949b61a606:/blkc.h

diff --git a/blkc.h b/blkc.h
index 1debf54..dfbd4f7 100644
--- 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.7 2004/04/08 01:36:15 mdw Exp $
  *
  * Common definitions for block ciphers
  *
@@ -27,20 +27,6 @@
  * MA 02111-1307, USA.
  */
 
-/*----- Revision history --------------------------------------------------* 
- *
- * $Log: blkc.h,v $
- * Revision 1.3  2000/06/17 10:47:06  mdw
- * Slight support for 96-bit ciphers.  Support for counter-mode ciphers.
- *
- * Revision 1.2  1999/12/10 23:29:48  mdw
- * Change header file guard names.
- *
- * Revision 1.1  1999/09/03 08:41:11  mdw
- * Initial import.
- *
- */
-
 #ifndef CATACOMB_BLKC_H
 #define CATACOMB_BLKC_H
 
@@ -206,6 +192,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 +248,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 +302,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 +320,7 @@ int main(int argc, char *argv[])					\
 }
 
 #else
+#  define BLKC_VERIFY(PRE, pre)
 #  define BLKC_TEST(PRE, pre)
 #endif