diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 00:20:36 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 00:20:36 +0000 |
| commit | f7c255ea1def87601d233ca1cdd64da6d2543232 (patch) | |
| tree | 07e269e5871f01193542263415deecf47f309d98 /crypto/openssl_util.cc | |
| parent | 948ef5ad51b031190496722b5ccd93d50320829a (diff) | |
| download | chromium_src-f7c255ea1def87601d233ca1cdd64da6d2543232.zip chromium_src-f7c255ea1def87601d233ca1cdd64da6d2543232.tar.gz chromium_src-f7c255ea1def87601d233ca1cdd64da6d2543232.tar.bz2 | |
Revert "Switch to BoringSSL."
This reverts commit 283542.
This broke the WebView Android build.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/openssl_util.cc')
| -rw-r--r-- | crypto/openssl_util.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc index 94bf246..34af810 100644 --- a/crypto/openssl_util.cc +++ b/crypto/openssl_util.cc @@ -6,7 +6,6 @@ #include <openssl/err.h> #include <openssl/ssl.h> -#include <openssl/cpu.h> #include "base/logging.h" #include "base/memory/scoped_vector.h" @@ -23,9 +22,8 @@ namespace crypto { namespace { -void CurrentThreadId(CRYPTO_THREADID* id) { - CRYPTO_THREADID_set_numeric( - id, static_cast<unsigned long>(base::PlatformThread::CurrentId())); +unsigned long CurrentThreadId() { + return static_cast<unsigned long>(base::PlatformThread::CurrentId()); } // Singleton for initializing and cleaning up the OpenSSL library. @@ -55,7 +53,7 @@ class OpenSSLInitSingleton { for (int i = 0; i < num_locks; ++i) locks_.push_back(new base::Lock()); CRYPTO_set_locking_callback(LockingCallback); - CRYPTO_THREADID_set_callback(CurrentThreadId); + CRYPTO_set_id_callback(CurrentThreadId); #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL) const bool has_neon = |