From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 27 Sep 2014 23:45:01 +0000 (+0100)
Subject: transform-cbcmac: Move max_[seq]_skew into params struct
X-Git-Tag: base.ipv6-polypath-fixes.v1~32
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=secnet.git;a=commitdiff_plain;h=9d69120a98c62cf0ccddbce402de980cefe00c95

transform-cbcmac: Move max_[seq]_skew into params struct

Like in transform-eax.  We are going to want to share this with eac
and extend it.

No functional change.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/transform-cbcmac.c b/transform-cbcmac.c
index fac8649..724a59e 100644
--- a/transform-cbcmac.c
+++ b/transform-cbcmac.c
@@ -18,21 +18,25 @@
 /* Required key length in bytes */
 #define REQUIRED_KEYLEN ((512+64+32)/8)
 
+struct transform_params {
+    uint32_t max_seq_skew;
+};
+
 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_params p;
     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;
 };
 
@@ -230,7 +234,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);
-    SEQNUM_CHECK(seqnum, ti->max_skew);
+    SEQNUM_CHECK(seqnum, ti->p.max_seq_skew);
     
     return 0;
 }
@@ -243,7 +247,7 @@ static struct transform_inst_if *transform_create(void *sst)
 
     TRANSFORM_CREATE_CORE;
 
-    ti->max_skew=st->max_seq_skew;
+    ti->p=st->p;
 
     return &ti->ops;
 }
@@ -275,8 +279,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;
-    st->max_seq_skew=dict_read_number(dict, "max-sequence-skew",
-				      False, "serpent-cbc256", loc, 10);
+    st->p.max_seq_skew=dict_read_number(dict, "max-sequence-skew",
+					False, "serpent-cbc256", loc, 10);
 
     SET_CAPAB_TRANSFORMNUM(CAPAB_TRANSFORMNUM_SERPENT256CBC);