X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/fac645f7780c7673775f09fe625651f600f7ee7b..1a3849032ebf2e7d17b7ee421af28b17f4de1407:/symm/rijndael.c

diff --git a/symm/rijndael.c b/symm/rijndael.c
index dcb35e61..58d896f9 100644
--- a/symm/rijndael.c
+++ b/symm/rijndael.c
@@ -72,25 +72,23 @@ void rijndael_init(rijndael_ctx *k, const void *buf, size_t sz)
  * Use:		Low-level block encryption and decryption.
  */
 
-CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_eblk, (const rijndael_ctx *k,
-						 const uint32 s[4],
-						 uint32 d[4]),
+CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_eblk,
+	     (const rijndael_ctx *k, const uint32 s[4], uint32 d[4]),
 	     (k, s, d), pick_eblk, simple_eblk)
 
-CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_dblk, (const rijndael_ctx *k,
-						 const uint32 s[4],
-						 uint32 d[4]),
+CPU_DISPATCH(EMPTY, EMPTY, void, rijndael_dblk,
+	     (const rijndael_ctx *k, const uint32 s[4], uint32 d[4]),
 	     (k, s, d), pick_dblk, simple_dblk)
 
-#ifdef CPUFAM_X86
-extern rijndael_eblk__functype rijndael_eblk_x86_aesni;
-extern rijndael_dblk__functype rijndael_dblk_x86_aesni;
+#if CPUFAM_X86 || CPUFAM_AMD64
+extern rijndael_eblk__functype rijndael_eblk_x86ish_aesni;
+extern rijndael_dblk__functype rijndael_dblk_x86ish_aesni;
 #endif
 
 static rijndael_eblk__functype *pick_eblk(void)
 {
-#ifdef CPUFAM_X86
-  DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_x86_aesni,
+#if CPUFAM_X86 || CPUFAM_AMD64
+  DISPATCH_PICK_COND(rijndael_eblk, rijndael_eblk_x86ish_aesni,
 		     cpu_feature_p(CPUFEAT_X86_AESNI));
 #endif
   DISPATCH_PICK_FALLBACK(rijndael_eblk, simple_eblk);
@@ -98,8 +96,8 @@ static rijndael_eblk__functype *pick_eblk(void)
 
 static rijndael_dblk__functype *pick_dblk(void)
 {
-#ifdef CPUFAM_X86
-  DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_x86_aesni,
+#if CPUFAM_X86 || CPUFAM_AMD64
+  DISPATCH_PICK_COND(rijndael_dblk, rijndael_dblk_x86ish_aesni,
 		     cpu_feature_p(CPUFEAT_X86_AESNI));
 #endif
   DISPATCH_PICK_FALLBACK(rijndael_dblk, simple_dblk);