X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/fac645f7780c7673775f09fe625651f600f7ee7b..729a52ce3a79c1edd4d72334660a5dd80998b3ef:/symm/salsa20.c?ds=sidebyside

diff --git a/symm/salsa20.c b/symm/salsa20.c
index 15e4d50e..29a43f0e 100644
--- a/symm/salsa20.c
+++ b/symm/salsa20.c
@@ -42,26 +42,32 @@ const octet salsa20_keysz[] = { KSZ_SET, 32, 16, 10, 0 };
  *		the feedforward step.
  */
 
-CPU_DISPATCH(static, (void),
-	     void, core, (unsigned r, const salsa20_matrix src,
-			  salsa20_matrix dest),
-	     (r, src, dest),
-	     pick_core, simple_core);
+CPU_DISPATCH(static, (void), void, core,
+	     (unsigned r, const salsa20_matrix src, salsa20_matrix dest),
+	     (r, src, dest), pick_core, simple_core);
 
 static void simple_core(unsigned r, const salsa20_matrix src,
 			salsa20_matrix dest)
   { SALSA20_nR(dest, src, r); SALSA20_FFWD(dest, src); }
 
-#ifdef CPUFAM_X86
-extern core__functype salsa20_core_x86_sse2;
+#if CPUFAM_X86 || CPUFAM_AMD64
+extern core__functype salsa20_core_x86ish_sse2;
+#endif
+
+#if CPUFAM_ARMEL
+extern core__functype salsa20_core_arm_neon;
 #endif
 
 static core__functype *pick_core(void)
 {
-#ifdef CPUFAM_X86
-  DISPATCH_PICK_COND(salsa20_core, salsa20_core_x86_sse2,
+#if CPUFAM_X86 || CPUFAM_AMD64
+  DISPATCH_PICK_COND(salsa20_core, salsa20_core_x86ish_sse2,
 		     cpu_feature_p(CPUFEAT_X86_SSE2));
 #endif
+#if CPUFAM_ARMEL
+  DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm_neon,
+		     cpu_feature_p(CPUFEAT_ARM_NEON));
+#endif
   DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);
 }
 
@@ -695,7 +701,7 @@ static void grdestroy(grand *r)
   static const grand_ops grops_rand_##rr = {				\
     SALSA20_NAME_##rr, GRAND_CRYPTO, 0,					\
     grmisc, grdestroy, grword,						\
-    grbyte, grword, grand_range, grfill					\
+    grbyte, grword, grand_defaultrange, grfill				\
   };									\
 									\
   grand *SALSA20_DECOR(salsa20, rr, _rand)				\
@@ -738,7 +744,7 @@ SALSA20_VARS(DEFGRAND)
   static const grand_ops grxops_rand_##rr = {				\
     "x" SALSA20_NAME_##rr, GRAND_CRYPTO, 0,				\
     grmisc, grxdestroy_##rr, grword,					\
-    grbyte, grword, grand_range, grfill					\
+    grbyte, grword, grand_defaultrange, grfill				\
   };									\
 									\
   grand *SALSA20_DECOR(xsalsa20, rr, _rand)				\