diff options
| author | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 17:02:20 +0000 |
|---|---|---|
| committer | wtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-06-11 17:02:20 +0000 |
| commit | fd4f139fe08bc9596a7295fb5fee8300fb34856a (patch) | |
| tree | 1a01ad68092ad448907764d7d6c87ee48bcf4ad5 /chrome/common | |
| parent | 52f139e2c4189849974901c38aa47b739a40d98a (diff) | |
| download | chromium_src-fd4f139fe08bc9596a7295fb5fee8300fb34856a.zip chromium_src-fd4f139fe08bc9596a7295fb5fee8300fb34856a.tar.gz chromium_src-fd4f139fe08bc9596a7295fb5fee8300fb34856a.tar.bz2 | |
Second attempt to land r49489.
Use NSS for SSL by default on Mac OS X.
To use Mac OS X Secure Transport in Chromium, specify the --use-system-ssl
command-line switch, which also replaced the --use-schannel command-line
switch for Windows. All other programs are hardcoded to use NSS for SSL.
If SSL client authentication is requested, fall back on Mac OS X Secure
Transport for now.
Original review URL: http://codereview.chromium.org/2747002/show
R=mark,mbelshe
BUG=30689
TEST=none
Review URL: http://codereview.chromium.org/2769012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/chrome_switches.cc | 11 | ||||
| -rw-r--r-- | chrome/common/chrome_switches.h | 5 |
2 files changed, 6 insertions, 10 deletions
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc index 2317fe8..f5c122f 100644 --- a/chrome/common/chrome_switches.cc +++ b/chrome/common/chrome_switches.cc @@ -917,9 +917,10 @@ const char kStartupManifest[] = "startup-manifest"; const char kVertScrollDelta[] = "vert-scroll-delta"; #endif -#if defined(OS_WIN) -// Use SChannel (the system SSL library on Windows) instead of NSS for SSL. -const char kUseSChannel[] = "use-schannel"; +#if defined(OS_MACOSX) || defined(OS_WIN) +// Use the system SSL library (Secure Transport on Mac, SChannel on Windows) +// instead of NSS for SSL. +const char kUseSystemSSL[] = "use-system-ssl"; #endif #if defined(OS_POSIX) @@ -944,10 +945,6 @@ const char kEnableSandboxLogging[] = "enable-sandbox-logging"; // Temporary flag to prevent Flash from negotiating the Core Animation drawing // model. This will be removed once the last issues have been resolved. const char kDisableFlashCoreAnimation[] = "disable-flash-core-animation"; - -// Use NSS instead of the system SSL library for SSL. -// This is a temporary testing flag. -const char kUseNSSForSSL[] = "use-nss-for-ssl"; #else // Enable Kiosk mode. const char kKioskMode[] = "kiosk"; diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h index c047e9d7..d851a2f 100644 --- a/chrome/common/chrome_switches.h +++ b/chrome/common/chrome_switches.h @@ -265,8 +265,8 @@ extern const char kStartupManifest[]; extern const char kVertScrollDelta[]; #endif -#if defined(OS_WIN) -extern const char kUseSChannel[]; +#if defined(OS_MACOSX) || defined(OS_WIN) +extern const char kUseSystemSSL[]; #endif #if defined(OS_POSIX) @@ -277,7 +277,6 @@ extern const char kNoProcessSingletonDialog[]; #if defined(OS_MACOSX) extern const char kDisableFlashCoreAnimation[]; extern const char kEnableSandboxLogging[]; -extern const char kUseNSSForSSL[]; #else extern const char kKioskMode[]; #endif |