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

Side by Side Diff: content/common/ssl_status_serialization.cc

Issue 2066483009: Expose SSLInfo::pkp_bypassed to devtools (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove change to browser_protocol.json Created 4 years, 5 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 #include "content/common/ssl_status_serialization.h" 5 #include "content/common/ssl_status_serialization.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/numerics/safe_conversions.h" 10 #include "base/numerics/safe_conversions.h"
(...skipping 23 matching lines...) Expand all
34 base::Pickle pickle; 34 base::Pickle pickle;
35 pickle.WriteInt(ssl_status.security_style); 35 pickle.WriteInt(ssl_status.security_style);
36 pickle.WriteInt(ssl_status.cert_id); 36 pickle.WriteInt(ssl_status.cert_id);
37 pickle.WriteUInt32(ssl_status.cert_status); 37 pickle.WriteUInt32(ssl_status.cert_status);
38 pickle.WriteInt(ssl_status.security_bits); 38 pickle.WriteInt(ssl_status.security_bits);
39 pickle.WriteInt(ssl_status.key_exchange_info); 39 pickle.WriteInt(ssl_status.key_exchange_info);
40 pickle.WriteInt(ssl_status.connection_status); 40 pickle.WriteInt(ssl_status.connection_status);
41 pickle.WriteUInt32(ssl_status.num_unknown_scts); 41 pickle.WriteUInt32(ssl_status.num_unknown_scts);
42 pickle.WriteUInt32(ssl_status.num_invalid_scts); 42 pickle.WriteUInt32(ssl_status.num_invalid_scts);
43 pickle.WriteUInt32(ssl_status.num_valid_scts); 43 pickle.WriteUInt32(ssl_status.num_valid_scts);
44 pickle.WriteBool(ssl_status.pkp_bypassed);
44 return std::string(static_cast<const char*>(pickle.data()), pickle.size()); 45 return std::string(static_cast<const char*>(pickle.data()), pickle.size());
45 } 46 }
46 47
47 bool DeserializeSecurityInfo(const std::string& state, SSLStatus* ssl_status) { 48 bool DeserializeSecurityInfo(const std::string& state, SSLStatus* ssl_status) {
48 *ssl_status = SSLStatus(); 49 *ssl_status = SSLStatus();
49 50
50 if (state.empty()) { 51 if (state.empty()) {
51 // No SSL used. 52 // No SSL used.
52 return true; 53 return true;
53 } 54 }
54 55
55 base::Pickle pickle(state.data(), base::checked_cast<int>(state.size())); 56 base::Pickle pickle(state.data(), base::checked_cast<int>(state.size()));
56 base::PickleIterator iter(pickle); 57 base::PickleIterator iter(pickle);
57 int security_style; 58 int security_style;
58 if (!iter.ReadInt(&security_style) || !iter.ReadInt(&ssl_status->cert_id) || 59 if (!iter.ReadInt(&security_style) || !iter.ReadInt(&ssl_status->cert_id) ||
59 !iter.ReadUInt32(&ssl_status->cert_status) || 60 !iter.ReadUInt32(&ssl_status->cert_status) ||
60 !iter.ReadInt(&ssl_status->security_bits) || 61 !iter.ReadInt(&ssl_status->security_bits) ||
61 !iter.ReadInt(&ssl_status->key_exchange_info) || 62 !iter.ReadInt(&ssl_status->key_exchange_info) ||
62 !iter.ReadInt(&ssl_status->connection_status) || 63 !iter.ReadInt(&ssl_status->connection_status) ||
63 !iter.ReadUInt32(&ssl_status->num_unknown_scts) || 64 !iter.ReadUInt32(&ssl_status->num_unknown_scts) ||
64 !iter.ReadUInt32(&ssl_status->num_invalid_scts) || 65 !iter.ReadUInt32(&ssl_status->num_invalid_scts) ||
65 !iter.ReadUInt32(&ssl_status->num_valid_scts)) { 66 !iter.ReadUInt32(&ssl_status->num_valid_scts) ||
67 !iter.ReadBool(&ssl_status->pkp_bypassed)) {
66 *ssl_status = SSLStatus(); 68 *ssl_status = SSLStatus();
67 return false; 69 return false;
68 } 70 }
69 71
70 if (!CheckSecurityStyle(security_style)) { 72 if (!CheckSecurityStyle(security_style)) {
71 *ssl_status = SSLStatus(); 73 *ssl_status = SSLStatus();
72 return false; 74 return false;
73 } 75 }
74 76
75 ssl_status->security_style = static_cast<SecurityStyle>(security_style); 77 ssl_status->security_style = static_cast<SecurityStyle>(security_style);
76 78
77 // Sanity check |security_bits|: the only allowed negative value is -1. 79 // Sanity check |security_bits|: the only allowed negative value is -1.
78 if (ssl_status->security_bits < -1) { 80 if (ssl_status->security_bits < -1) {
79 *ssl_status = SSLStatus(); 81 *ssl_status = SSLStatus();
80 return false; 82 return false;
81 } 83 }
82 84
83 // Sanity check |key_exchange_info|: 0 or greater. 85 // Sanity check |key_exchange_info|: 0 or greater.
84 if (ssl_status->key_exchange_info < 0) { 86 if (ssl_status->key_exchange_info < 0) {
85 *ssl_status = SSLStatus(); 87 *ssl_status = SSLStatus();
86 return false; 88 return false;
87 } 89 }
88 90
89 return true; 91 return true;
90 } 92 }
91 93
92 } // namespace content 94 } // namespace content
OLDNEW
« no previous file with comments | « components/security_state/security_state_model.cc ('k') | content/public/browser/security_style_explanations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698