~mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 2.4.3.
[catacomb]
/
symm
/
rijndael.c
diff --git
a/symm/rijndael.c
b/symm/rijndael.c
index
4c8837d
..
02cfb76
100644
(file)
--- a/
symm/rijndael.c
+++ b/
symm/rijndael.c
@@
-88,6
+88,10
@@
extern rijndael_dblk__functype rijndael_dblk_x86ish_aesni;
extern rijndael_eblk__functype rijndael_eblk_arm_crypto;
extern rijndael_dblk__functype rijndael_dblk_arm_crypto;
#endif
extern rijndael_eblk__functype rijndael_eblk_arm_crypto;
extern rijndael_dblk__functype rijndael_dblk_arm_crypto;
#endif
+#if CPUFAM_ARM64
+extern rijndael_eblk__functype rijndael_eblk_arm64_crypto;
+extern rijndael_dblk__functype rijndael_dblk_arm64_crypto;
+#endif
static rijndael_eblk__functype *pick_eblk(void)
{
static rijndael_eblk__functype *pick_eblk(void)
{
@@
-99,6
+103,10
@@
static rijndael_eblk__functype *pick_eblk(void)
DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_arm_crypto,
cpu_feature_p(CPUFEAT_ARM_AES));
#endif
DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_arm_crypto,
cpu_feature_p(CPUFEAT_ARM_AES));
#endif
+#if CPUFAM_ARM64
+ DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_arm64_crypto,
+ cpu_feature_p(CPUFEAT_ARM_AES));
+#endif
DISPATCH_PICK_FALLBACK(rijndael_eblk, simple_eblk);
}
DISPATCH_PICK_FALLBACK(rijndael_eblk, simple_eblk);
}
@@
-112,6
+120,10
@@
static rijndael_dblk__functype *pick_dblk(void)
DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_arm_crypto,
cpu_feature_p(CPUFEAT_ARM_AES));
#endif
DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_arm_crypto,
cpu_feature_p(CPUFEAT_ARM_AES));
#endif
+#if CPUFAM_ARM64
+ DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_arm64_crypto,
+ cpu_feature_p(CPUFEAT_ARM_AES));
+#endif
DISPATCH_PICK_FALLBACK(rijndael_dblk, simple_dblk);
}
DISPATCH_PICK_FALLBACK(rijndael_dblk, simple_dblk);
}