#define SEQLEN 4
struct transform_params {
- uint32_t max_seq_skew, tag_length, padding_mask;
+ SEQNUM_PARAMS_FIELDS;
+ uint32_t tag_length, padding_mask;
};
struct transform {
struct transform_inst {
struct transform_inst_if ops;
struct transform_params p;
- unsigned keyed:1;
/* remaining valid iff keyed */
unsigned direction:1;
- uint32_t sendseq;
- uint32_t lastrecvseq;
+ SEQNUM_KEYED_FIELDS;
struct keyInstance key;
uint8_t info_b[BLOCK_SIZE], info_p[BLOCK_SIZE];
};
TEAX_DEBUG(hash_out+32,8);
ti->direction=direction;
- ti->sendseq=get_uint32(hash_out+32+direction*4);
- ti->lastrecvseq=get_uint32(hash_out+32+!direction*4);
serpent_makekey(&ti->key, 32*8, hash_out);
eax_setup(ti);
- ti->keyed=True;
+ SEQNUM_KEYED_INIT(get_uint32(hash_out+32+!direction*4),
+ get_uint32(hash_out+32+direction*4));
return True;
}
TEAX_DEBUG(buf->start,buf->size);
- memcpy(buf_append(buf,SEQLEN), nonce, SEQLEN);
+ BUF_ADD_BYTES(append,buf,nonce,SEQLEN);
TEAX_DEBUG(nonce,SEQLEN);
size_t padlen = *padp;
if (!buf_unappend(buf,padlen-1)) goto too_short;
- SEQNUM_CHECK(seqnum, ti->p.max_seq_skew);
+ SEQNUM_CHECK(seqnum, &ti->p);
TEAX_DEBUG(buf->start,buf->size);
item_t *item;
dict_t *dict;
- st=safe_malloc(sizeof(*st),"eax-serpent");
+ NEW(st);
st->cl.description="eax-serpent";
st->cl.type=CL_TRANSFORM;
st->cl.apply=NULL;
cfgfatal(loc,"eax-serpent","parameter must be a dictionary\n");
dict=item->data.dict;
- st->p.max_seq_skew=dict_read_number(dict, "max-sequence-skew",
- False, "eax-serpent", loc, 10);
+ SET_CAPAB_TRANSFORMNUM(CAPAB_TRANSFORMNUM_EAXSERPENT);
+
+ SEQNUM_PARAMS_INIT(dict,&st->p,"eax-serpent",loc);
st->p.tag_length=dict_read_number(dict, "tag-length-bytes",
False, "eax-serpent", loc, 128/8);
padding_round = 1;
st->p.padding_mask = padding_round-1;
- st->ops.max_start_pad=0;
- st->ops.max_end_pad= padding_round + st->p.tag_length + SEQLEN;
+ update_max_start_pad(&transform_max_start_pad, 0);
st->ops.keylen=0;
st->ops.create=transform_create;