| commit | 8ff035535f7cf2903f02bbe94d2fa10b7ab855f1 | [log] [tgz] |
|---|---|---|
| author | Robert Sloan <varomodt@google.com> | Wed Jun 14 12:40:58 2017 -0700 |
| committer | Robert Sloan <varomodt@google.com> | Wed Jun 14 12:42:03 2017 -0700 |
| tree | 7f494cce3aca718e3070e490e31aaeb8fee3ab5e | |
| parent | fb44824b91c8219bc2dd49195d16c1f07d511a26 [diff] [blame] |
external/boringssl: Sync to 5e578c9dba73460c3eb17f771c77fc8e36f7812e. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/58e449904e248f34bdfc2be7a609c58bcb0257b7..5e578c9dba73460c3eb17f771c77fc8e36f7812e Test: BoringSSL CTS Presubmits Change-Id: Ic1541b034545fa58a284ca35134b3719303455c7
diff --git a/src/include/openssl/cpu.h b/src/include/openssl/cpu.h index 81cc5ba..5ccf14b 100644 --- a/src/include/openssl/cpu.h +++ b/src/include/openssl/cpu.h
@@ -156,7 +156,7 @@ } static inline int CRYPTO_is_ARMv8_AES_capable(void) { -#if defined(OPENSSL_STATIC_ARMCAP_AES) +#if defined(OPENSSL_STATIC_ARMCAP_AES) || defined(__ARM_FEATURE_CRYPTO) return 1; #else return 0; @@ -164,7 +164,7 @@ } static inline int CRYPTO_is_ARMv8_PMULL_capable(void) { -#if defined(OPENSSL_STATIC_ARMCAP_PMULL) +#if defined(OPENSSL_STATIC_ARMCAP_PMULL) || defined(__ARM_FEATURE_CRYPTO) return 1; #else return 0;