From: Andy Polyakov <appro@openssl.org>
Date: Wed, 18 Mar 2015 15:48:03 +0000 (+0100)
Subject: Engage vpaes-armv8 module.
X-Git-Tag: OpenSSL_1_1_0-pre1~1379
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=33b188a8e82df57208ec8263c263f8b6f47e8255

Engage vpaes-armv8 module.

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/Configure b/Configure
index a35bafd0f9..ba8cd964c3 100755
--- a/Configure
+++ b/Configure
@@ -425,7 +425,7 @@ my %table=(
     aarch64_asm => {
 	template	=> 1,
 	cpuid_obj       => "armcap.o arm64cpuid.o mem_clr.o",
-	aes_obj         => "aes_core.o aes_cbc.o aesv8-armx.o",
+	aes_obj         => "aes_core.o aes_cbc.o aesv8-armx.o vpaes-armv8.o",
 	sha1_obj        => "sha1-armv8.o sha256-armv8.o sha512-armv8.o",
 	modes_obj       => "ghashv8-armx.o",
     },
diff --git a/crypto/evp/e_aes.c b/crypto/evp/e_aes.c
index 4fab21b28a..7b4d84f58d 100644
--- a/crypto/evp/e_aes.c
+++ b/crypto/evp/e_aes.c
@@ -980,6 +980,9 @@ const EVP_CIPHER *EVP_aes_##keylen##_##mode(void) \
 #   if defined(BSAES_ASM)
 #    define BSAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
 #   endif
+#   if defined(VPAES_ASM)
+#    define VPAES_CAPABLE (OPENSSL_armcap_P & ARMV7_NEON)
+#   endif
 #   define HWAES_CAPABLE (OPENSSL_armcap_P & ARMV8_AES)
 #   define HWAES_set_encrypt_key aes_v8_set_encrypt_key
 #   define HWAES_set_decrypt_key aes_v8_set_decrypt_key