ec-field-test.c: Make the field-element type use internal format.

[secnet] / transform-cbcmac.c

diff --git a/transform-cbcmac.c b/transform-cbcmac.c
index 5e59e21..e7a3ee5 100644 (file)
--- a/transform-cbcmac.c
+++ b/transform-cbcmac.c
@@ -231,7 +231,7 @@ static transform_apply_return transform_reverse(void *sst,
        serpentbe_encrypt(&ti->mackey,macplain,macacc);
     }
     serpentbe_encrypt(&ti->mackey,macacc,macacc);
-    if (!consttime_memeq(macexpected,macacc,16)!=0) {
+    if (!consttime_memeq(macexpected,macacc,16)) {
        *errmsg="invalid MAC";
        return transform_apply_err;
     }
@@ -284,9 +284,6 @@ static list_t *transform_apply(closure_t *self, struct cloc loc,
     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 */
-    st->ops.keylen=REQUIRED_KEYLEN;
     st->ops.create=transform_create;
 
     /* First parameter must be a dict */
@@ -298,7 +295,7 @@ static list_t *transform_apply(closure_t *self, struct cloc loc,
 
     SEQNUM_PARAMS_INIT(dict,&st->p,"serpent-cbc256",loc);
 
-    SET_CAPAB_TRANSFORMNUM(CAPAB_TRANSFORMNUM_SERPENT256CBC);
+    SET_CAPAB_BIT(CAPAB_BIT_SERPENT256CBC);
 
     return new_closure(&st->cl);
 }