diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 21:10:02 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-23 21:10:02 +0000 |
| commit | 4f38ffc015c54cb3e50443b1797e7753d49d5957 (patch) | |
| tree | f328e16915384ae9e9732c7b1019f7f19c32f0b8 /net/socket | |
| parent | 2cb588db952bc9e265c45849907aa1c4d0c6655a (diff) | |
| download | chromium_src-4f38ffc015c54cb3e50443b1797e7753d49d5957.zip chromium_src-4f38ffc015c54cb3e50443b1797e7753d49d5957.tar.gz chromium_src-4f38ffc015c54cb3e50443b1797e7753d49d5957.tar.bz2 | |
Remove DisableOCSP().
Instead of calling DisableOCSP() all SSL socket used in sandbox should be created with reb_checking_enabled flag set to false.
BUG=93273
TEST=None
Review URL: http://codereview.chromium.org/7685040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97918 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
| -rw-r--r-- | net/socket/ssl_client_socket_nss.cc | 10 | ||||
| -rw-r--r-- | net/socket/ssl_server_socket_nss.cc | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc index 5380a9a..4fdecc9 100644 --- a/net/socket/ssl_client_socket_nss.cc +++ b/net/socket/ssl_client_socket_nss.cc @@ -838,10 +838,12 @@ int SSLClientSocketNSS::Init() { if (!NSS_IsInitialized()) return ERR_UNEXPECTED; #if !defined(OS_MACOSX) && !defined(OS_WIN) - // We must call EnsureOCSPInit() here, on the IO thread, to get the IO loop - // by MessageLoopForIO::current(). - // X509Certificate::Verify() runs on a worker thread of CertVerifier. - EnsureOCSPInit(); + if (ssl_config_.rev_checking_enabled) { + // We must call EnsureOCSPInit() here, on the IO thread, to get the IO loop + // by MessageLoopForIO::current(). + // X509Certificate::Verify() runs on a worker thread of CertVerifier. + EnsureOCSPInit(); + } #endif LeaveFunction(""); diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc index 08d84b9..78410f8 100644 --- a/net/socket/ssl_server_socket_nss.cc +++ b/net/socket/ssl_server_socket_nss.cc @@ -762,12 +762,6 @@ int SSLServerSocketNSS::Init() { EnsureNSSSSLInit(); if (!NSS_IsInitialized()) return ERR_UNEXPECTED; -#if !defined(OS_MACOSX) && !defined(OS_WIN) - // We must call EnsureOCSPInit() here, on the IO thread, to get the IO loop - // by MessageLoopForIO::current(). - // X509Certificate::Verify() runs on a worker thread of CertVerifier. - EnsureOCSPInit(); -#endif return OK; } |