X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/ac82eac807a9818e676c316f8afeab5cff2572cd..4741bd9fa1f6dfc9f6482d6e1335ad046dbd6a78:/symm/poly1305.c

diff --git a/symm/poly1305.c b/symm/poly1305.c
index c4a88a84..9deaf19f 100644
--- a/symm/poly1305.c
+++ b/symm/poly1305.c
@@ -861,6 +861,7 @@ void poly1305_done(poly1305_ctx *ctx, void *h)
 
 #ifdef TEST_RIG
 
+#include <mLib/macros.h>
 #include <mLib/testrig.h>
 
 #include "ct.h"
@@ -888,7 +889,7 @@ static int vrf_hash(dstr v[])
       poly1305_hash(&ctx, v[2].buf + j, v[2].len - j);
       poly1305_done(&ctx, t.buf);
       ct_remedy(t.buf, t.len);
-      if (memcmp(t.buf, v[3].buf, 16) != 0) {
+      if (MEMCMP(t.buf, !=, v[3].buf, 16)) {
 	fprintf(stderr, "failed...");
 	fprintf(stderr, "\n\tkey    = "); type_hex.dump(&v[0], stderr);
 	fprintf(stderr, "\n\tmask   = "); type_hex.dump(&v[1], stderr);
@@ -932,7 +933,7 @@ static int vrf_cat(dstr v[])
       poly1305_concat(&ctx, &ctx, &cc[2]);
     }
     poly1305_done(&ctx, t.buf);
-    if (memcmp(t.buf, v[5].buf, 16) != 0) {
+    if (MEMCMP(t.buf, !=, v[5].buf, 16)) {
       fprintf(stderr, "failed...");
       fprintf(stderr, "\n\tkey    = "); type_hex.dump(&v[0], stderr);
       fprintf(stderr, "\n\tmask   = "); type_hex.dump(&v[1], stderr);
@@ -963,18 +964,18 @@ static int vrf_mct(dstr v[])
   octet k[16], r[16], n[16], s[16], *t, m[MSZMAX] = { 0 };
   int ok = 1;
 
-  if (v[0].len != sizeof(k)) { fprintf(stderr, "AES key len\n"); exit(2); }
-  if (v[1].len != sizeof(r)) { fprintf(stderr, "poly key len\n"); exit(2); }
-  if (v[2].len != sizeof(n)) { fprintf(stderr, "nonce len\n"); exit(2); }
-  if (v[4].len != sizeof(n)) { fprintf(stderr, "result len\n"); exit(2); }
-  memcpy(k, v[0].buf, sizeof(k));
-  memcpy(r, v[1].buf, sizeof(k));
-  memcpy(n, v[2].buf, sizeof(k));
+  if (v[0].len != 16) { fprintf(stderr, "AES key len\n"); exit(2); }
+  if (v[1].len != 16) { fprintf(stderr, "poly key len\n"); exit(2); }
+  if (v[2].len != 16) { fprintf(stderr, "nonce len\n"); exit(2); }
+  if (v[4].len != 16) { fprintf(stderr, "result len\n"); exit(2); }
+  memcpy(k, v[0].buf, 16);
+  memcpy(r, v[1].buf, 16);
+  memcpy(n, v[2].buf, 16);
   niter = *(unsigned long *)v[3].buf;
   dstr_ensure(&d, 16); d.len = 16; t = (octet *)d.buf;
 
-  rijndael_ecbinit(&rij, k, sizeof(k), 0);
-  poly1305_keyinit(&key, r, sizeof(r));
+  rijndael_ecbinit(&rij, k, 16, 0);
+  poly1305_keyinit(&key, r, 16);
   for (i = 0; i < niter; i++) {
     msz = 0;
     for (;;) {
@@ -987,17 +988,17 @@ static int vrf_mct(dstr v[])
       for (j = 0; j < 16; j++) n[j] ^= t[j];
       if (msz%2) {
 	for (j = 0; j < 16; j++) k[j] ^= t[j];
-	rijndael_ecbinit(&rij, k, sizeof(k), 0);
+	rijndael_ecbinit(&rij, k, 16, 0);
       }
       if (msz%3) {
 	for (j = 0; j < 16; j++) r[j] ^= t[j];
-	poly1305_keyinit(&key, r, sizeof(r));
+	poly1305_keyinit(&key, r, 16);
       }
       m[msz++] ^= t[0];
     }
   }
 
-  if (memcmp(t, v[4].buf, 16) != 0) {
+  if (MEMCMP(t, !=, v[4].buf, 16)) {
     ok = 0;
     fprintf(stderr, "failed...");
     fprintf(stderr, "\n\tinitial k = "); type_hex.dump(&v[0], stderr);