projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More hash functions. Bug fix in getstring.
[u/mdw/catacomb]
/
rspit.c
diff --git
a/rspit.c
b/rspit.c
index
e10d05f
..
c68c11d
100644
(file)
--- a/
rspit.c
+++ b/
rspit.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: rspit.c,v 1.
4 2000/06/17 12:08:28
mdw Exp $
+ * $Id: rspit.c,v 1.
5 2000/07/01 11:27:03
mdw Exp $
*
* Spit out random numbers
*
*
* Spit out random numbers
*
@@
-30,6
+30,10
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: rspit.c,v $
/*----- Revision history --------------------------------------------------*
*
* $Log: rspit.c,v $
+ * Revision 1.5 2000/07/01 11:27:03 mdw
+ * Portability fix: don't assume that `stdout' is a constant expression.
+ * Remove old type name `bbs_param'.
+ *
* Revision 1.4 2000/06/17 12:08:28 mdw
* Restructure handling of cipher-based generators. Add counter-mode
* ciphers and MGF-1 hash functions. Add FIPS 140-1 and Maurer's tests.
* Revision 1.4 2000/06/17 12:08:28 mdw
* Restructure handling of cipher-based generators. Add counter-mode
* ciphers and MGF-1 hash functions. Add FIPS 140-1 and Maurer's tests.
@@
-179,7
+183,7
@@
static struct {
/*----- Miscellaneous static data -----------------------------------------*/
/*----- Miscellaneous static data -----------------------------------------*/
-static FILE *outfp
= stdout
;
+static FILE *outfp;
static size_t outsz = 0;
static int argc;
static size_t outsz = 0;
static int argc;
@@
-578,7
+582,7
@@
static grand *gen_bbs(unsigned i)
m = MP_COPY(kd->u.m);
key_close(&kf);
} else {
m = MP_COPY(kd->u.m);
key_close(&kf);
} else {
- bbs_p
aram
bp;
+ bbs_p
riv
bp;
if (bbs_gen(&bp, bits, &rand_global, 0,
(flags & f_progress) ? pgen_ev : 0, 0))
if (bbs_gen(&bp, bits, &rand_global, 0,
(flags & f_progress) ? pgen_ev : 0, 0))
@@
-1065,6
+1069,7
@@
int main(int ac, char *av[])
addopts(sopts, opts);
argc = ac;
argv = av;
addopts(sopts, opts);
argc = ac;
argv = av;
+ outfp = stdout;
/* --- Read the generator out of the first argument --- */
/* --- Read the generator out of the first argument --- */