summaryrefslogtreecommitdiffstats
path: root/net/socket/ssl_host_info.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 19:53:53 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-06 19:53:53 +0000
commitc83f4335d3552a27a7f6fd2b37eff89182804663 (patch)
tree975671093f98cc6864f6f49e842d3f7f1625a54f /net/socket/ssl_host_info.cc
parentf6cff51e79687f3203fdd06d1ea0103aa43d7723 (diff)
downloadchromium_src-c83f4335d3552a27a7f6fd2b37eff89182804663.zip
chromium_src-c83f4335d3552a27a7f6fd2b37eff89182804663.tar.gz
chromium_src-c83f4335d3552a27a7f6fd2b37eff89182804663.tar.bz2
net: don't pass the CRLSet in the SSLConfig.
The SSLConfig was a poor choice of location to carry the CRLSet because the CRLSet can be updated while Chrome is running, but the SSLConfig is relatively static and is cached in several places in the code. This change causes the locations which call X509Certificate::Verify to grab a new reference to the current CRLSet. BUG=none TEST=compiles Review URL: http://codereview.chromium.org/9044011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116720 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/socket/ssl_host_info.cc')
-rw-r--r--net/socket/ssl_host_info.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/net/socket/ssl_host_info.cc b/net/socket/ssl_host_info.cc
index ad9165c..bc4a43e 100644
--- a/net/socket/ssl_host_info.cc
+++ b/net/socket/ssl_host_info.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -8,6 +8,7 @@
#include "base/metrics/histogram.h"
#include "base/pickle.h"
#include "base/string_piece.h"
+#include "net/base/crl_set.h"
#include "net/base/ssl_config_service.h"
#include "net/base/x509_certificate.h"
#include "net/socket/ssl_client_socket.h"
@@ -112,8 +113,9 @@ bool SSLHostInfo::ParseInner(const std::string& data) {
VLOG(1) << "Kicking off verification for " << hostname_;
verification_start_time_ = base::TimeTicks::Now();
verification_end_time_ = base::TimeTicks();
+ scoped_refptr<CRLSet> crl_set(SSLConfigService::GetCRLSet());
int rv = verifier_.Verify(
- cert_.get(), hostname_, flags, crl_set_, &cert_verify_result_,
+ cert_.get(), hostname_, flags, crl_set, &cert_verify_result_,
base::Bind(&SSLHostInfo::VerifyCallback, weak_factory_.GetWeakPtr()),
// TODO(willchan): Figure out how to use NetLog here.
BoundNetLog());