| commit | 2424d84dd6dbdc0d32a4c80e6810d168f722ce0b | [log] [tgz] |
|---|---|---|
| author | Robert Sloan <varomodt@google.com> | Mon May 01 07:46:28 2017 -0700 |
| committer | Robert Sloan <varomodt@google.com> | Mon May 01 07:46:37 2017 -0700 |
| tree | 8727f96cb5c16125aa208b34cea46fe26473dcb1 | |
| parent | 9254e681d446a8105bd66f08bae1252d4d89a139 [diff] [blame] |
external/boringssl: Sync to 58e449904e248f34bdfc2be7a609c58bcb0257b7. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/2c1523733a71166943e52da11ac2eae82b0227b8..58e449904e248f34bdfc2be7a609c58bcb0257b7 Test: BoringSSL CTS Presubmits Change-Id: I1a825139c8c7076d09b8a3acc5f09a547a7cbe0d
diff --git a/src/include/openssl/cpu.h b/src/include/openssl/cpu.h index 1a4294a..81cc5ba 100644 --- a/src/include/openssl/cpu.h +++ b/src/include/openssl/cpu.h
@@ -91,6 +91,15 @@ * Note: the CPUID bits are pre-adjusted for the OSXSAVE bit and the YMM and XMM * bits in XCR0, so it is not necessary to check those. */ extern uint32_t OPENSSL_ia32cap_P[4]; + +#if defined(BORINGSSL_FIPS) +const uint32_t *OPENSSL_ia32cap_get(void); +#else +static inline const uint32_t *OPENSSL_ia32cap_get(void) { + return OPENSSL_ia32cap_P; +} +#endif + #endif #if defined(OPENSSL_ARM) || defined(OPENSSL_AARCH64)