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

[catacomb] / symm / mgf-def.h

diff --git a/symm/mgf-def.h b/symm/mgf-def.h
index 529428f..aad09a4 100644 (file)
--- a/symm/mgf-def.h
+++ b/symm/mgf-def.h
@@ -59,7 +59,9 @@
 
 /*----- Macros ------------------------------------------------------------*/
 
-#define MGF_DEF(PRE, pre)                                              \
+#define MGF_DEF(PRE, pre) MGF_DEFX(PRE, pre, #pre, #pre)
+
+#define MGF_DEFX(PRE, pre, name, fname)                                        \
                                                                        \
 /* --- Useful constants --- */                                         \
                                                                        \
@@ -235,7 +237,7 @@ static const gcipher_ops gops = {                                   \
 };                                                                     \
                                                                        \
 const gccipher pre##_mgf = {                                           \
-  #pre "-mgf", pre##_mgfkeysz, 0,                                      \
+  name "-mgf", pre##_mgfkeysz, 0,                                      \
   ginit                                                                        \
 };                                                                     \
                                                                        \
@@ -324,7 +326,7 @@ static void grfill(grand *r, void *p, size_t sz)                    \
 }                                                                      \
                                                                        \
 static const grand_ops grops = {                                       \
-  #pre "-mgf",                                                         \
+  name "-mgf",                                                         \
   GRAND_CRYPTO, 0,                                                     \
   grmisc, grdestroy,                                                   \
   grword, grbyte, grword, grand_defaultrange, grfill                   \
@@ -349,15 +351,15 @@ extern grand *pre##_mgfrand(const void *k, size_t sz)                     \
   return (&g->r);                                                      \
 }                                                                      \
                                                                        \
-MGF_TEST(PRE, pre)
+MGF_TESTX(PRE, pre, name, fname)
 
 /*----- Test rig ----------------------------------------------------------*/
 
-#ifdef TEST_RIG
+#define MGF_TEST(PRE, pre) MGF_TESTX(PRE, pre, #pre, #pre)
 
-#include <stdio.h>
+#ifdef TEST_RIG
 
-#include "daftstory.h"
+#include "modes-test.h"
 
 /* --- @MGF_TEST@ --- *
  *
@@ -366,87 +368,29 @@ MGF_TEST(PRE, pre)
  * Use:                Standard test rig for MGF functions.
  */
 
-#define MGF_TEST(PRE, pre)                                             \
-                                                                       \
-/* --- Initial plaintext for the test --- */                           \
-                                                                       \
-static const octet text[] = TEXT;                                      \
-                                                                       \
-/* --- Key and IV to use --- */                                                \
+#define MGF_TESTX(PRE, pre, name, fname)                               \
                                                                        \
-static const octet key[] = KEY;                                                \
+static pre##_mgfctx ctx;                                               \
                                                                        \
-/* --- Buffers for encryption and decryption output --- */             \
+static void pre##_mgf_test_setup(const octet *k, size_t ksz)           \
+  { pre##_mgfinit(&ctx, k, ksz); }                                     \
                                                                        \
-static octet ct[sizeof(text)];                                         \
-static octet pt[sizeof(text)];                                         \
+static void pre##_mgf_test_reset(const octet *iv)                      \
+  { pre##_mgfsetindex(&ctx, 0); }                                      \
                                                                        \
-static void hexdump(const octet *p, size_t sz)                         \
-{                                                                      \
-  const octet *q = p + sz;                                             \
-  for (sz = 0; p < q; p++, sz++) {                                     \
-    printf("%02x", *p);                                                        \
-    if ((sz + 1) % PRE##_HASHSZ == 0)                                  \
-      putchar(':');                                                    \
-  }                                                                    \
-}                                                                      \
+static void pre##_mgf_test_enc(const octet *s, octet *d, size_t sz)    \
+  { pre##_mgfencrypt(&ctx, s, d, sz); }                                        \
                                                                        \
-int main(void)                                                         \
+int main(int argc, char *argv[])                                       \
 {                                                                      \
-  size_t sz = 0, rest;                                                 \
-  pre##_mgfctx ctx;                                                    \
-  int status = 0;                                                      \
-  int done = 0;                                                                \
-                                                                       \
-  size_t keysz = strlen((const char *)key);                            \
-                                                                       \
-  fputs(#pre "-mgf: ", stdout);                                                \
-                                                                       \
-  pre##_mgfinit(&ctx, key, keysz);                                     \
-                                                                       \
-  while (sz <= sizeof(text)) {                                         \
-    rest = sizeof(text) - sz;                                          \
-    memcpy(ct, text, sizeof(text));                                    \
-    pre##_mgfsetindex(&ctx, 0);                                                \
-    pre##_mgfencrypt(&ctx, ct, ct, sz);                                        \
-    pre##_mgfencrypt(&ctx, ct + sz, ct + sz, rest);                    \
-    memcpy(pt, ct, sizeof(text));                                      \
-    pre##_mgfsetindex(&ctx, 0);                                                \
-    pre##_mgfencrypt(&ctx, pt, pt, rest);                              \
-    pre##_mgfencrypt(&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);                        \
-       printf(", "); hexdump(text + sz, rest);                         \
-       fputc('\n', stdout);                                            \
-      printf("\tciphertext     = "); hexdump(ct, sz);                  \
-       printf(", "); hexdump(ct + sz, rest);                           \
-       fputc('\n', stdout);                                            \
-      printf("\trecovered text = "); hexdump(pt, sz);                  \
-       printf(", "); hexdump(pt + sz, rest);                           \
-       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 "-mgf", 0, PRE##_HASHSZ, 1, 0,             \
+                     pre##_mgf_test_setup, pre##_mgf_test_reset,       \
+                     pre##_mgf_test_enc, pre##_mgf_test_enc,           \
+                     argc, argv);                                      \
 }
 
 #else
-#  define MGF_TEST(PRE, pre)
+#  define MGF_TESTX(PRE, pre, name, fname)
 #endif
 
 /*----- That's all, folks -------------------------------------------------*/