| Index: crypto/openssl_util.cc
|
| diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc
|
| index 410cab5a88872ef4e47f11b9d227cec0a180a224..e2b859e4b3cda2c77679fdebf926c194b4a33735 100644
|
| --- a/crypto/openssl_util.cc
|
| +++ b/crypto/openssl_util.cc
|
| @@ -5,8 +5,8 @@
|
| #include "crypto/openssl_util.h"
|
|
|
| #include <openssl/err.h>
|
| -#include <openssl/ssl.h>
|
| #include <openssl/cpu.h>
|
| +#include <openssl/crypto.h>
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| @@ -49,14 +49,14 @@ class OpenSSLInitSingleton {
|
| const bool has_neon =
|
| (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
|
| base::CPU cpu;
|
| - // CRYPTO_set_NEON_capable is called before |SSL_library_init| because this
|
| - // stops BoringSSL from probing for NEON support via SIGILL in the case that
|
| - // getauxval isn't present. Also workaround a CPU with broken NEON
|
| + // CRYPTO_set_NEON_capable is called before |CRYPTO_library_init| because
|
| + // this stops BoringSSL from probing for NEON support via SIGILL in the case
|
| + // that getauxval isn't present. Also workaround a CPU with broken NEON
|
| // support. See https://code.google.com/p/chromium/issues/detail?id=341598
|
| CRYPTO_set_NEON_capable(has_neon && !cpu.has_broken_neon());
|
| #endif
|
|
|
| - SSL_library_init();
|
| + CRYPTO_library_init();
|
| }
|
|
|
| ~OpenSSLInitSingleton() {}
|
|
|