X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/f57c6d857b5f74a257bf140225260dd146cc04fa..d3187d77683cc7c81be53c12386630debeccb20b:/rspit.c diff --git a/rspit.c b/rspit.c index 57a27ca..26fd888 100644 --- a/rspit.c +++ b/rspit.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: rspit.c,v 1.11 2000/10/08 12:10:32 mdw Exp $ + * $Id: rspit.c,v 1.14 2001/02/21 20:03:22 mdw Exp $ * * Spit out random numbers * @@ -30,6 +30,16 @@ /*----- 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 @@ -143,6 +153,7 @@ #include "square-counter.h" #include "serpent-counter.h" +#include "md2-mgf.h" #include "md4-mgf.h" #include "md5-mgf.h" #include "sha-mgf.h" @@ -183,6 +194,7 @@ extern gen generators[]; E(SERPENT, serpent) #define HASHES \ + E(MD2, md2) \ E(MD4, md4) \ E(MD5, md5) \ E(SHA, sha) \ @@ -234,14 +246,12 @@ static char **argv; 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 ------------------------------------------------------*/ @@ -1304,7 +1314,7 @@ int main(int ac, char *av[]) if (argc > 1 && *argv[1] != '-') { const char *arg = av[1]; size_t sz = strlen(arg); - gen *gg = 0; + gen *gg; g = 0; for (gg = generators; gg->name; gg++) {