X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/6dc589eff56dff14a347115f28b8c9d25374be69..HEAD:/symm/blkc.h

diff --git a/symm/blkc.h b/symm/blkc.h
index 52179dfb..444ec8d7 100644
--- a/symm/blkc.h
+++ b/symm/blkc.h
@@ -299,6 +299,94 @@
   BLKC_GLUE(BLKC_SKEL_, n)						\
     (PRE, BLKC_W(w); const BLKC_WX(wx);, op, BLKC_XMOVE_GUTS)
 
+/*----- Binary field arithmetic -------------------------------------------*/
+
+#define BLKC_POLY_IRRED64  0x001b
+#define BLKC_POLY_IRRED96  0x0641
+#define BLKC_POLY_IRRED128 0x0087
+#define BLKC_POLY_IRRED192 0x0087
+#define BLKC_POLY_IRRED256 0x0425
+
+#define BLKC_POLY_PRIM64   0x001b
+#define BLKC_POLY_PRIM96   0x0641
+#define BLKC_POLY_PRIM128  0x0087
+#define BLKC_POLY_PRIM192  0x8821
+#define BLKC_POLY_PRIM256  0x0425
+
+#define BLKC_POLY(PRE, f) BLKC_GLUE(BLKC_POLY_##f, BLKC_BITS(PRE))
+
+#define BLKC_BLSHIFT(PRE, f, z, x)					\
+  BLKC_GLUE(BLKC_BLSHIFT_X_, BLKC_ENDIAN(PRE))				\
+    (PRE, f, z, x)
+#define BLKC_LLSHIFT(PRE, f, z, x)					\
+  BLKC_GLUE(BLKC_LLSHIFT_X_, BLKC_ENDIAN(PRE))				\
+    (PRE, f, z, x)
+#define BLKC_LSHIFT(PRE, f, z, x)					\
+  BLKC_GLUE(BLKC_LSHIFT_X_, BLKC_ENDIAN(PRE))				\
+    (PRE, BLKC_ID, f, z, x)
+
+#define BLKC_BRSHIFT(PRE, f, z, x)					\
+  BLKC_GLUE(BLKC_BRSHIFT_X_, BLKC_ENDIAN(PRE))				\
+    (PRE, f, z, x)
+#define BLKC_LRSHIFT(PRE, f, z, x)					\
+  BLKC_GLUE(BLKC_LRSHIFT_X_, BLKC_ENDIAN(PRE))				\
+    (PRE, f, z, x)
+#define BLKC_RSHIFT(PRE, f, z, x)					\
+  BLKC_GLUE(BLKC_RSHIFT_X_, BLKC_ENDIAN(PRE))				\
+    (PRE, BLKC_ID, f, z, x)
+
+#define BLKC_BLSHIFT_X_B(PRE, f, z, x) BLKC_LSHIFT_X_B(PRE, BLKC_ID, f, z, x)
+#define BLKC_LLSHIFT_X_B(PRE, f, z, x) BLKC_LSHIFT_X_L(PRE, ENDSWAP32, f, z, x)
+#define BLKC_BLSHIFT_X_L(PRE, f, z, x) BLKC_LSHIFT_X_B(PRE, ENDSWAP32, f, z, x)
+#define BLKC_LLSHIFT_X_L(PRE, f, z, x) BLKC_LSHIFT_X_L(PRE, BLKC_ID, f, z, x)
+
+#define BLKC_BRSHIFT_X_B(PRE, f, z, x) BLKC_RSHIFT_X_B(PRE, BLKC_ID, f, z, x)
+#define BLKC_LRSHIFT_X_B(PRE, f, z, x) BLKC_RSHIFT_X_L(PRE, ENDSWAP32, f, z, x)
+#define BLKC_BRSHIFT_X_L(PRE, f, z, x) BLKC_RSHIFT_X_B(PRE, ENDSWAP32, f, z, x)
+#define BLKC_LRSHIFT_X_L(PRE, f, z, x) BLKC_RSHIFT_X_L(PRE, BLKC_ID, f, z, x)
+
+#define BLKC_LSHIFT_X_B(PRE, op, f, z, x) do {				\
+  uint32 *_z = (z); const uint32 *_x = (x);				\
+  uint32 _t = op(_x[0]), _m = -(uint32)((_t >> 31)&1u),			\
+    _c = BLKC_POLY(PRE, f)&_m;						\
+  unsigned _i;								\
+									\
+  for (_i = PRE##_BLKSZ/4; _i-- > 0; )					\
+    { _t = op(_x[_i]); _z[_i] = op((_t << 1) ^ _c); _c = (_t >> 31)&1u; } \
+} while (0)
+
+#define BLKC_RSHIFT_X_B(PRE, op, f, z, x) do {				\
+  uint32 *_z = (z); const uint32 *_x = (x);				\
+  uint32 _t, _t0 = op(_x[PRE##_BLKSZ/4 - 1]), _m = -(uint32)(_t0&1u),	\
+    _c = 0x80000000&_m;							\
+  unsigned _i;								\
+									\
+  for (_i = 0; _i < PRE##_BLKSZ/4 - 1; _i++)				\
+    { _t = op(_x[_i]); _z[_i] = op((_t >> 1) ^ _c); _c = (_t&1u) << 31; } \
+  _t0 ^= BLKC_POLY(PRE, f)&_m; _z[PRE##_BLKSZ/4 - 1] = op((_t0 >> 1) ^ _c); \
+} while (0)
+
+#define BLKC_LSHIFT_X_L(PRE, op, f, z, x) do {				\
+  uint32 *_z = (z); const uint32 *_x = (x);				\
+  uint32 _t = op(_x[PRE##_BLKSZ/4 - 1]), _m = -(uint32)((_t >> 31)&1u),	\
+    _c = BLKC_POLY(PRE, f)&_m;						\
+  unsigned _i;								\
+									\
+  for (_i = 0; _i < PRE##_BLKSZ/4; _i++)				\
+    { _t = op(_x[_i]); _z[_i] = op((_t << 1) ^ _c); _c = (_t >> 31)&1u; } \
+} while (0)
+
+#define BLKC_RSHIFT_X_L(PRE, op, f, z, x) do {				\
+  uint32 *_z = (z); const uint32 *_x = (x);				\
+  uint32 _t, _t0 = op(_x[0]), _m = -(uint32)(_t0&1u),			\
+    _c = 0x80000000&_m;							\
+  unsigned _i;								\
+									\
+  for (_i = PRE##_BLKSZ/4 - 1; _i-- > 1; )				\
+    { _t = op(_x[_i]); _z[_i] = op((_t >> 1) ^ _c); _c = (_t&1u) << 31; } \
+  _t0 ^= BLKC_POLY(PRE, f)&_m; _z[0] = op((_t0 >> 1) ^ _c);		\
+} while (0)
+
 /*----- Test rig for block ciphers ----------------------------------------*/
 
 /* --- @BLKC_TEST@ --- *
@@ -312,9 +400,14 @@
 
 #include <string.h>
 
+#include <mLib/macros.h>
 #include <mLib/quis.h>
 #include <mLib/testrig.h>
 
+#ifndef BLKC_TESTHOOK
+#  define BLKC_TESTHOOK do ; while (0)
+#endif
+
 #define BLKC_VERIFY(PRE, pre) BLKC_VERIFYX(PRE, pre, #pre)
 
 #define BLKC_VERIFYX(PRE, pre, name)					\
@@ -341,7 +434,7 @@ static int pre##_verify(dstr *v)					\
   BLKC_MOVE(PRE, d, p);							\
   pre##_eblk(&k, d, d);							\
   BLKC_STORE(PRE, b.buf, d);						\
-  if (memcmp(b.buf, v[2].buf, PRE##_BLKSZ)) {				\
+  if (MEMCMP(b.buf, !=, v[2].buf, PRE##_BLKSZ)) {			\
     ok = 0;								\
     printf("\nfail encryption:"						\
 	   "\n\tkey	   = ");					\
@@ -357,7 +450,7 @@ static int pre##_verify(dstr *v)					\
   BLKC_MOVE(PRE, d, c);							\
   pre##_dblk(&k, d, d);							\
   BLKC_STORE(PRE, b.buf, d);						\
-  if (memcmp(b.buf, v[1].buf, PRE##_BLKSZ)) {				\
+  if (MEMCMP(b.buf, !=, v[1].buf, PRE##_BLKSZ)) {			\
     ok = 0;								\
     printf("\nfail decryption:"						\
 	   "\n\tkey	   = ");					\
@@ -389,6 +482,7 @@ static const test_chunk defs[] = {					\
 									\
 int main(int argc, char *argv[])					\
 {									\
+  BLKC_TESTHOOK;							\
   test_run(argc, argv, defs, SRCDIR"/t/" fname);			\
   return (0);								\
 }