X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/e2f967aeff8b2c0b42d0b0a209f47543d61e48b1..141c12847a1c2f8cc8db03d420551584e689fb87:/symm/salsa20.c

diff --git a/symm/salsa20.c b/symm/salsa20.c
index 0303d8bd..7806e6ca 100644
--- a/symm/salsa20.c
+++ b/symm/salsa20.c
@@ -97,7 +97,8 @@ static core__functype *pick_core(void)
 		     cpu_feature_p(CPUFEAT_ARM_NEON));
 #endif
 #if CPUFAM_ARM64
-  DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm64, 1);
+  DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm64,
+		     cpu_feature_p(CPUFEAT_ARM_NEON));
 #endif
   DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);
 }
@@ -870,6 +871,7 @@ SALSA20_VARS(DEFXGRAND)
 #include <stdio.h>
 #include <string.h>
 
+#include <mLib/macros.h>
 #include <mLib/quis.h>
 #include <mLib/testrig.h>
 
@@ -899,7 +901,7 @@ static const int perm[] = {
     }									\
     for (i = 0; i < SALSA20_OUTSZ/4; i++) STORE32_L(d.buf + 4*i, b[i]);	\
 									\
-    if (d.len != v[2].len || memcmp(d.buf, v[2].buf, v[2].len) != 0) {	\
+    if (d.len != v[2].len || MEMCMP(d.buf, !=, v[2].buf, v[2].len)) {	\
       ok = 0;								\
       printf("\nfail core:"						\
 	     "\n\titerations = %d"					\
@@ -969,7 +971,7 @@ SALSA20_VARS(DEFVCORE)
       }									\
       if (sz) BASE##_ENCRYPT(r, &ctx, p, q, sz);			\
 									\
-      if (d.len != v[5].len || memcmp(d.buf, v[5].buf, v[5].len) != 0) { \
+      if (d.len != v[5].len || MEMCMP(d.buf, !=, v[5].buf, v[5].len)) {	\
 	ok = 0;								\
 	printf("\nfail encrypt:"					\
 	       "\n\tstep	   = %lu"				\