chiark
/
gitweb
/
~ianmdlvl
/
secnet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udp, polypath: Log destination address in `some success' messages
[secnet.git]
/
transform-cbcmac.c
diff --git
a/transform-cbcmac.c
b/transform-cbcmac.c
index 1390ee884a9ff70eefb5e17b970be05637839033..f74879293c8f49af9ad1bdca3807340c1731a678 100644
(file)
--- a/
transform-cbcmac.c
+++ b/
transform-cbcmac.c
@@
-18,26
+18,28
@@
/* Required key length in bytes */
#define REQUIRED_KEYLEN ((512+64+32)/8)
/* Required key length in bytes */
#define REQUIRED_KEYLEN ((512+64+32)/8)
+#include "transform-common.h"
+
+struct transform_params {
+ SEQNUM_PARAMS_FIELDS;
+};
+
struct transform {
closure_t cl;
struct transform_if ops;
struct transform {
closure_t cl;
struct transform_if ops;
-
uint32_t max_seq_skew
;
+
struct transform_params p
;
};
struct transform_inst {
struct transform_inst_if ops;
};
struct transform_inst {
struct transform_inst_if ops;
+ struct transform_params p;
struct keyInstance cryptkey;
struct keyInstance mackey;
uint32_t cryptiv;
uint32_t maciv;
struct keyInstance cryptkey;
struct keyInstance mackey;
uint32_t cryptiv;
uint32_t maciv;
- uint32_t sendseq;
- uint32_t lastrecvseq;
- uint32_t max_skew;
- bool_t keyed;
+ SEQNUM_KEYED_FIELDS;
};
};
-#include "transform-common.h"
-
#define PKCS5_MASK 15
static bool_t transform_setkey(void *sst, uint8_t *key, int32_t keylen,
#define PKCS5_MASK 15
static bool_t transform_setkey(void *sst, uint8_t *key, int32_t keylen,
@@
-63,9
+65,8
@@
static bool_t transform_setkey(void *sst, uint8_t *key, int32_t keylen,
serpentbe_makekey(&ti->mackey,256,key+32);
ti->cryptiv=get_uint32(key+64);
ti->maciv=get_uint32(key+68);
serpentbe_makekey(&ti->mackey,256,key+32);
ti->cryptiv=get_uint32(key+64);
ti->maciv=get_uint32(key+68);
- ti->sendseq=get_uint32(key+72);
- ti->lastrecvseq=ti->sendseq;
- ti->keyed=True;
+ uint32_t firstseq=get_uint32(key+72);
+ SEQNUM_KEYED_INIT(firstseq,firstseq);
return True;
}
return True;
}
@@
-230,7
+231,7
@@
static uint32_t transform_reverse(void *sst, struct buffer_if *buf,
/* Sequence number must be within max_skew of lastrecvseq; lastrecvseq
is only allowed to increase. */
seqnum=buf_unprepend_uint32(buf);
/* Sequence number must be within max_skew of lastrecvseq; lastrecvseq
is only allowed to increase. */
seqnum=buf_unprepend_uint32(buf);
- SEQNUM_CHECK(seqnum,
ti->max_skew
);
+ SEQNUM_CHECK(seqnum,
&ti->p
);
return 0;
}
return 0;
}
@@
-243,7
+244,7
@@
static struct transform_inst_if *transform_create(void *sst)
TRANSFORM_CREATE_CORE;
TRANSFORM_CREATE_CORE;
- ti->
max_skew=st->max_seq_skew
;
+ ti->
p=st->p
;
return &ti->ops;
}
return &ti->ops;
}
@@
-255,7
+256,7
@@
static list_t *transform_apply(closure_t *self, struct cloc loc,
item_t *item;
dict_t *dict;
item_t *item;
dict_t *dict;
-
st=safe_malloc(sizeof(*st),"serpent"
);
+
NEW(st
);
st->cl.description="serpent-cbc256";
st->cl.type=CL_TRANSFORM;
st->cl.apply=NULL;
st->cl.description="serpent-cbc256";
st->cl.type=CL_TRANSFORM;
st->cl.apply=NULL;
@@
-275,8
+276,8
@@
static list_t *transform_apply(closure_t *self, struct cloc loc,
cfgfatal(loc,"userv-ipif","parameter must be a dictionary\n");
dict=item->data.dict;
cfgfatal(loc,"userv-ipif","parameter must be a dictionary\n");
dict=item->data.dict;
- st->max_seq_skew=dict_read_number(dict, "max-sequence-skew",
-
False, "serpent-cbc256", loc, 10
);
+
+
SEQNUM_PARAMS_INIT(dict,&st->p,"serpent-cbc256",loc
);
SET_CAPAB_TRANSFORMNUM(CAPAB_TRANSFORMNUM_SERPENT256CBC);
SET_CAPAB_TRANSFORMNUM(CAPAB_TRANSFORMNUM_SERPENT256CBC);
@@
-336,7
+337,7
@@
void transform_cbcmac_module(dict_t *dict)
const char *errmsg;
int i;
const char *errmsg;
int i;
-
tr = malloc(sizeof(struct transform)
);
+
NEW(tr
);
tr->max_seq_skew = 20;
ti = transform_create(tr);
tr->max_seq_skew = 20;
ti = transform_create(tr);