0

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}
This commit is contained in:
davidben
2014-09-12 08:11:09 -07:00
committed by Commit bot
parent cbdb6d6278
commit 71c13e6ac0
7 changed files with 17 additions and 6 deletions

2
DEPS

@ -67,7 +67,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other.
'boringssl_revision': '1195796045e1f8bbd1ed311b2cbd8b9d87f2074a',
'boringssl_revision': 'a70c75cfc0ca32a43985e3f24d737ca9cafcb910',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling nss
# and whatever else without interference from each other.

@ -205,6 +205,11 @@
'enable_hidpi%': 1,
}],
# Enable the OpenSSL backend on Mac OS.
['OS=="mac"', {
'use_openssl%': 1,
}],
# Enable App Launcher everywhere but mobile.
['OS!="ios" and OS!="android"', {
'enable_app_list%': 1,

@ -8,9 +8,9 @@
# the global build dependency on it should be removed.
declare_args() {
# Use OpenSSL instead of NSS. This is used for Android and NaCl untrusted
# Use OpenSSL instead of NSS. This is used for Android, Mac, and NaCl untrusted
# code, and is experimental in other cases (see http://crbug.com/62803).
use_openssl = is_android || is_nacl
use_openssl = is_android || is_mac || is_nacl
}
# True when we're using OpenSSL for certificate verification and storage. We

@ -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)

@ -31,7 +31,10 @@ component("boringssl") {
direct_dependent_configs = [ ":openssl_config" ]
cflags = []
defines = [ "BORINGSSL_IMPLEMENTATION" ]
defines = [
"BORINGSSL_IMPLEMENTATION",
"BORINGSSL_NO_STATIC_INITIALIZER",
]
if (is_component_build) {
defines += [
"BORINGSSL_SHARED_LIBRARY",

@ -13,7 +13,10 @@
'sources': [
'<@(boringssl_lib_sources)',
],
'defines': [ 'BORINGSSL_IMPLEMENTATION' ],
'defines': [
'BORINGSSL_IMPLEMENTATION',
'BORINGSSL_NO_STATIC_INITIALIZER',
],
'conditions': [
['component == "shared_library"', {
'defines': [

@ -100,6 +100,7 @@
'src/crypto/conf/conf_error.c',
'src/crypto/cpu-arm.c',
'src/crypto/cpu-intel.c',
'src/crypto/crypto.c',
'src/crypto/crypto_error.c',
'src/crypto/des/des.c',
'src/crypto/dh/check.c',