summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authordavidben <davidben@chromium.org>2014-09-12 08:11:09 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-12 15:13:27 +0000
commit71c13e6ac01d5cdc49ca40e8e9301d5142d85018 (patch)
treee2cebabd51261dd2a7f82bd3f768e017de249464 /crypto
parentcbdb6d62787e1562ad23bb5517d31b698c6babad (diff)
downloadchromium_src-71c13e6ac01d5cdc49ca40e8e9301d5142d85018.zip
chromium_src-71c13e6ac01d5cdc49ca40e8e9301d5142d85018.tar.gz
chromium_src-71c13e6ac01d5cdc49ca40e8e9301d5142d85018.tar.bz2
Reland dd7edfa67: Switch Mac over to BoringSSL from NSS.
This is a reland of dd7edfa67 which was reverted in 80a9a88f4c for build failures. It also includes a BoringSSL roll and build changes to avoid adding a static initializer. This is a much much larger change than the diff suggests. If it breaks something, please revert first and ask questions later. BUG=338885 TBR=brettw Review URL: https://codereview.chromium.org/568643003 Cr-Commit-Position: refs/heads/master@{#294589}
Diffstat (limited to 'crypto')
-rw-r--r--crypto/openssl_util.cc1
1 files changed, 0 insertions, 1 deletions
diff --git a/crypto/openssl_util.cc b/crypto/openssl_util.cc
index 7994489..f41b55a 100644
--- a/crypto/openssl_util.cc
+++ b/crypto/openssl_util.cc
@@ -50,7 +50,6 @@ class OpenSSLInitSingleton {
OpenSSLInitSingleton() {
SSL_load_error_strings();
SSL_library_init();
- OpenSSL_add_all_algorithms();
int num_locks = CRYPTO_num_locks();
locks_.reserve(num_locks);
for (int i = 0; i < num_locks; ++i)