/* -*-c-*-
*
- * $Id: rspit.c,v 1.10 2000/08/11 21:34:59 mdw Exp $
+ * $Id: rspit.c,v 1.14 2001/02/21 20:03:22 mdw Exp $
*
* Spit out random numbers
*
/*----- Revision history --------------------------------------------------*
*
* $Log: rspit.c,v $
+ * Revision 1.14 2001/02/21 20:03:22 mdw
+ * Added support for MD2 hash function.
+ *
+ * Revision 1.13 2000/12/06 20:33:27 mdw
+ * Make flags be macros rather than enumerations, to ensure that they're
+ * unsigned.
+ *
+ * Revision 1.12 2000/10/08 15:49:18 mdw
+ * Remove failed kludge for shutting up a warning.
+ *
+ * Revision 1.11 2000/10/08 12:10:32 mdw
+ * Make table have external linkage to bodge around deficiency in C. The
+ * problem is that @static gen generators[];@ is considered to be a
+ * `tentative definition', and therefore mustn't have incomplete type,
+ * which it obviously has.
+ *
* Revision 1.10 2000/08/11 21:34:59 mdw
* New restartable interface to Maurer testing.
*
#include "square-counter.h"
#include "serpent-counter.h"
+#include "md2-mgf.h"
#include "md4-mgf.h"
#include "md5-mgf.h"
#include "sha-mgf.h"
const char *help;
} gen;
-static gen generators[];
+extern gen generators[];
#define CIPHERS \
E(DES, des) \
E(SERPENT, serpent)
#define HASHES \
+ E(MD2, md2) \
E(MD4, md4) \
E(MD5, md5) \
E(SHA, sha) \
static unsigned flags = 0;
-enum {
- f_progress = 1,
- f_file = 2,
- f_fips = 4,
- f_maurer = 8,
- f_timer = 16,
- f_discard = 32
-};
+#define f_progress 1u
+#define f_file 2u
+#define f_fips 4u
+#define f_maurer 8u
+#define f_timer 16u
+#define f_discard 32u
/*----- Help options ------------------------------------------------------*/
/*----- Generators table --------------------------------------------------*/
-static gen generators[] = {
+gen generators[] = {
{ "fibonacci", gen_fib, 0,
"[-s SEED]" },
{ "lc", gen_lc, 0,
{ #pre "-counter", gen_counter, CIPHER_##PRE, \
"[-k KEY-PHRASE] [-H HEX-KEY] [-i HEX-IV]" },
CIPHERS
-#undef E(PRE, pre)
+#undef E
#define E(PRE, pre) \
{ #pre "-mgf", gen_mgf, HASH_##PRE, \
"[-k KEY-PHRASE] [-H HEX-KEY] [-i INDEX]" },
HASHES
-#undef E(PRE, pre)
+#undef E
{ "rc4", gen_rc4, 0,
"[-k KEY-PHRASE] [-H HEX-KEY]" },
{ "seal", gen_seal, 0,