~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
math/mpx-mul4-*.S: Use more portable type syntax for ambiguous instructions.
[catacomb]
/
symm
/
ocb1-def.h
diff --git
a/symm/ocb1-def.h
b/symm/ocb1-def.h
index
7c7eb29
..
2820aae
100644
(file)
--- a/
symm/ocb1-def.h
+++ b/
symm/ocb1-def.h
@@
-520,6
+520,7
@@
OCB1_TESTX(PRE, pre, name, fname)
#include <stdio.h>
#include <mLib/dstr.h>
#include <stdio.h>
#include <mLib/dstr.h>
+#include <mLib/macros.h>
#include <mLib/quis.h>
#include <mLib/testrig.h>
#include <mLib/quis.h>
#include <mLib/testrig.h>
@@
-581,8
+582,8
@@
static int ocb1verify(dstr *v) \
d.len = BLEN(&b); \
\
if (d.len != v[4].len || \
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); \
fail_enc: \
printf("\nfail encrypt:\n\tstep = %i", *ip); \
fputs("\n\tkey = ", stdout); type_hex.dump(&v[0], stdout); \
@@
-623,7
+624,7
@@
static int ocb1verify(dstr *v) \
d.len = BLEN(&b); \
\
if (d.len != v[3].len || !win || \
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); \
fail_dec: \
printf("\nfail decrypt:\n\tstep = %i", *ip); \
fputs("\n\tkey = ", stdout); type_hex.dump(&v[0], stdout); \