X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/e3dc2d225ea40a7453ae19ef4d12cf4c001076bd..eee161205f1139ee49e81c8efa33fe18380c917b:/rspit.c diff --git a/rspit.c b/rspit.c index 4622d90..f4f177d 100644 --- a/rspit.c +++ b/rspit.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: rspit.c,v 1.10 2000/08/11 21:34:59 mdw Exp $ + * $Id: rspit.c,v 1.12 2000/10/08 15:49:18 mdw Exp $ * * Spit out random numbers * @@ -30,6 +30,15 @@ /*----- Revision history --------------------------------------------------* * * $Log: rspit.c,v $ + * 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. * @@ -157,7 +166,7 @@ typedef struct gen { const char *help; } gen; -static gen generators[]; +extern gen generators[]; #define CIPHERS \ E(DES, des) \ @@ -1069,7 +1078,7 @@ static grand *gen_opts(unsigned i) /*----- Generators table --------------------------------------------------*/ -static gen generators[] = { +gen generators[] = { { "fibonacci", gen_fib, 0, "[-s SEED]" }, { "lc", gen_lc, 0, @@ -1083,12 +1092,12 @@ static gen generators[] = { { #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,