chiark
/
gitweb
/
~ian
/
chiark-tcl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ca480b9
)
Ripped out a lot of crap. Now it compiles and passes the test vectors.
author
ian
<ian>
Tue, 10 Sep 2002 20:53:38 +0000
(20:53 +0000)
committer
ian
<ian>
Tue, 10 Sep 2002 20:53:38 +0000
(20:53 +0000)
base/troglodyte-Makefile
patch
|
blob
|
history
crypto/algtables.c
patch
|
blob
|
history
diff --git
a/base/troglodyte-Makefile
b/base/troglodyte-Makefile
index cdcebde8de8c16a424f10b7c2d60dd2e4f3ebf37..0737bbba5cd6ee537e005f38a85169717def7594 100644
(file)
--- a/
base/troglodyte-Makefile
+++ b/
base/troglodyte-Makefile
@@
-16,6
+16,9
@@
OBJS= tables.o \
parse.o
HDRS= hbytes.h \
parse.o
HDRS= hbytes.h \
+ serpent.h \
+ md5.h \
+ sha1.h \
$(AUTO_HDRS)
AUTO_HDRS= tables.h
$(AUTO_HDRS)
AUTO_HDRS= tables.h
diff --git
a/crypto/algtables.c
b/crypto/algtables.c
index 772998685653abca1dff7c11db107b66e8915e0b..7a651f06aa66e0a9d90529dea2ea7dd564fbd413 100644
(file)
--- a/
crypto/algtables.c
+++ b/
crypto/algtables.c
@@
-38,23
+38,23
@@
static void alg_serpent_l_byteswap_block(Byte *b) {
}
static void alg_serpent_makekey(void *schedule, const Byte *key, int keylen) {
}
static void alg_serpent_makekey(void *schedule, const Byte *key, int keylen) {
- serpent_makekey(schedule, key
len*8, key
);
+ serpent_makekey(schedule, key
, keylen
);
}
static void alg_serpent_encrypt(const void *sch, const void *in, void *out) {
}
static void alg_serpent_encrypt(const void *sch, const void *in, void *out) {
- serpent_encrypt(
sch, in, out
);
+ serpent_encrypt(
in, out, sch
);
}
static void alg_serpent_decrypt(const void *sch, const void *in, void *out) {
}
static void alg_serpent_decrypt(const void *sch, const void *in, void *out) {
- serpent_decrypt(
sch, in, out
);
+ serpent_decrypt(
in, out, sch
);
}
const BlockCipherAlgInfo blockcipheralginfos[]= {
}
const BlockCipherAlgInfo blockcipheralginfos[]= {
- { "serpent-l", 16, sizeof(
struct SerpentKeyInstanc
e), 16,32,
+ { "serpent-l", 16, sizeof(
SerpentKeySchedul
e), 16,32,
alg_serpent_l_byteswap_block,
{ alg_serpent_makekey, alg_serpent_encrypt },
{ alg_serpent_makekey, alg_serpent_decrypt } },
alg_serpent_l_byteswap_block,
{ alg_serpent_makekey, alg_serpent_encrypt },
{ alg_serpent_makekey, alg_serpent_decrypt } },
- { "serpent-b", 16, sizeof(
struct SerpentKeyInstanc
e), 16,32,
+ { "serpent-b", 16, sizeof(
SerpentKeySchedul
e), 16,32,
alg_serpent_b_byteswap_block,
{ alg_serpent_makekey, alg_serpent_encrypt },
{ alg_serpent_makekey, alg_serpent_decrypt } },
alg_serpent_b_byteswap_block,
{ alg_serpent_makekey, alg_serpent_encrypt },
{ alg_serpent_makekey, alg_serpent_decrypt } },