diff options
| author | Adam Langley <agl@google.com> | 2015-10-17 01:46:46 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-10-21 01:40:15 +0300 |
| commit | 6a7cfbe06a8832a9a625985bfe8ab86ef98b7931 (patch) | |
| tree | 298961eacc29c7fbc01da32c2a9c144c38edcd51 /crypto/cipher | |
| parent | c2ae53db6dff3b8a773c43e16e3efaf20ff4c7da (diff) | |
Allow ARM capabilities to be set at compile time.
Some ARM environments don't support |getauxval| or signals and need to
configure the capabilities of the chip at compile time. This change adds
defines that allow them to do so.
Change-Id: I4e6987f69dd13444029bc7ac7ed4dbf8fb1faa76
Reviewed-on: https://boringssl-review.googlesource.com/6280
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/cipher')
| -rw-r--r-- | crypto/cipher/e_aes.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/cipher/e_aes.c b/crypto/cipher/e_aes.c index 7d444626..74f32230 100644 --- a/crypto/cipher/e_aes.c +++ b/crypto/cipher/e_aes.c @@ -121,7 +121,7 @@ static char bsaes_capable(void) { #define HWAES static int hwaes_capable(void) { - return (OPENSSL_armcap_P & ARMV8_AES) != 0; + return CRYPTO_is_ARMv8_AES_capable(); } int aes_v8_set_encrypt_key(const uint8_t *user_key, const int bits, @@ -1756,7 +1756,7 @@ int EVP_has_aes_hardware(void) { #if defined(OPENSSL_X86) || defined(OPENSSL_X86_64) return aesni_capable() && crypto_gcm_clmul_enabled(); #elif defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64) - return hwaes_capable() && (OPENSSL_armcap_P & ARMV8_PMULL); + return hwaes_capable() && CRYPTO_is_ARMv8_PMULL_capable(); #else return 0; #endif |