symm/idea.c: Fix key-size descriptor.

[catacomb] / symm / counter-def.h

diff --git a/symm/counter-def.h b/symm/counter-def.h
index 4553679..2744430 100644 (file)
--- a/symm/counter-def.h
+++ b/symm/counter-def.h
@@ -65,7 +65,9 @@
  * Use:                Creates definitions for counter mode.
  */
 
-#define COUNTER_DEF(PRE, pre)                                          \
+#define COUNTER_DEF(PRE, pre) COUNTER_DEFX(PRE, pre, #pre, #pre)
+
+#define COUNTER_DEFX(PRE, pre, name, fname)                            \
                                                                        \
 /* --- @pre_countergetiv@ --- *                                                \
  *                                                                     \
@@ -299,7 +301,7 @@ static const gcipher_ops gops = {                                   \
 };                                                                     \
                                                                        \
 const gccipher pre##_counter = {                                       \
-  #pre "-counter", pre##_keysz, PRE##_BLKSZ,                           \
+  name "-counter", pre##_keysz, PRE##_BLKSZ,                           \
   ginit                                                                        \
 };                                                                     \
                                                                        \
@@ -395,7 +397,7 @@ static void grfill(grand *r, void *p, size_t sz)                    \
 }                                                                      \
                                                                        \
 static const grand_ops grops = {                                       \
-  #pre "-counter",                                                     \
+  name "-counter",                                                     \
   GRAND_CRYPTO, 0,                                                     \
   grmisc, grdestroy,                                                   \
   grword, grbyte, grword, grand_defaultrange, grfill                   \
@@ -420,15 +422,15 @@ grand *pre##_counterrand(const void *k, size_t sz)                        \
   return (&g->r);                                                      \
 }                                                                      \
                                                                        \
-COUNTER_TEST(PRE, pre)
+COUNTER_TESTX(PRE, pre, name, fname)
 
 /*----- Test rig ----------------------------------------------------------*/
 
-#ifdef TEST_RIG
+#define COUNTER_TEST(PRE, pre) COUNTER_TESTX(PRE, pre, #pre, #pre)
 
-#include <stdio.h>
+#ifdef TEST_RIG
 
-#include "daftstory.h"
+#include "modes-test.h"
 
 /* --- @COUNTER_TEST@ --- *
  *
@@ -437,91 +439,30 @@ COUNTER_TEST(PRE, pre)
  * Use:                Standard test rig for counter functions.
  */
 
-#define COUNTER_TEST(PRE, pre)                                         \
-                                                                       \
-/* --- Initial plaintext for the test --- */                           \
-                                                                       \
-static const octet text[] = TEXT;                                      \
-                                                                       \
-/* --- Key and IV to use --- */                                                \
+#define COUNTER_TESTX(PRE, pre, name, fname)                           \
                                                                        \
-static const octet key[] = KEY;                                                \
-static const octet iv[] = IV;                                          \
+static pre##_ctx key;                                                  \
+static pre##_counterctx ctx;                                           \
                                                                        \
-/* --- Buffers for encryption and decryption output --- */             \
+static void pre##_counter_test_setup(const octet *k, size_t ksz)       \
+  { pre##_init(&key, k, ksz); pre##_countersetkey(&ctx, &key); }       \
                                                                        \
-static octet ct[sizeof(text)];                                         \
-static octet pt[sizeof(text)];                                         \
+static void pre##_counter_test_reset(const octet *iv)                  \
+  { pre##_countersetiv(&ctx, iv); }                                    \
                                                                        \
-static void hexdump(const octet *p, size_t sz, size_t off)             \
-{                                                                      \
-  const octet *q = p + sz;                                             \
-  for (sz = 0; p < q; p++, sz++) {                                     \
-    printf("%02x", *p);                                                        \
-    if ((off + sz + 1) % PRE##_BLKSZ == 0)                             \
-      putchar(':');                                                    \
-  }                                                                    \
-}                                                                      \
+static void pre##_counter_test_enc(const octet *s, octet *d, size_t sz)        \
+  { pre##_counterencrypt(&ctx, s, d, sz); }                            \
                                                                        \
-int main(void)                                                         \
+int main(int argc, char *argv[])                                       \
 {                                                                      \
-  size_t sz = 0, rest;                                                 \
-  pre##_counterctx ctx;                                                        \
-  int status = 0;                                                      \
-  int done = 0;                                                                \
-  pre##_ctx k;                                                         \
-                                                                       \
-  size_t keysz = PRE##_KEYSZ ?                                         \
-    PRE##_KEYSZ : strlen((const char *)key);                           \
-                                                                       \
-  fputs(#pre "-counter: ", stdout);                                    \
-                                                                       \
-  pre##_init(&k, key, keysz);                                          \
-  pre##_countersetkey(&ctx, &k);                                       \
-                                                                       \
-  while (sz <= sizeof(text)) {                                         \
-    rest = sizeof(text) - sz;                                          \
-    memcpy(ct, text, sizeof(text));                                    \
-    pre##_countersetiv(&ctx, iv);                                      \
-    pre##_counterencrypt(&ctx, ct, ct, sz);                            \
-    pre##_counterencrypt(&ctx, ct + sz, ct + sz, rest);                        \
-    memcpy(pt, ct, sizeof(text));                                      \
-    pre##_countersetiv(&ctx, iv);                                      \
-    pre##_counterencrypt(&ctx, pt, pt, rest);                          \
-    pre##_counterencrypt(&ctx, pt + rest, pt + rest, sz);              \
-    if (memcmp(pt, text, sizeof(text)) == 0) {                         \
-      done++;                                                          \
-      if (sizeof(text) < 40 || done % 8 == 0)                          \
-       fputc('.', stdout);                                             \
-      if (done % 480 == 0)                                             \
-       fputs("\n\t", stdout);                                          \
-      fflush(stdout);                                                  \
-    } else {                                                           \
-      printf("\nError (sz = %lu)\n", (unsigned long)sz);               \
-      status = 1;                                                      \
-      printf("\tplaintext      = "); hexdump(text, sz, 0);             \
-       printf(", "); hexdump(text + sz, rest, sz);                     \
-       fputc('\n', stdout);                                            \
-      printf("\tciphertext     = "); hexdump(ct, sz, 0);               \
-       printf(", "); hexdump(ct + sz, rest, sz);                       \
-       fputc('\n', stdout);                                            \
-      printf("\trecovered text = "); hexdump(pt, sz, 0);               \
-       printf(", "); hexdump(pt + sz, rest, sz);                       \
-       fputc('\n', stdout);                                            \
-      fputc('\n', stdout);                                             \
-    }                                                                  \
-    if (sz < 63)                                                       \
-      sz++;                                                            \
-    else                                                               \
-      sz += 9;                                                         \
-  }                                                                    \
-                                                                       \
-  fputs(status ? " failed\n" : " ok\n", stdout);                       \
-  return (status);                                                     \
+  return test_encmode(fname "-counter", PRE##_KEYSZ, PRE##_BLKSZ, 1, 0,        \
+                     pre##_counter_test_setup, pre##_counter_test_reset, \
+                     pre##_counter_test_enc, pre##_counter_test_enc,   \
+                     argc, argv);                                      \
 }
 
 #else
-#  define COUNTER_TEST(PRE, pre)
+#  define COUNTER_TESTX(PRE, pre, name, fname)
 #endif
 
 /*----- That's all, folks -------------------------------------------------*/