projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an internal-representation no-op function.
[u/mdw/catacomb]
/
rspit.c
diff --git
a/rspit.c
b/rspit.c
index
b9c8e72
..
7896ead
100644
(file)
--- a/
rspit.c
+++ b/
rspit.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: rspit.c,v 1.1
3 2000/12/06 20:33:27
mdw Exp $
+ * $Id: rspit.c,v 1.1
6 2001/04/29 18:11:32
mdw Exp $
*
* Spit out random numbers
*
*
* Spit out random numbers
*
@@
-30,6
+30,15
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: rspit.c,v $
/*----- 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.
+ *
* Revision 1.13 2000/12/06 20:33:27 mdw
* Make flags be macros rather than enumerations, to ensure that they're
* unsigned.
* Revision 1.13 2000/12/06 20:33:27 mdw
* Make flags be macros rather than enumerations, to ensure that they're
* unsigned.
@@
-122,6
+131,7
@@
#include "des3-ofb.h"
#include "rc2-ofb.h"
#include "rc5-ofb.h"
#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"
#include "skipjack-ofb.h"
#include "tea-ofb.h"
#include "xtea-ofb.h"
@@
-131,6
+141,8
@@
#include "cast128-ofb.h"
#include "cast256-ofb.h"
#include "rijndael-ofb.h"
#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"
#include "square-ofb.h"
#include "serpent-ofb.h"
@@
-138,6
+150,7
@@
#include "des3-counter.h"
#include "rc2-counter.h"
#include "rc5-counter.h"
#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"
#include "skipjack-counter.h"
#include "tea-counter.h"
#include "xtea-counter.h"
@@
-147,9
+160,12
@@
#include "cast128-counter.h"
#include "cast256-counter.h"
#include "rijndael-counter.h"
#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"
#include "square-counter.h"
#include "serpent-counter.h"
+#include "md2-mgf.h"
#include "md4-mgf.h"
#include "md5-mgf.h"
#include "sha-mgf.h"
#include "md4-mgf.h"
#include "md5-mgf.h"
#include "sha-mgf.h"
@@
-177,6
+193,7
@@
extern gen generators[];
E(DES3, des3) \
E(RC2, rc2) \
E(RC5, rc5) \
E(DES3, des3) \
E(RC2, rc2) \
E(RC5, rc5) \
+ E(MARS, mars) \
E(SKIPJACK, skipjack) \
E(TEA, tea) \
E(XTEA, xtea) \
E(SKIPJACK, skipjack) \
E(TEA, tea) \
E(XTEA, xtea) \
@@
-186,10
+203,13
@@
extern gen generators[];
E(CAST128, cast128) \
E(CAST256, cast256) \
E(SQUARE, square) \
E(CAST128, cast128) \
E(CAST256, cast256) \
E(SQUARE, square) \
+ E(SAFER, safer) \
+ E(SAFERSK, safersk) \
E(RIJNDAEL, rijndael) \
E(SERPENT, serpent)
#define HASHES \
E(RIJNDAEL, rijndael) \
E(SERPENT, serpent)
#define HASHES \
+ E(MD2, md2) \
E(MD4, md4) \
E(MD5, md5) \
E(SHA, sha) \
E(MD4, md4) \
E(MD5, md5) \
E(SHA, sha) \
@@
-722,7
+742,7
@@
static grand *gen_rand(unsigned i)
switch (o) {
case 'k':
DRESET(&d);
switch (o) {
case 'k':
DRESET(&d);
- textkey(&d, optarg, rmd160_mackeysz);
+ textkey(&d, optarg, rmd160_
h
mackeysz);
r->ops->misc(r, RAND_KEY, d.buf, d.len);
break;
case 't':
r->ops->misc(r, RAND_KEY, d.buf, d.len);
break;
case 't':
@@
-730,7
+750,7
@@
static grand *gen_rand(unsigned i)
break;
case 'H':
DRESET(&d);
break;
case 'H':
DRESET(&d);
- hexkey(&d, optarg, rmd160_mackeysz);
+ hexkey(&d, optarg, rmd160_
h
mackeysz);
r->ops->misc(r, GRAND_SEEDBLOCK, d.buf, d.len);
break;
}
r->ops->misc(r, GRAND_SEEDBLOCK, d.buf, d.len);
break;
}