diff options
| author | Andy Polyakov <appro@openssl.org> | 2015-03-18 16:48:03 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2015-03-28 15:42:12 +0100 |
| commit | 33b188a8e82df57208ec8263c263f8b6f47e8255 (patch) | |
| tree | 8898ccc39711aa4f0a51d2783ce8b30ee2ef98a4 | |
| parent | 2779c08436e3935835118faa38892b6e755d732d (diff) | |
Engage vpaes-armv8 module.
Reviewed-by: Richard Levitte <levitte@openssl.org>
| -rwxr-xr-x | Configure | 2 | ||||
| -rw-r--r-- | crypto/evp/e_aes.c | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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 |