From f0675f8ae1bef06a4aa86a31f96639370496fc26 Mon Sep 17 00:00:00 2001 From: mdw Date: Tue, 18 Jul 2000 23:01:26 +0000 Subject: [PATCH] Improve progress indications, and allow user to choose chunk sizes for Maurer's test. --- rspit.c | 290 ++++++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 171 insertions(+), 119 deletions(-) diff --git a/rspit.c b/rspit.c index 71a6c1a..1821b8b 100644 --- a/rspit.c +++ b/rspit.c @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: rspit.c,v 1.6 2000/07/15 20:53:35 mdw Exp $ + * $Id: rspit.c,v 1.7 2000/07/18 23:01:26 mdw Exp $ * * Spit out random numbers * @@ -30,6 +30,10 @@ /*----- Revision history --------------------------------------------------* * * $Log: rspit.c,v $ + * Revision 1.7 2000/07/18 23:01:26 mdw + * Improve progress indications, and allow user to choose chunk sizes for + * Maurer's test. + * * Revision 1.6 2000/07/15 20:53:35 mdw * Add a load of new ciphers and hashes. * @@ -208,6 +212,7 @@ static struct { static FILE *outfp; static size_t outsz = 0; +static unsigned maurer_lo = 5, maurer_hi = 8; static int argc; static char **argv; @@ -253,7 +258,7 @@ common core set:\n\ -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 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\ @@ -277,7 +282,7 @@ static struct option opts[] = { { "list", 0, 0, 'l' }, { "fipstest", 0, 0, 'f' }, - { "maurer", 0, 0, 'm' }, + { "maurer", OPTF_ARGOPT, 0, 'm' }, { "output", OPTF_ARGREQ, 0, 'o' }, { "size", OPTF_ARGREQ, 0, 'z' }, { "progress", 0, 0, 'p' }, @@ -287,7 +292,7 @@ static struct option opts[] = { { 0, 0, 0, 0 } }; -static const char *sopts = "hvu lfmo:z:p"; +static const char *sopts = "hvu lfm::o:z:p"; #ifndef OPTION_V DA_DECL(option_v, struct option); @@ -352,6 +357,19 @@ static int opt(void) break; case 'm': flags |= f_maurer; + if (optarg) { + char *p; + unsigned long lo, hi; + lo = strtoul(optarg, &p, 0); + if (*p == '-') + hi = strtoul(p + 1, &p, 0); + else + hi = lo; + if (*p != 0 || hi < lo || lo == 0) + die(EXIT_FAILURE, "bad bit range `%s'", optarg); + maurer_lo = lo; + maurer_hi = hi; + } break; case 'o': if (flags & f_file) @@ -1065,17 +1083,144 @@ static gen generators[] = { static gen optsg = { "options", gen_opts, 0, "This message shouldn't be printed." }; -/*----- Main code ---------------------------------------------------------*/ +/*----- Random number generation ------------------------------------------*/ -int main(int ac, char *av[]) +static int genfile(const void *buf, size_t sz, void *p) +{ + FILE *fp = p; + if (fwrite(buf, 1, sz, fp) != sz) + die(EXIT_FAILURE, "error writing to file: %s", strerror(errno)); + return (0); +} + +static int genbuf(const void *buf, size_t sz, void *p) +{ + octet **pp = p; + memcpy(*pp, buf, sz); + *pp += sz; + return (0); +} + +static int generate(grand *r, size_t outsz, + int (*func)(const void *buf, size_t sz, void *p), + void *p) { - gen *g = &optsg; - grand *r; unsigned percent = 0; size_t kb = 0; time_t last; static char baton[] = "-\\|/"; char *bp; + int rc; + + /* --- Spit out random data --- */ + + last = time(0); + bp = baton; + if (flags & f_progress) { + char *errbuf = xmalloc(BUFSIZ); + setvbuf(stderr, errbuf, _IOLBF, BUFSIZ); + if (outsz) + fprintf(stderr, "[%*s] 0%% 0\r[/\b", 50, ""); + else + fputs("[ ] 0\r[/\b", stderr); + fflush(stderr); + } + +#ifdef SIGPIPE + signal(SIGPIPE, SIG_IGN); +#endif + + for (;;) { + octet buf[BUFSIZ]; + size_t sz = sizeof(buf); + + /* --- Emit a bufferful (or less) of data --- */ + + if (outsz) { + if (sz > outsz - kb) + sz = outsz - kb; + } + r->ops->fill(r, buf, sz); + if ((rc = func(buf, sz, p)) != 0) + return (rc); + kb += sz; + + /* --- Update the display --- */ + + if (flags & f_progress) { + time_t t = time(0); + unsigned up = 0; + + if (percent > 100) + up = 1; + + if (!outsz) { + if (difftime(t, last) > 1.0) { + up = 1; + } + if (up) + fputs(" ] ", stderr); + } else { + unsigned pc = kb * 100.0 / outsz; + if (pc > percent || percent > 100 || difftime(t, last) > 1.0) { + if (percent > 100) + percent = 0; + percent &= ~1; + for (; percent < (pc & ~1); percent += 2) + putc('.', stderr); + percent = pc; + for (; pc < 100; pc += 2) + putc(' ', stderr); + fprintf(stderr, "] %3i%% ", percent); + up = 1; + } + } + + if (up) { + size_t q = kb; + char *suff = " KMG"; + while (q > 8192 && suff[1]) { + q >>= 10; + suff++; + } + fprintf(stderr, "%4i%c\r[", q, *suff); + if (outsz) { + unsigned pc; + for (pc = 0; pc < (percent & ~1); pc += 2) + putc('.', stderr); + } + last = t; + } + + if (percent > 100) + percent = 0; + + if (percent < 100) { + putc(*bp++, stderr); + putc('\b', stderr); + if (!*bp) + bp = baton; + } + fflush(stderr); + } + + /* --- Terminate the loop --- */ + + if (outsz && kb >= outsz) + break; + } + + if (flags & f_progress) + fputc('\n', stderr); + return (0); +} + +/*----- Main code ---------------------------------------------------------*/ + +int main(int ac, char *av[]) +{ + gen *g = &optsg; + grand *r; /* --- Initialize mLib --- */ @@ -1132,8 +1277,9 @@ int main(int ac, char *av[]) if (flags & f_fips) { octet buf[FIPSTEST_BUFSZ]; unsigned rc; + octet *p = buf; - r->ops->fill(r, buf, sizeof(buf)); + generate(r, sizeof(buf), genbuf, &p); rc = fipstest(buf); if (rc & FIPSTEST_MONOBIT) moan("failed monobit test"); @@ -1151,11 +1297,13 @@ int main(int ac, char *av[]) /* --- Do Maurer's test --- */ if (flags & f_maurer) { - octet buf[250 * 1024]; + octet *buf; + size_t bufsz; unsigned i; unsigned rc = 0; unsigned f = 0, jj = 0; double maxz = 0; + octet *p; static struct { double x; const char *sig; } sigtab[] = { { 3.2905, "1e-3" }, @@ -1165,9 +1313,14 @@ int main(int ac, char *av[]) { 0 , 0 } }; - r->ops->fill(r, buf, sizeof(buf)); - for (i = 5; i < 8; i++) { - double z = maurer(buf, sizeof(buf), i + 1); + 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); + + for (i = maurer_lo; i <= maurer_hi; i++) { + double z = maurer(buf, bufsz, i); double zz = fabs(z); unsigned j; @@ -1175,135 +1328,34 @@ int main(int ac, char *av[]) if (zz > sigtab[j].x) { if (zz > fabs(maxz)) { maxz = z; - f = i + 1; + f = i; jj = j; } rc = EXIT_FAILURE; moan("failed, bits = %u, sig = %s, Z_u = %g", - i + 1, sigtab[j].sig, z); + i, sigtab[j].sig, z); break; } } if (flags & f_progress) - printf("bits = %u, Z_u = %g\n", i + 1, z); + printf("bits = %u, Z_u = %g\n", i, z); } return (rc); } - /* --- Make sure we don't write to the terminal --- */ + /* --- Write to a file --- */ #ifndef PORTABLE if (!(flags & f_file) && isatty(STDOUT_FILENO)) die(EXIT_FAILURE, "writing output to a terminal is a bad idea"); #endif - /* --- Spit out random data --- */ - - last = time(0); - bp = baton; - if (flags & f_progress) { - char *errbuf = xmalloc(BUFSIZ); - setvbuf(stderr, errbuf, _IOLBF, BUFSIZ); - if (outsz) - fprintf(stderr, "[%*s] 0%% 0\r[/\b", 50, ""); - else - fputs("[ ] 0\r[/\b", stderr); - fflush(stderr); - } - -#ifdef SIGPIPE - signal(SIGPIPE, SIG_IGN); -#endif - - for (;;) { - octet buf[BUFSIZ]; - size_t sz = sizeof(buf); - - /* --- Emit a bufferful (or less) of data --- */ - - if (outsz) { - if (sz > outsz - kb) - sz = outsz - kb; - } - r->ops->fill(r, buf, sz); - if (fwrite(buf, 1, sz, outfp) != sz) { - if (flags & f_progress) - fputc('\n', stderr); - die(EXIT_FAILURE, "error writing data: %s", strerror(errno)); - } - kb += sz; - - /* --- Update the display --- */ - - if (flags & f_progress) { - time_t t = time(0); - unsigned up = 0; - - if (percent > 100) - up = 1; - - if (!outsz) { - if (difftime(t, last) > 1.0) { - up = 1; - } - if (up) - fputs(" ] ", stderr); - } else { - unsigned pc = kb * 100.0 / outsz; - if (pc > percent || percent > 100 || difftime(t, last) > 1.0) { - if (percent > 100) - percent = 0; - percent &= ~1; - for (; percent < (pc & ~1); percent += 2) - putc('.', stderr); - percent = pc; - for (; pc < 100; pc += 2) - putc(' ', stderr); - fprintf(stderr, "] %3i%% ", percent); - up = 1; - } - } - - if (up) { - size_t q = kb; - char *suff = " KMG"; - while (q > 8192 && suff[1]) { - q >>= 10; - suff++; - } - fprintf(stderr, "%4i%c\r[", q, *suff); - if (outsz) { - unsigned pc; - for (pc = 0; pc < (percent & ~1); pc += 2) - putc('.', stderr); - } - last = t; - } - - if (percent > 100) - percent = 0; - - if (percent < 100) { - putc(*bp++, stderr); - putc('\b', stderr); - if (!*bp) - bp = baton; - } - fflush(stderr); - } - - /* --- Terminate the loop --- */ - - if (outsz && kb >= outsz) - break; - } + generate(r, outsz, genfile, outfp); /* --- Done --- */ r->ops->destroy(r); - if (flags & f_progress) - fputc('\n', stderr); return (0); } -- 2.11.0