X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/8c5956c14f5834a072e1a9345ae1f356b14164ca..98da614204552e2342214d28cd0839869aa13668:/symm/eax-def.h diff --git a/symm/eax-def.h b/symm/eax-def.h index 6e1c7ca4..bc5c7b90 100644 --- a/symm/eax-def.h +++ b/symm/eax-def.h @@ -123,7 +123,7 @@ void pre##_eaxsetkey(pre##_eaxkey *key, const void *k, size_t ksz) \ * \ * * %$z_i = E_K(t_0 \xor m_0)$% is the tweak with the `full final \ * buffer' mask applied, which is the final tag for a final empty \ - * message. \ + * message. \ */ \ BLKC_BSET(PRE, t, 0); pre##_eblk(&key->ctx, t, key->v0); \ BLKC_XMOVE(PRE, t, key->m0); pre##_eblk(&key->ctx, t, key->z0); \ @@ -700,6 +700,7 @@ EAX_TESTX(PRE, pre, name, fname) #include #include +#include #include #include @@ -761,8 +762,8 @@ static int eaxverify(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); \ @@ -803,7 +804,7 @@ static int eaxverify(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); \