Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(515)

Side by Side Diff: content/public/common/ssl_status.h

Issue 2206093004: Change SSLStatus to carry a vector of SCT statuses instead of counters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_PUBLIC_COMMON_SSL_STATUS_H_ 5 #ifndef CONTENT_PUBLIC_COMMON_SSL_STATUS_H_
6 #define CONTENT_PUBLIC_COMMON_SSL_STATUS_H_ 6 #define CONTENT_PUBLIC_COMMON_SSL_STATUS_H_
7 7
8 #include <vector>
9
8 #include "content/common/content_export.h" 10 #include "content/common/content_export.h"
9 #include "content/public/common/security_style.h" 11 #include "content/public/common/security_style.h"
10 #include "net/cert/cert_status_flags.h" 12 #include "net/cert/cert_status_flags.h"
13 #include "net/cert/sct_status_flags.h"
11 14
12 namespace net { 15 namespace net {
13 class SSLInfo; 16 class SSLInfo;
14 } 17 }
15 18
16 namespace content { 19 namespace content {
17 20
18 // Collects the SSL information for this NavigationEntry. 21 // Collects the SSL information for this NavigationEntry.
19 struct CONTENT_EXPORT SSLStatus { 22 struct CONTENT_EXPORT SSLStatus {
20 // Flags used for the page security content status. 23 // Flags used for the page security content status.
(...skipping 18 matching lines...) Expand all
39 SSLStatus(const SSLStatus& other); 42 SSLStatus(const SSLStatus& other);
40 ~SSLStatus(); 43 ~SSLStatus();
41 44
42 bool Equals(const SSLStatus& status) const { 45 bool Equals(const SSLStatus& status) const {
43 return security_style == status.security_style && 46 return security_style == status.security_style &&
44 cert_id == status.cert_id && cert_status == status.cert_status && 47 cert_id == status.cert_id && cert_status == status.cert_status &&
45 security_bits == status.security_bits && 48 security_bits == status.security_bits &&
46 key_exchange_info == status.key_exchange_info && 49 key_exchange_info == status.key_exchange_info &&
47 connection_status == status.connection_status && 50 connection_status == status.connection_status &&
48 content_status == status.content_status && 51 content_status == status.content_status &&
49 num_unknown_scts == status.num_unknown_scts && 52 sct_statuses == status.sct_statuses &&
50 num_invalid_scts == status.num_invalid_scts &&
51 num_valid_scts == status.num_valid_scts &&
52 pkp_bypassed == status.pkp_bypassed; 53 pkp_bypassed == status.pkp_bypassed;
53 } 54 }
54 55
55 content::SecurityStyle security_style; 56 content::SecurityStyle security_style;
56 // A cert_id value of 0 indicates that it is unset or invalid. 57 // A cert_id value of 0 indicates that it is unset or invalid.
57 int cert_id; 58 int cert_id;
58 net::CertStatus cert_status; 59 net::CertStatus cert_status;
59 int security_bits; 60 int security_bits;
60 int key_exchange_info; 61 int key_exchange_info;
61 int connection_status; 62 int connection_status;
62 // A combination of the ContentStatusFlags above. 63 // A combination of the ContentStatusFlags above.
63 int content_status; 64 int content_status;
64 // Signed Certificate Timestamps (SCTs) of Certificate Transparency (CT). 65 // The validation statuses of the Signed Certificate Timestamps (SCTs)
65 uint32_t num_unknown_scts; 66 // of Certificate Transparency (CT) that were served with the
66 uint32_t num_invalid_scts; 67 // main resource.
67 uint32_t num_valid_scts; 68 std::vector<net::ct::SCTVerifyStatus> sct_statuses;
68 // True if PKP was bypassed due to a local trust anchor. 69 // True if PKP was bypassed due to a local trust anchor.
69 bool pkp_bypassed; 70 bool pkp_bypassed;
70 }; 71 };
71 72
72 } // namespace content 73 } // namespace content
73 74
74 #endif // CONTENT_PUBLIC_COMMON_SSL_STATUS_H_ 75 #endif // CONTENT_PUBLIC_COMMON_SSL_STATUS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698