From b76310ba74951dcbfb5b74c039d6f050e0b1eb43 Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Mon, 9 Dec 2013 23:44:45 +0100
Subject: ARM assembly pack: AES update from master (including bit-sliced
 module).

---
 crypto/evp/e_aes.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'crypto/evp')

diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 5278001a21..0890d06c36 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -897,6 +897,13 @@ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
 { return &aes_##keylen##_##mode; }
 #endif
 
+#if defined(AES_ASM) && defined(BSAES_ASM) && (defined(__arm__) || defined(__arm))
+#include "arm_arch.h"
+#if __ARM_ARCH__>=7
+#define BSAES_CAPABLE  (OPENSSL_armcap_P & ARMV7_NEON)
+#endif
+#endif
+
 #define BLOCK_CIPHER_generic_pack(nid,keylen,flags)		\
 	BLOCK_CIPHER_generic(nid,keylen,16,16,cbc,cbc,CBC,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)	\
 	BLOCK_CIPHER_generic(nid,keylen,16,0,ecb,ecb,ECB,flags|EVP_CIPH_FLAG_DEFAULT_ASN1)	\
-- 
cgit v1.2.3