math/Makefile.am, symm/Makefile.am: Use `--no-install' on oddball tests.

[catacomb] / symm / ecb-def.h

diff --git a/symm/ecb-def.h b/symm/ecb-def.h
index 9f50292..568ffa1 100644 (file)
--- a/symm/ecb-def.h
+++ b/symm/ecb-def.h
@@ -65,7 +65,9 @@
  * Use:                Creates an implementation for ECB stealing mode.
  */
 
-#define ECB_DEF(PRE, pre)                                              \
+#define ECB_DEF(PRE, pre) ECB_DEFX(PRE, pre, #pre, #pre)
+
+#define ECB_DEFX(PRE, pre, name, fname)                                        \
                                                                        \
 /* --- @pre_ecbsetkey@ --- *                                           \
  *                                                                     \
@@ -354,14 +356,16 @@ static const gcipher_ops gops = {                                 \
 };                                                                     \
                                                                        \
 const gccipher pre##_ecb = {                                           \
-  #pre "-ecb", pre##_keysz, PRE##_BLKSZ,                               \
+  name "-ecb", pre##_keysz, PRE##_BLKSZ,                               \
   ginit                                                                        \
 };                                                                     \
                                                                        \
-ECB_TEST(PRE, pre)
+ECB_TESTX(PRE, pre, name, fname)
 
 /*----- Test rig ----------------------------------------------------------*/
 
+#define ECB_TEST(PRE, pre) ECB_TESTX(PRE, pre, #pre, #pre)
+
 #ifdef TEST_RIG
 
 #include <stdio.h>
@@ -375,7 +379,7 @@ ECB_TEST(PRE, pre)
  * Use:                Standard test rig for ECB functions.
  */
 
-#define ECB_TEST(PRE, pre)                                             \
+#define ECB_TESTX(PRE, pre, name, fname)                               \
                                                                        \
 /* --- Initial plaintext for the test --- */                           \
                                                                        \
@@ -411,7 +415,7 @@ int main(void)                                                              \
   size_t keysz = PRE##_KEYSZ ?                                         \
     PRE##_KEYSZ : strlen((const char *)key);                           \
                                                                        \
-  fputs(#pre "-ecb: ", stdout);                                                \
+  fputs(name "-ecb: ", stdout);                                                \
                                                                        \
   pre##_ecbinit(&ctx, key, keysz, iv);                                 \
                                                                        \
@@ -459,7 +463,7 @@ int main(void)                                                              \
 }
 
 #else
-#  define ECB_TEST(PRE, pre)
+#  define ECB_TESTX(PRE, pre, name, fname)
 #endif
 
 /*----- That's all, folks -------------------------------------------------*/