/* -*-c-*-
*
- * $Id: rspit.c,v 1.4 2000/06/17 12:08:28 mdw Exp $
+ * $Id: rspit.c,v 1.6 2000/07/15 20:53:35 mdw Exp $
*
* Spit out random numbers
*
/*----- Revision history --------------------------------------------------*
*
* $Log: rspit.c,v $
+ * Revision 1.6 2000/07/15 20:53:35 mdw
+ * Add a load of new ciphers and hashes.
+ *
+ * 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.
#include "des3-ofb.h"
#include "rc2-ofb.h"
#include "rc5-ofb.h"
+#include "skipjack-ofb.h"
+#include "tea-ofb.h"
+#include "xtea-ofb.h"
#include "blowfish-ofb.h"
#include "twofish-ofb.h"
#include "idea-ofb.h"
#include "cast128-ofb.h"
#include "cast256-ofb.h"
#include "rijndael-ofb.h"
+#include "square-ofb.h"
#include "serpent-ofb.h"
#include "des-counter.h"
#include "des3-counter.h"
#include "rc2-counter.h"
#include "rc5-counter.h"
+#include "skipjack-counter.h"
+#include "tea-counter.h"
+#include "xtea-counter.h"
#include "blowfish-counter.h"
#include "twofish-counter.h"
#include "idea-counter.h"
#include "cast128-counter.h"
#include "cast256-counter.h"
#include "rijndael-counter.h"
+#include "square-counter.h"
#include "serpent-counter.h"
#include "md4-mgf.h"
#include "md5-mgf.h"
#include "sha-mgf.h"
+#include "tiger-mgf.h"
+#include "rmd128-mgf.h"
#include "rmd160-mgf.h"
+#include "rmd256-mgf.h"
+#include "rmd320-mgf.h"
#include "rmd160.h"
E(DES3, des3) \
E(RC2, rc2) \
E(RC5, rc5) \
+ E(SKIPJACK, skipjack) \
+ E(TEA, tea) \
+ E(XTEA, xtea) \
E(BLOWFISH, blowfish) \
E(TWOFISH, twofish) \
E(IDEA, idea) \
E(CAST128, cast128) \
E(CAST256, cast256) \
+ E(SQUARE, square) \
E(RIJNDAEL, rijndael) \
E(SERPENT, serpent)
E(MD4, md4) \
E(MD5, md5) \
E(SHA, sha) \
- E(RMD160, rmd160)
+ E(TIGER, tiger) \
+ E(RMD128, rmd128) \
+ E(RMD160, rmd160) \
+ E(RMD256, rmd256) \
+ E(RMD320, rmd320)
#define E(PRE, pre) CIPHER_##PRE,
enum { CIPHERS CIPHER__bogus };
/*----- Miscellaneous static data -----------------------------------------*/
-static FILE *outfp = stdout;
+static FILE *outfp;
static size_t outsz = 0;
static int argc;
m = MP_COPY(kd->u.m);
key_close(&kf);
} else {
- bbs_param bp;
+ bbs_priv bp;
if (bbs_gen(&bp, bits, &rand_global, 0,
(flags & f_progress) ? pgen_ev : 0, 0))
addopts(sopts, opts);
argc = ac;
argv = av;
+ outfp = stdout;
/* --- Read the generator out of the first argument --- */