X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/8276a9c565bc29afbc6cc120dfde0801c06c2bbd..HEAD:/symm/hmac-def.h

diff --git a/symm/hmac-def.h b/symm/hmac-def.h
index 72bd126a..76d578d8 100644
--- a/symm/hmac-def.h
+++ b/symm/hmac-def.h
@@ -68,12 +68,11 @@
 /* --- Useful constants --- */						\
 									\
 const octet pre##_hmackeysz[] =						\
-  { KSZ_ANY | KSZ_16BIT, PRE##_STATESZ/256, PRE##_STATESZ%256 };	\
+  { KSZ_ANY | KSZ_16BIT, PRE##_HASHSZ/256, PRE##_HASHSZ%256 };		\
 const octet pre##_sslmackeysz[] =					\
-  { KSZ_ANY | KSZ_16BIT, PRE##_STATESZ/256, PRE##_STATESZ%256 };	\
+  { KSZ_ANY | KSZ_16BIT, PRE##_HASHSZ/256, PRE##_HASHSZ%256 };		\
 const octet pre##_nmackeysz[] =						\
-  { KSZ_SET | KSZ_16BIT,						\
-    2*PRE##_STATESZ/256, 2*PRE##_STATESZ%256, 0, 0 };			\
+  { KSZ_SET | KSZ_16BIT, 2*PRE##_HASHSZ/256, 2*PRE##_HASHSZ%256, 0, 0 }; \
 									\
 /* --- @pre_nmacinit@ --- *						\
  *									\
@@ -208,9 +207,7 @@ void pre##_macinit(pre##_macctx *ctx, const pre##_mackey *key)		\
  */									\
 									\
 void pre##_machash(pre##_macctx *ctx, const void *buf, size_t sz)	\
-{									\
-  pre##_hash(&ctx->ctx, buf, sz);					\
-}									\
+  { pre##_hash(&ctx->ctx, buf, sz); }					\
 									\
 /* --- @pre_macdone@ --- *						\
  *									\
@@ -362,6 +359,7 @@ HMAC_TESTX(PRE, pre, name, fname)
 
 #include <stdio.h>
 
+#include <mLib/macros.h>
 #include <mLib/dstr.h>
 #include <mLib/quis.h>
 #include <mLib/testrig.h>
@@ -402,7 +400,7 @@ static int macverify(dstr *v)						\
       csz -= i;								\
     }									\
     pre##_macdone(&cctx, d.buf);					\
-    if (memcmp(d.buf, v[2].buf, PRE##_HASHSZ) != 0) {			\
+    if (MEMCMP(d.buf, !=, v[2].buf, PRE##_HASHSZ)) {			\
       printf("\nfail:\n\tstep = %i\n\tinput = `%s'\n\tkey = ",		\
 	     *ip, v[0].buf);						\
       type_hex.dump(&v[1], stdout);					\