summaryrefslogtreecommitdiffstats
path: root/net/base/ssl_info.cc
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 22:06:38 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-13 22:06:38 +0000
commit1f52249f77b18e6209563b40f769a0372160dc93 (patch)
treede90de3359d29004335d1211a150a904762ef816 /net/base/ssl_info.cc
parent3f57397de701062609522bcef79c6bb718f3bd9e (diff)
downloadchromium_src-1f52249f77b18e6209563b40f769a0372160dc93.zip
chromium_src-1f52249f77b18e6209563b40f769a0372160dc93.tar.gz
chromium_src-1f52249f77b18e6209563b40f769a0372160dc93.tar.bz2
net: add issued_by_known_hash and public_key_hashes to SSLInfo.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6839024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ssl_info.cc')
-rw-r--r--net/base/ssl_info.cc13
1 files changed, 10 insertions, 3 deletions
diff --git a/net/base/ssl_info.cc b/net/base/ssl_info.cc
index 1b60644..40c0fd3 100644
--- a/net/base/ssl_info.cc
+++ b/net/base/ssl_info.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -12,14 +12,17 @@ namespace net {
SSLInfo::SSLInfo()
: cert_status(0),
security_bits(-1),
- connection_status(0) {
+ connection_status(0),
+ is_issued_by_known_root(false) {
}
SSLInfo::SSLInfo(const SSLInfo& info)
: cert(info.cert),
cert_status(info.cert_status),
security_bits(info.security_bits),
- connection_status(info.connection_status) {
+ connection_status(info.connection_status),
+ is_issued_by_known_root(info.is_issued_by_known_root),
+ public_key_hashes(info.public_key_hashes) {
}
SSLInfo::~SSLInfo() {
@@ -30,6 +33,8 @@ SSLInfo& SSLInfo::operator=(const SSLInfo& info) {
cert_status = info.cert_status;
security_bits = info.security_bits;
connection_status = info.connection_status;
+ public_key_hashes = info.public_key_hashes;
+ is_issued_by_known_root = info.is_issued_by_known_root;
return *this;
}
@@ -38,6 +43,8 @@ void SSLInfo::Reset() {
cert_status = 0;
security_bits = -1;
connection_status = 0;
+ is_issued_by_known_root = false;
+ public_key_hashes.clear();
}
void SSLInfo::SetCertError(int error) {