X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/1da1ed6a5815deef6c33d74f1eb3c856793df3e5..35b1eba81a20fa0b93db161001ad8a46cd0cdc7b:/symm/cbc-def.h?ds=inline

diff --git a/symm/cbc-def.h b/symm/cbc-def.h
index 56c8f054..907a5dba 100644
--- a/symm/cbc-def.h
+++ b/symm/cbc-def.h
@@ -64,7 +64,9 @@
  * Use:		Creates an implementation for CBC stealing mode.
  */
 
-#define CBC_DEF(PRE, pre)						\
+#define CBC_DEF(PRE, pre) CBC_DEFX(PRE, pre, #pre, #pre)
+
+#define CBC_DEFX(PRE, pre, name, fname)					\
 									\
 /* --- @pre_cbcgetiv@ --- *						\
  *									\
@@ -430,14 +432,16 @@ static const gcipher_ops gops = {					\
 };									\
 									\
 const gccipher pre##_cbc = {						\
-  #pre "-cbc", pre##_keysz, PRE##_BLKSZ,				\
+  name "-cbc", pre##_keysz, PRE##_BLKSZ,				\
   ginit									\
 };									\
 									\
-CBC_TEST(PRE, pre)
+CBC_TESTX(PRE, pre, name, fname)
 
 /*----- Test rig ----------------------------------------------------------*/
 
+#define CBC_TEST(PRE, pre) CBC_TESTX(PRE, pre, #pre, #pre)
+
 #ifdef TEST_RIG
 
 #include <stdio.h>
@@ -451,7 +455,7 @@ CBC_TEST(PRE, pre)
  * Use:		Standard test rig for CBC functions.
  */
 
-#define CBC_TEST(PRE, pre)						\
+#define CBC_TESTX(PRE, pre, name, fname)				\
 									\
 /* --- Initial plaintext for the test --- */				\
 									\
@@ -488,7 +492,7 @@ int main(void)								\
   size_t keysz = PRE##_KEYSZ ?						\
     PRE##_KEYSZ : strlen((const char *)key);				\
 									\
-  fputs(#pre "-cbc: ", stdout);						\
+  fputs(name "-cbc: ", stdout);						\
 									\
   pre##_init(&k, key, keysz);						\
   pre##_cbcsetkey(&ctx, &k);						\
@@ -535,7 +539,7 @@ int main(void)								\
 }
 
 #else
-#  define CBC_TEST(PRE, pre)
+#  define CBC_TESTX(PRE, pre, name, fname)
 #endif
 
 /*----- That's all, folks -------------------------------------------------*/