diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 03:08:54 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-16 03:08:54 +0000 |
| commit | 8cbcabf9c8627175730104d11e1b738ea3900a30 (patch) | |
| tree | 51ff55c16525bb7f707384ce9dad7118c6504c0f /content/browser/browser_main_loop.cc | |
| parent | 5035d458d2da9d175c4f3b9ba767c3f0b23be304 (diff) | |
| download | chromium_src-8cbcabf9c8627175730104d11e1b738ea3900a30.zip chromium_src-8cbcabf9c8627175730104d11e1b738ea3900a30.tar.gz chromium_src-8cbcabf9c8627175730104d11e1b738ea3900a30.tar.bz2 | |
Remove support for 'system' SSL on Mac (SecureTransport) and Win (SChannel)
Remove support for the command-line fallback --use-system-ssl, as it
adds to the maintenance burden and presents a security risk due to
inconsistent patching by the OS vendors. On all platforms but Android,
NSS is used for SSL in all situations.
This does not change how certificate verification is handled, just
the underlying SSL implementation.
BUG=170214
TBR=sky
Review URL: https://chromiumcodereview.appspot.com/11876044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@177068 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/browser_main_loop.cc')
| -rw-r--r-- | content/browser/browser_main_loop.cc | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 255e63a..b58a2cb 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -279,24 +279,8 @@ void BrowserMainLoop::EarlyInitialization() { #endif #if !defined(USE_OPENSSL) - // Use NSS for SSL by default. - // The default client socket factory uses NSS for SSL by default on - // Windows and Mac. - bool init_nspr = false; -#if defined(OS_WIN) || defined(OS_MACOSX) - if (parsed_command_line_.HasSwitch(switches::kUseSystemSSL)) { - net::ClientSocketFactory::UseSystemSSL(); - } else { - init_nspr = true; - } - UMA_HISTOGRAM_BOOLEAN("Chrome.CommandLineUseSystemSSL", !init_nspr); -#elif defined(USE_NSS) - init_nspr = true; -#endif - if (init_nspr) { - // We want to be sure to init NSPR on the main thread. - crypto::EnsureNSPRInit(); - } + // We want to be sure to init NSPR on the main thread. + crypto::EnsureNSPRInit(); #endif // !defined(USE_OPENSSL) #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |