configure.ac, symm/rijndael*: Use ARMv8 AES instructions where available.

[catacomb] / symm / rijndael-base.c

diff --git a/symm/rijndael-base.c b/symm/rijndael-base.c
index b5490c1db8cf78171b7ec4f6cd1b5ef819b420c5..01f781df1019ee50bf12e407b12ef05c7804456f 100644 (file)
--- a/symm/rijndael-base.c
+++ b/symm/rijndael-base.c
@@ -119,12 +119,19 @@ CPU_DISPATCH(static, EMPTY, void, setup,
 #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)
 {
 #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
   DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);
 }