*.c: Check for ARM64 SIMD before using the accelerated code.

[catacomb] / symm / salsa20.c

diff --git a/symm/salsa20.c b/symm/salsa20.c
index 15285985a3d7c1a3fbfa3e2d9254d05a62d61c25..f424b7461b474c76f2c443dfc54dcc459857ad49 100644 (file)
--- a/symm/salsa20.c
+++ b/symm/salsa20.c
@@ -78,6 +78,10 @@ extern core__functype salsa20_core_x86ish_sse2;
 extern core__functype salsa20_core_arm_neon;
 #endif
 
+#if CPUFAM_ARM64
+extern core__functype salsa20_core_arm64;
+#endif
+
 static core__functype *pick_core(void)
 {
 #if CPUFAM_X86 || CPUFAM_AMD64
@@ -87,6 +91,10 @@ static core__functype *pick_core(void)
 #if CPUFAM_ARMEL
   DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm_neon,
                     cpu_feature_p(CPUFEAT_ARM_NEON));
+#endif
+#if CPUFAM_ARM64
+  DISPATCH_PICK_COND(salsa20_core, salsa20_core_arm64,
+                    cpu_feature_p(CPUFEAT_ARM_NEON));
 #endif
   DISPATCH_PICK_FALLBACK(salsa20_core, simple_core);
 }
@@ -767,7 +775,7 @@ static grand *grinit(const void *k, size_t ksz, const void *n,
     g->r.r.ops = ops;
     g->r.ops = myops;
     salsa20_init(&g->ctx, k, ksz, 0);
-    myops->setnonce(g, n);
+    if (n) myops->setnonce(g, n);
     return (&g->r.r);
 }