diff options
| author | Andy Polyakov <appro@openssl.org> | 2013-12-09 23:44:45 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2013-12-09 23:44:45 +0100 |
| commit | b76310ba74951dcbfb5b74c039d6f050e0b1eb43 (patch) | |
| tree | e69cf186b089db5f610997a3125e9fecd00d2056 /crypto/evp | |
| parent | c012f6e5768e45ec20b3af878773b551d607e313 (diff) | |
ARM assembly pack: AES update from master (including bit-sliced module).
Diffstat (limited to 'crypto/evp')
| -rw-r--r-- | crypto/evp/e_aes.c | 7 |
1 files changed, 7 insertions, 0 deletions
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) \ |