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

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

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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "content/public/common/ssl_status.h" 5 #include "content/public/common/ssl_status.h"
6 6
7 #include "net/cert/sct_status_flags.h" 7 #include "net/cert/sct_status_flags.h"
8 #include "net/ssl/ssl_info.h" 8 #include "net/ssl/ssl_info.h"
9 9
10 namespace content { 10 namespace content {
11 11
12 SSLStatus::SSLStatus() 12 SSLStatus::SSLStatus()
13 : security_style(SECURITY_STYLE_UNKNOWN), 13 : security_style(SECURITY_STYLE_UNKNOWN),
14 cert_id(0), 14 cert_id(0),
15 cert_status(0), 15 cert_status(0),
16 security_bits(-1), 16 security_bits(-1),
17 key_exchange_info(0), 17 key_exchange_info(0),
18 connection_status(0), 18 connection_status(0),
19 content_status(NORMAL_CONTENT), 19 content_status(NORMAL_CONTENT),
20 num_unknown_scts(0),
21 num_invalid_scts(0),
22 num_valid_scts(0),
23 pkp_bypassed(false) {} 20 pkp_bypassed(false) {}
24 21
25 SSLStatus::SSLStatus(SecurityStyle security_style, 22 SSLStatus::SSLStatus(SecurityStyle security_style,
26 int cert_id, 23 int cert_id,
27 const net::SSLInfo& ssl_info) 24 const net::SSLInfo& ssl_info)
28 : security_style(security_style), 25 : security_style(security_style),
29 cert_id(cert_id), 26 cert_id(cert_id),
30 cert_status(ssl_info.cert_status), 27 cert_status(ssl_info.cert_status),
31 security_bits(ssl_info.security_bits), 28 security_bits(ssl_info.security_bits),
32 key_exchange_info(ssl_info.key_exchange_info), 29 key_exchange_info(ssl_info.key_exchange_info),
33 connection_status(ssl_info.connection_status), 30 connection_status(ssl_info.connection_status),
34 content_status(NORMAL_CONTENT), 31 content_status(NORMAL_CONTENT),
35 num_unknown_scts(0),
36 num_invalid_scts(0),
37 num_valid_scts(0),
38 pkp_bypassed(ssl_info.pkp_bypassed) { 32 pkp_bypassed(ssl_info.pkp_bypassed) {
39 // Count unknown, invalid and valid SCTs.
40 for (const auto& sct_and_status : ssl_info.signed_certificate_timestamps) { 33 for (const auto& sct_and_status : ssl_info.signed_certificate_timestamps) {
41 switch (sct_and_status.status) { 34 sct_statuses.push_back(sct_and_status.status);
42 case net::ct::SCT_STATUS_LOG_UNKNOWN:
43 num_unknown_scts++;
44 break;
45 case net::ct::SCT_STATUS_INVALID:
46 num_invalid_scts++;
47 break;
48 case net::ct::SCT_STATUS_OK:
49 num_valid_scts++;
50 break;
51 case net::ct::SCT_STATUS_NONE:
52 case net::ct::SCT_STATUS_MAX:
53 // These enum values do not represent SCTs that are taken into account
54 // for CT compliance calculations, so we ignore them.
55 NOTREACHED();
56 break;
57 }
58 } 35 }
59 } 36 }
60 37
61 SSLStatus::SSLStatus(const SSLStatus& other) = default; 38 SSLStatus::SSLStatus(const SSLStatus& other) = default;
62 39
63 SSLStatus::~SSLStatus() {} 40 SSLStatus::~SSLStatus() {}
64 41
65 } // namespace content 42 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698