progs/perftest.c: Use from Glibc syscall numbers.

[catacomb] / symm / ocb3-def.h

diff --git a/symm/ocb3-def.h b/symm/ocb3-def.h
index 14a22f6..a5ee46e 100644 (file)
--- a/symm/ocb3-def.h
+++ b/symm/ocb3-def.h
@@ -768,11 +768,14 @@ static gaead_key *gckey(const void *k, size_t ksz)                        \
   return (&key->k);                                                    \
 }                                                                      \
                                                                        \
+static int gcszok(size_t nsz, size_t hsz, size_t msz, size_t tsz)      \
+  { return (gaead_szokcommon(&pre##_ocb3, nsz, hsz, msz, tsz)); }      \
+                                                                       \
 const gcaead pre##_ocb3 = {                                            \
   name "-ocb3",                                                                \
   pre##_keysz, pre##_ocb3noncesz, pre##_ocb3tagsz,                     \
   PRE##_BLKSZ, PRE##_BLKSZ - 1, 0, AEADF_PCTSZ,                                \
-  gckey                                                                        \
+  gckey, gcszok                                                                \
 };                                                                     \
                                                                        \
 OCB3_TESTX(PRE, pre, name, fname)
@@ -854,8 +857,8 @@ static int ocb3verify(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);       \
@@ -896,7 +899,7 @@ static int ocb3verify(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);       \
@@ -965,7 +968,7 @@ static int ocb3mct(dstr *v)                                         \
   if (rc) goto fail;                                                   \
                                                                        \
   d.len = tsz;                                                         \
-  if (memcmp(d.buf, v[1].buf, tsz) != 0) {                             \
+  if (MEMCMP(d.buf, !=, v[1].buf, tsz)) {                              \
   fail:                                                                        \
     printf("\nfail mct: ksz = %u, tsz = %u", ksz, tsz);                        \
     fputs("\n\texp tag = ", stdout); type_hex.dump(&v[1], stdout);     \