X-Git-Url: https://git.distorted.org.uk/u/mdw/catacomb/blobdiff_plain/72a6efc4d59568868fc6bbe05d343f777fc1a159..5c3f75ec49019d160806489824fc76652a2ef444:/blkc.h diff --git a/blkc.h b/blkc.h index dfbd4f7..77ecf0e 100644 --- a/blkc.h +++ b/blkc.h @@ -1,6 +1,6 @@ /* -*-c-*- * - * $Id: blkc.h,v 1.7 2004/04/08 01:36:15 mdw Exp $ + * $Id: blkc.h,v 1.8 2004/04/17 09:58:36 mdw Exp $ * * Common definitions for block ciphers * @@ -101,6 +101,10 @@ BLKC_GLUE(BLKC_STEP_X_, BLKC_ENDIAN(PRE)) \ (PRE, w) +#define BLKC_ZERO(PRE, w) \ + BLKC_GLUE(BLKC_ZERO_, BLKC_TYPE(PRE)) \ + (PRE, w, BLKC_BITS(PRE)) + #define BLKC_SET(PRE, w, x) \ BLKC_GLUE(BLKC_SET_X_, BLKC_ENDIAN(PRE)) \ (PRE, w, x) @@ -154,6 +158,9 @@ BLKC_SKEL_X(PRE, BLKC_W(w); const BLKC_WX(wx);, \ *_w ^= *_wx; _w++; _wx++; ) \ +#define BLKC_ZERO_X(PRE, w, n) \ + BLKC_SKEL_X(PRE, BLKC_W(w);, *_w++ = 0;) + #define BLKC_STEP_X_B(PRE, w) do { \ unsigned _i = PRE##_BLKSZ / 4; BLKC_W(w); uint32 _x = 0; \ while (_i && !_x) { _i--; _w[_i] = _x = U32(_w[_i] + 1); } \ @@ -208,6 +215,7 @@ #define BLKC_XLOAD_GUTS(op, i) _w[i] ^= op(_p + 4 * i) #define BLKC_MOVE_GUTS(op, i) _w[i] = _wx[i] #define BLKC_XMOVE_GUTS(op, i) _w[i] ^= _wx[i] +#define BLKC_ZERO_GUTS(op, i) _w[i] = 0 #define BLKC_STORE_N(PRE, b, w, op, n) \ BLKC_GLUE(BLKC_SKEL_, n) \ @@ -230,6 +238,10 @@ BLKC_GLUE(BLKC_SKEL_, n) \ (PRE, BLKC_W(w); const BLKC_WX(wx);, op, BLKC_MOVE_GUTS) +#define BLKC_ZERO_N(PRE, w, n) \ + BLKC_GLUE(BLKC_SKEL_, n) \ + (PRE, BLKC_W(w); , op, BLKC_ZERO_GUTS) + #define BLKC_XMOVE_N(PRE, w, wx, n) \ BLKC_GLUE(BLKC_SKEL_, n) \ (PRE, BLKC_W(w); const BLKC_WX(wx);, op, BLKC_XMOVE_GUTS)