/* -*-c-*-
*
- * $Id: rspit.c,v 1.7 2000/07/18 23:01:26 mdw Exp $
+ * $Id: rspit.c,v 1.11 2000/10/08 12:10:32 mdw Exp $
*
* Spit out random numbers
*
/*----- Revision history --------------------------------------------------*
*
* $Log: rspit.c,v $
+ * 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.
+ *
+ * Revision 1.9 2000/08/04 23:24:15 mdw
+ * Add a timer and a discard option.
+ *
+ * Revision 1.8 2000/07/29 22:05:47 mdw
+ * Fix error in help message about Maurer test syntax.
+ *
* Revision 1.7 2000/07/18 23:01:26 mdw
* Improve progress indications, and allow user to choose chunk sizes for
* Maurer's test.
const char *help;
} gen;
-static gen generators[];
+extern gen generators[];
#define CIPHERS \
E(DES, des) \
f_progress = 1,
f_file = 2,
f_fips = 4,
- f_maurer = 8
+ f_maurer = 8,
+ f_timer = 16,
+ f_discard = 32
};
/*----- Help options ------------------------------------------------------*/
-l, --list Show a list of the supported generators, with\n\
their options.\n\
-f, --fipstest Run the FIPS 140-1 randomness test.\n\
--m, --maurer[=LO,HI] Run Maurer's universal statistical test.\n\
+-m, --maurer[=LO-HI] Run Maurer's universal statistical test.\n\
-o, --output FILE Write output to FILE, not stdout.\n\
-z, --size SIZE Emit SIZE bytes, not an unlimited number.\n\
-p, --progress Show a little progress meter (on stderr).\n\
+-T, --timer Keep track of the CPU time used by the generator.\n\
+-d, --discard Discard the generated output.\n\
\n\
(A SIZE may be followed by `g' for gigabytes, `m' for megabytes, or\n\
`k' for kilobytes. If unqualified, an amount in bytes is assumed.)\n\
{ "output", OPTF_ARGREQ, 0, 'o' },
{ "size", OPTF_ARGREQ, 0, 'z' },
{ "progress", 0, 0, 'p' },
+ { "timer", 0, 0, 'T' },
+ { "discard", 0, 0, 'd' },
/* --- End of main table --- */
{ 0, 0, 0, 0 }
};
-static const char *sopts = "hvu lfm::o:z:p";
+static const char *sopts = "hvu lfm::o:z:pTd";
#ifndef OPTION_V
DA_DECL(option_v, struct option);
char *p;
unsigned long lo, hi;
lo = strtoul(optarg, &p, 0);
- if (*p == '-')
+ if (*p == '-' || *p == ',')
hi = strtoul(p + 1, &p, 0);
else
hi = lo;
case 'p':
flags |= f_progress;
break;
+ case 'T':
+ flags |= f_timer;
+ break;
+ case 'd':
+ flags |= f_discard;
+ break;
default:
return (i);
}
/*----- 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,
return (0);
}
+typedef struct genmaurer_ctx {
+ size_t n;
+ maurer_ctx *m;
+} genmaurer_ctx;
+
+static int genmaurer(const void *buf, size_t sz, void *p)
+{
+ genmaurer_ctx *g = p;
+ size_t i;
+
+ for (i = 0; i < g->n; i++)
+ maurer_test(&g->m[i], buf, sz);
+ return (0);
+}
+
static int generate(grand *r, size_t outsz,
int (*func)(const void *buf, size_t sz, void *p),
void *p)
{
+ static char kmg[] = { ' ', 'k', 'M', 'G', 'T', 'P', 'E', 'Z', 'Y', 0 };
+
unsigned percent = 0;
size_t kb = 0;
time_t last;
static char baton[] = "-\\|/";
char *bp;
int rc;
+ clock_t clk = 0;
/* --- Spit out random data --- */
signal(SIGPIPE, SIG_IGN);
#endif
- for (;;) {
+ do {
octet buf[BUFSIZ];
size_t sz = sizeof(buf);
+ clock_t c_start, c_stop;
/* --- Emit a bufferful (or less) of data --- */
if (sz > outsz - kb)
sz = outsz - kb;
}
+ c_start = clock();
r->ops->fill(r, buf, sz);
- if ((rc = func(buf, sz, p)) != 0)
+ c_stop = clock();
+ clk += c_stop - c_start;
+ if (func && (rc = func(buf, sz, p)) != 0)
return (rc);
kb += sz;
if (up) {
size_t q = kb;
- char *suff = " KMG";
- while (q > 8192 && suff[1]) {
+ char *kk = kmg;
+ while (q > 8192 && kk[1]) {
q >>= 10;
- suff++;
+ kk++;
}
- fprintf(stderr, "%4i%c\r[", q, *suff);
+ fprintf(stderr, "%4i%c\r[", q, *kk);
if (outsz) {
unsigned pc;
for (pc = 0; pc < (percent & ~1); pc += 2)
/* --- Terminate the loop --- */
- if (outsz && kb >= outsz)
- break;
- }
+ } while (!outsz || kb < outsz);
if (flags & f_progress)
fputc('\n', stderr);
+ if (flags & f_timer) {
+ fprintf(stderr, "generated %lu bytes ", (unsigned long)outsz);
+ if (!clk)
+ fputs("too quickly to measure\n", stderr);
+ else {
+ char *kk;
+ double sec = (double)clk/CLOCKS_PER_SEC;
+ double bps = (outsz << 3)/sec;
+ for (kk = kmg; bps > 1024 && kk[1]; kk++, bps /= 1024)
+ ;
+ fprintf(stderr, "in %g secs (%g %cb/s)\n", sec, bps, *kk);
+ }
+ }
return (0);
}
if (argc > 1 && *argv[1] != '-') {
const char *arg = av[1];
size_t sz = strlen(arg);
- gen *gg;
+ gen *gg = 0;
g = 0;
for (gg = generators; gg->name; gg++) {
if (rc & FIPSTEST_LONGRUNS)
moan("failed long runs test");
if (!rc && (flags & f_progress))
- puts("test passed");
+ fputs("test passed\n", stderr);
return (rc ? EXIT_FAILURE : 0);
}
/* --- Do Maurer's test --- */
if (flags & f_maurer) {
- octet *buf;
size_t bufsz;
unsigned i;
unsigned rc = 0;
- unsigned f = 0, jj = 0;
- double maxz = 0;
- octet *p;
+ genmaurer_ctx g;
static struct { double x; const char *sig; } sigtab[] = {
{ 3.2905, "1e-3" },
{ 0 , 0 }
};
+ g.n = maurer_hi - maurer_lo + 1;
+ g.m = xmalloc(g.n * sizeof(maurer_ctx));
+ for (i = 0; i < g.n; i++)
+ maurer_init(&g.m[i], i + maurer_lo);
bufsz = (100 * maurer_hi) << maurer_hi;
- if ((buf = a_alloc(arena_global, bufsz)) == 0)
- die(EXIT_FAILURE, "not enough memory for data buffer");
- p = buf;
- generate(r, bufsz, genbuf, &p);
+
+ generate(r, bufsz, genmaurer, &g);
for (i = maurer_lo; i <= maurer_hi; i++) {
- double z = maurer(buf, bufsz, i);
+ double z = maurer_done(&g.m[i - maurer_lo]);
double zz = fabs(z);
unsigned j;
for (j = 0; sigtab[j].sig; j++) {
if (zz > sigtab[j].x) {
- if (zz > fabs(maxz)) {
- maxz = z;
- f = i;
- jj = j;
- }
rc = EXIT_FAILURE;
moan("failed, bits = %u, sig = %s, Z_u = %g",
i, sigtab[j].sig, z);
}
}
if (flags & f_progress)
- printf("bits = %u, Z_u = %g\n", i, z);
+ fprintf(stderr, "bits = %u, Z_u = %g\n", i, z);
}
+ xfree(g.m);
return (rc);
}
+ /* --- Discard --- */
+
+ if (flags & f_discard) {
+ generate(r, outsz, 0, 0);
+ return (0);
+ }
+
/* --- Write to a file --- */
#ifndef PORTABLE