X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/ac82eac807a9818e676c316f8afeab5cff2572cd..HEAD:/symm/blkc.h diff --git a/symm/blkc.h b/symm/blkc.h index bbba7631..444ec8d7 100644 --- a/symm/blkc.h +++ b/symm/blkc.h @@ -400,9 +400,14 @@ #include +#include #include #include +#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) \ @@ -429,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 = "); \ @@ -445,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 = "); \ @@ -477,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); \ }