* 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@ --- * \
* \
}; \
\
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>
* Use: Standard test rig for ECB functions.
*/
-#define ECB_TEST(PRE, pre) \
+#define ECB_TESTX(PRE, pre, name, fname) \
\
/* --- Initial plaintext for the test --- */ \
\
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); \
\
}
#else
-# define ECB_TEST(PRE, pre)
+# define ECB_TESTX(PRE, pre, name, fname)
#endif
/*----- That's all, folks -------------------------------------------------*/