X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/d3187d77683cc7c81be53c12386630debeccb20b..41a324a748544b0fb9b0acfc65b1a39b7611550c:/rspit.c

diff --git a/rspit.c b/rspit.c
index 26fd888..7896ead 100644
--- a/rspit.c
+++ b/rspit.c
@@ -1,6 +1,6 @@
 /* -*-c-*-
  *
- * $Id: rspit.c,v 1.14 2001/02/21 20:03:22 mdw Exp $
+ * $Id: rspit.c,v 1.16 2001/04/29 18:11:32 mdw Exp $
  *
  * Spit out random numbers
  *
@@ -30,6 +30,12 @@
 /*----- Revision history --------------------------------------------------* 
  *
  * $Log: rspit.c,v $
+ * Revision 1.16  2001/04/29 18:11:32  mdw
+ * New block ciphers.
+ *
+ * Revision 1.15  2001/04/19 18:26:13  mdw
+ * Use the new MAC keysize names.
+ *
  * Revision 1.14  2001/02/21 20:03:22  mdw
  * Added support for MD2 hash function.
  *
@@ -125,6 +131,7 @@
 #include "des3-ofb.h"
 #include "rc2-ofb.h"
 #include "rc5-ofb.h"
+#include "mars-ofb.h"
 #include "skipjack-ofb.h"
 #include "tea-ofb.h"
 #include "xtea-ofb.h"
@@ -134,6 +141,8 @@
 #include "cast128-ofb.h"
 #include "cast256-ofb.h"
 #include "rijndael-ofb.h"
+#include "safer-ofb.h"
+#include "safersk-ofb.h"
 #include "square-ofb.h"
 #include "serpent-ofb.h"
 
@@ -141,6 +150,7 @@
 #include "des3-counter.h"
 #include "rc2-counter.h"
 #include "rc5-counter.h"
+#include "mars-counter.h"
 #include "skipjack-counter.h"
 #include "tea-counter.h"
 #include "xtea-counter.h"
@@ -150,6 +160,8 @@
 #include "cast128-counter.h"
 #include "cast256-counter.h"
 #include "rijndael-counter.h"
+#include "safer-counter.h"
+#include "safersk-counter.h"
 #include "square-counter.h"
 #include "serpent-counter.h"
 
@@ -181,6 +193,7 @@ extern gen generators[];
   E(DES3, des3)								\
   E(RC2, rc2)								\
   E(RC5, rc5)								\
+  E(MARS, mars)								\
   E(SKIPJACK, skipjack)							\
   E(TEA, tea)								\
   E(XTEA, xtea)								\
@@ -190,6 +203,8 @@ extern gen generators[];
   E(CAST128, cast128)							\
   E(CAST256, cast256)							\
   E(SQUARE, square)							\
+  E(SAFER, safer)							\
+  E(SAFERSK, safersk)							\
   E(RIJNDAEL, rijndael)							\
   E(SERPENT, serpent)
 
@@ -727,7 +742,7 @@ static grand *gen_rand(unsigned i)
     switch (o) {
       case 'k':
 	DRESET(&d);
-	textkey(&d, optarg, rmd160_mackeysz);
+	textkey(&d, optarg, rmd160_hmackeysz);
 	r->ops->misc(r, RAND_KEY, d.buf, d.len);
 	break;
       case 't':
@@ -735,7 +750,7 @@ static grand *gen_rand(unsigned i)
 	break;
       case 'H':
 	DRESET(&d);
-	hexkey(&d, optarg, rmd160_mackeysz);
+	hexkey(&d, optarg, rmd160_hmackeysz);
 	r->ops->misc(r, GRAND_SEEDBLOCK, d.buf, d.len);
 	break;
     }