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

[catacomb] / symm / rijndael.c

diff --git a/symm/rijndael.c b/symm/rijndael.c
index 58d896f92002ddfda6b10161031b878d6ec09119..4c8837d26f2a2acc7b35ddce1f132f7a11dafeb0 100644 (file)
--- a/symm/rijndael.c
+++ b/symm/rijndael.c
@@ -84,12 +84,20 @@ CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_dblk,
 extern rijndael_eblk__functype rijndael_eblk_x86ish_aesni;
 extern rijndael_dblk__functype rijndael_dblk_x86ish_aesni;
 #endif
+#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
+extern rijndael_eblk__functype rijndael_eblk_arm_crypto;
+extern rijndael_dblk__functype rijndael_dblk_arm_crypto;
+#endif
 
 static rijndael_eblk__functype *pick_eblk(void)
 {
 #if CPUFAM_X86 || CPUFAM_AMD64
   DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_x86ish_aesni,
                     cpu_feature_p(CPUFEAT_X86_AESNI));
+#endif
+#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
+  DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_arm_crypto,
+                    cpu_feature_p(CPUFEAT_ARM_AES));
 #endif
   DISPATCH_PICK_FALLBACK(rijndael_eblk, simple_eblk);
 }
@@ -99,6 +107,10 @@ static rijndael_dblk__functype *pick_dblk(void)
 #if CPUFAM_X86 || CPUFAM_AMD64
   DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_x86ish_aesni,
                     cpu_feature_p(CPUFEAT_X86_AESNI));
+#endif
+#if CPUFAM_ARMEL && HAVE_AS_ARMV8_CRYPTO
+  DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_arm_crypto,
+                    cpu_feature_p(CPUFEAT_ARM_AES));
 #endif
   DISPATCH_PICK_FALLBACK(rijndael_dblk, simple_dblk);
 }