chiark
/
gitweb
/
~ian
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udp.c: Remove some (ab)use of variable name `i'
[secnet.git]
/
transform-cbcmac.c
diff --git
a/transform-cbcmac.c
b/transform-cbcmac.c
index 1e8a5e9b8acc4bc181f3b9cdbff5b32a2142abb9..26e0a127d37cf8dcd7297eab6768795811453629 100644
(file)
--- a/
transform-cbcmac.c
+++ b/
transform-cbcmac.c
@@
-40,7
+40,8
@@
struct transform_inst {
#define PKCS5_MASK 15
#define PKCS5_MASK 15
-static bool_t transform_setkey(void *sst, uint8_t *key, int32_t keylen)
+static bool_t transform_setkey(void *sst, uint8_t *key, int32_t keylen,
+ bool_t direction)
{
struct transform_inst *ti=sst;
{
struct transform_inst *ti=sst;
@@
-260,9
+261,8
@@
static list_t *transform_apply(closure_t *self, struct cloc loc,
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
st->cl.apply=NULL;
st->cl.interface=&st->ops;
st->ops.st=st;
- st->ops.max_start_pad=28; /* 4byte seqnum, 16byte pad, 4byte MACIV,
- 4byte IV */
- st->ops.max_end_pad=16; /* 16byte CBCMAC */
+ update_max_start_pad(&transform_max_start_pad, 28);
+ /* 4byte seqnum, 16byte pad, 4byte MACIV, 4byte IV */
/* We need 256*2 bits for serpent keys, 32 bits for CBC-IV and 32 bits
for CBCMAC-IV, and 32 bits for init sequence number */
/* We need 256*2 bits for serpent keys, 32 bits for CBC-IV and 32 bits
for CBCMAC-IV, and 32 bits for init sequence number */
@@
-278,6
+278,8
@@
static list_t *transform_apply(closure_t *self, struct cloc loc,
st->max_seq_skew=dict_read_number(dict, "max-sequence-skew",
False, "serpent-cbc256", loc, 10);
st->max_seq_skew=dict_read_number(dict, "max-sequence-skew",
False, "serpent-cbc256", loc, 10);
+ SET_CAPAB_TRANSFORMNUM(CAPAB_TRANSFORMNUM_SERPENT256CBC);
+
return new_closure(&st->cl);
}
return new_closure(&st->cl);
}