X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/8c5956c14f5834a072e1a9345ae1f356b14164ca..799e63b486e5d3d473de8032261b35f80707cd54:/symm/ccm-def.h

diff --git a/symm/ccm-def.h b/symm/ccm-def.h
index 2d864fa6..7002aba1 100644
--- a/symm/ccm-def.h
+++ b/symm/ccm-def.h
@@ -338,9 +338,9 @@ int pre##_ccmencrypt(pre##_ccmctx *ctx,					\
   /* Determine the buffering plan.  Our buffer is going to do double-	\
    * duty here.  The end portion is going to contain mask from the	\
    * encrypted counter which we mix into the plaintext to encrypt it;	\
-   * the start portion, which originally mask bytes we've already used,	\
-   * will hold the input plaintext, which will eventually be		\
-   * collected into the CBC-MAC state.					\
+   * the start portion, which originally contained mask bytes we've	\
+   * already used, will hold the input plaintext, which will		\
+   * eventually be collected into the CBC-MAC state.			\
    */									\
   rsvr_mkplan(&plan, &pre##_ccmpolicy, ctx->off, sz);			\
 									\
@@ -427,9 +427,9 @@ int pre##_ccmdecrypt(pre##_ccmctx *ctx,					\
   /* Determine the buffering plan.  Our buffer is going to do double-	\
    * duty here.  The end portion is going to contain mask from the	\
    * encrypted counter which we mix into the plaintext to encrypt it;	\
-   * the start portion, which originally mask bytes we've already used,	\
-   * will hold the recovered plaintext, which will eventually be	\
-   * collected into the CBC-MAC state.					\
+   * the start portion, which originally mask contained bytes we've	\
+   * already used, will hold the recovered plaintext, which will	\
+   * eventually be collected into the CBC-MAC state.			\
    */									\
   rsvr_mkplan(&plan, &pre##_ccmpolicy, ctx->off, sz);			\
 									\
@@ -742,6 +742,7 @@ CCM_TESTX(PRE, pre, name, fname)
 #include <stdio.h>
 
 #include <mLib/dstr.h>
+#include <mLib/macros.h>
 #include <mLib/quis.h>
 #include <mLib/testrig.h>
 
@@ -802,8 +803,8 @@ static int ccmverify(dstr *v)						\
     d.len = BLEN(&b);							\
 									\
     if (d.len != v[4].len ||						\
-	memcmp(d.buf, v[4].buf, v[4].len) != 0 ||			\
-	memcmp(t.buf, v[5].buf, v[5].len) != 0) {			\
+	MEMCMP(d.buf, !=, v[4].buf, v[4].len) ||			\
+	MEMCMP(t.buf, !=, v[5].buf, v[5].len)) {			\
     fail_enc:								\
       printf("\nfail encrypt:\n\tstep = %i", *ip);			\
       fputs("\n\tkey = ", stdout); type_hex.dump(&v[0], stdout);	\
@@ -855,7 +856,7 @@ static int ccmverify(dstr *v)						\
     d.len = BLEN(&b);							\
 									\
     if (d.len != v[3].len || !win ||					\
-	memcmp(d.buf, v[3].buf, v[3].len) != 0) {			\
+	MEMCMP(d.buf, !=, v[3].buf, v[3].len)) {			\
     fail_dec:								\
       printf("\nfail decrypt:\n\tstep = %i", *ip);			\
       fputs("\n\tkey = ", stdout); type_hex.dump(&v[0], stdout);	\