k->wi[i] = k->w[j + jj++];
}
-CPU_DISPATCH(static, EMPTY, void, setup, (rijndael_ctx *k, unsigned nb,
- const void *buf, unsigned nk),
+CPU_DISPATCH(static, EMPTY, void, setup,
+ (rijndael_ctx *k, unsigned nb, const void *buf, unsigned nk),
(k, nb, buf, nk), pick_setup, simple_setup)
-#ifdef CPUFAM_X86
-extern setup__functype rijndael_setup_x86_aesni;
+#if CPUFAM_X86 || CPUFAM_AMD64
+extern setup__functype rijndael_setup_x86ish_aesni;
+#endif
+#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
+extern setup__functype rijndael_setup_arm_crypto;
#endif
static setup__functype *pick_setup(void)
{
-#ifdef CPUFAM_X86
- if (cpu_feature_p(CPUFEAT_X86_AESNI)) return rijndael_setup_x86_aesni;
+#if CPUFAM_X86 || CPUFAM_AMD64
+ DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86ish_aesni,
+ cpu_feature_p(CPUFEAT_X86_AESNI));
+#endif
+#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
+ DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_arm_crypto,
+ cpu_feature_p(CPUFEAT_ARM_AES));
#endif
- return simple_setup;
+ DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);
}
void rijndael_setup(rijndael_ctx *k, unsigned nb, const void *buf, size_t sz)