summaryrefslogtreecommitdiffstats
path: root/net/socket
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 07:51:32 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 07:51:32 +0000
commit2a0c0a575bdca50635c7a64d8d7f8f0b2a5bfdc9 (patch)
tree692fbdae4da2ff5732614a1877a04481154788ee /net/socket
parentf4e3d50372bef0dfbdec0ce42ac7e920aafd830c (diff)
downloadchromium_src-2a0c0a575bdca50635c7a64d8d7f8f0b2a5bfdc9.zip
chromium_src-2a0c0a575bdca50635c7a64d8d7f8f0b2a5bfdc9.tar.gz
chromium_src-2a0c0a575bdca50635c7a64d8d7f8f0b2a5bfdc9.tar.bz2
Integrate OCSP handlers in SSLClientSocketNSS.
It depends on http://codereview.chromium.org/126046 BUG=none TEST=none Review URL: http://codereview.chromium.org/155912 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22147 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket')
-rw-r--r--net/socket/ssl_client_socket_nss.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index acdcf73..96a8c6d 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -70,6 +70,7 @@
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
#include "net/base/ssl_info.h"
+#include "net/ocsp/nss_ocsp.h"
static const int kRecvBufferSize = 4096;
@@ -214,8 +215,12 @@ SSLClientSocketNSS::~SSLClientSocketNSS() {
int SSLClientSocketNSS::Init() {
EnterFunction("");
- // Call NSS_NoDB_Init() in a threadsafe way.
+ // Initialize NSS in a threadsafe way.
base::EnsureNSSInit();
+ // 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();
LeaveFunction("");
return OK;