| commit | 0c61efe6da4dd29556e9d2bf7321d2f9283a4e13 | [log] [tgz] |
|---|---|---|
| author | Pete Bentley <prb@google.com> | Tue Aug 13 09:32:23 2019 +0100 |
| committer | Pete Bentley <prb@google.com> | Tue Aug 13 10:27:15 2019 +0100 |
| tree | 207a60c135efaef5dfec5f7b3343034555943fc0 | |
| parent | dd42a613176ed39d12be02cf21aeae057d9ef6e6 [diff] [blame] |
external/boringssl: Sync to bc2a2013e03754a89a701739a7b58c422391efa2. Third time's the charm. This includes the following changes: https://boringssl.googlesource.com/boringssl/+log/c9827e073f64e353c4891ecc2c73721882543ee0..bc2a2013e03754a89a701739a7b58c422391efa2 Test: atest CtsLibcoreTestCases Test: atest CtsLibcoreOkHttpTestCases Change-Id: I7943c83d12237ec6e4dc54fb3d5a9cecb909e6e7
diff --git a/src/include/openssl/cpu.h b/src/include/openssl/cpu.h index ad5fc94..eb36a57 100644 --- a/src/include/openssl/cpu.h +++ b/src/include/openssl/cpu.h
@@ -93,7 +93,7 @@ // bits in XCR0, so it is not necessary to check those. extern uint32_t OPENSSL_ia32cap_P[4]; -#if defined(BORINGSSL_FIPS) +#if defined(BORINGSSL_FIPS) && !defined(BORINGSSL_SHARED_LIBRARY) const uint32_t *OPENSSL_ia32cap_get(void); #else OPENSSL_INLINE const uint32_t *OPENSSL_ia32cap_get(void) {