Engage vpaes-armv8 module.

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

diff --git a/Configure b/Configure
index a35bafd0f99491c35952f37f691796cebdbb46e4..ba8cd964c3f261a9c9e7267b2fcf98ed89280a31 100755 (executable)
--- 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 4fab21b28aab9c5e048c9e22c2142ed25dac159e..7b4d84f58d8155aabfbdc4382f292b72503c1a2a 100644 (file)
--- 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