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