~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
58d896f
..
4c8837d
100644
(file)
--- a/
symm/rijndael.c
+++ b/
symm/rijndael.c
@@
-84,6
+84,10
@@
CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_dblk,
extern rijndael_eblk__functype rijndael_eblk_x86ish_aesni;
extern rijndael_dblk__functype rijndael_dblk_x86ish_aesni;
#endif
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)
{
static rijndael_eblk__functype *pick_eblk(void)
{
@@
-91,6
+95,10
@@
static rijndael_eblk__functype *pick_eblk(void)
DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_x86ish_aesni,
cpu_feature_p(CPUFEAT_X86_AESNI));
#endif
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);
}
DISPATCH_PICK_FALLBACK(rijndael_eblk, simple_eblk);
}
@@
-100,6
+108,10
@@
static rijndael_dblk__functype *pick_dblk(void)
DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_x86ish_aesni,
cpu_feature_p(CPUFEAT_X86_AESNI));
#endif
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);
}
DISPATCH_PICK_FALLBACK(rijndael_dblk, simple_dblk);
}