X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/12331b2df6b898d74eaee321eda4b0fe703031e5..08bbf9abbe9c665cc27cb6d8e3792b60731c1195:/symm/cfb-def.h

diff --git a/symm/cfb-def.h b/symm/cfb-def.h
index 4f0f38f4..78aa6d98 100644
--- a/symm/cfb-def.h
+++ b/symm/cfb-def.h
@@ -68,7 +68,9 @@
  * Use:		Creates an implementation for CFB mode.
  */
 
-#define CFB_DEF(PRE, pre)						\
+#define CFB_DEF(PRE, pre) CFB_DEFX(PRE, pre, #pre, #pre)
+
+#define CFB_DEFX(PRE, pre, name, fname)					\
 									\
 /* --- @pre_cfbgetiv@ --- *						\
  *									\
@@ -389,14 +391,16 @@ static const gcipher_ops gops = {					\
 };									\
 									\
 const gccipher pre##_cfb = {						\
-  #pre "-cfb", pre##_keysz, PRE##_BLKSZ,				\
+  name "-cfb", pre##_keysz, PRE##_BLKSZ,				\
   ginit									\
 };									\
 									\
-CFB_TEST(PRE, pre)
+CFB_TESTX(PRE, pre, name, fname)
 
 /*----- Test rig ----------------------------------------------------------*/
 
+#define CFB_TEST(PRE, pre) CFB_TESTX(PRE, pre, #pre, #pre)
+
 #ifdef TEST_RIG
 
 #include <stdio.h>
@@ -410,7 +414,7 @@ CFB_TEST(PRE, pre)
  * Use:		Standard test rig for CFB functions.
  */
 
-#define CFB_TEST(PRE, pre)						\
+#define CFB_TESTX(PRE, pre, name, fname)				\
 									\
 /* --- Initial plaintext for the test --- */				\
 									\
@@ -447,7 +451,7 @@ int main(void)								\
   size_t keysz = PRE##_KEYSZ ?						\
     PRE##_KEYSZ : strlen((const char *)key);				\
 									\
-  fputs(#pre "-cfb: ", stdout);						\
+  fputs(name "-cfb: ", stdout);						\
 									\
   pre##_init(&k, key, keysz);						\
   pre##_cfbsetkey(&ctx, &k);						\
@@ -494,7 +498,7 @@ int main(void)								\
 }
 
 #else
-#  define CFB_TEST(PRE, pre)
+#  define CFB_TESTX(PRE, pre, name, fname)
 #endif
 
 /*----- That's all, folks -------------------------------------------------*/