summaryrefslogtreecommitdiffstats
path: root/net/http
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-22 02:37:48 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-22 02:37:48 +0000
commit45ceea944499f4f81f298a2e456d0ed720656310 (patch)
treedd65abcb07b47e3f6153448af27564a13c8797f7 /net/http
parenta9ec0b5dae2c77a4d722d1a9750d2c2659dfb168 (diff)
downloadchromium_src-45ceea944499f4f81f298a2e456d0ed720656310.zip
chromium_src-45ceea944499f4f81f298a2e456d0ed720656310.tar.gz
chromium_src-45ceea944499f4f81f298a2e456d0ed720656310.tar.bz2
Address post-review feedback for r82214. In addition, no longer attempt to gracefully recover from read errors when deserializing a X509Certificate from a Pickle.
R=wtc BUG=7065 TEST=none Review URL: http://codereview.chromium.org/6880094 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@82618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
-rw-r--r--net/http/http_response_info.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc
index 49090e0..5aee4b1 100644
--- a/net/http/http_response_info.cc
+++ b/net/http/http_response_info.cc
@@ -31,6 +31,8 @@ enum {
RESPONSE_INFO_VERSION_MASK = 0xFF,
// This bit is set if the response info has a cert at the end.
+ // Version 1 serialized only the end-entity certificate, while subsequent
+ // versions include the available certificate chain.
RESPONSE_INFO_HAS_CERT = 1 << 8,
// This bit is set if the response info has a security-bits field (security
@@ -135,8 +137,6 @@ bool HttpResponseInfo::InitFromPickle(const Pickle& pickle,
// read ssl-info
if (flags & RESPONSE_INFO_HAS_CERT) {
- // Version 1 only serialized only the end-entity certificate,
- // while subsequent versions include the entire chain.
X509Certificate::PickleType type = (version == 1) ?
X509Certificate::PICKLETYPE_SINGLE_CERTIFICATE :
X509Certificate::PICKLETYPE_CERTIFICATE_CHAIN;