Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/security_state/security_state_model.h" | 5 #include "components/security_state/security_state_model.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 177 security_info->cert_id = visible_security_state.cert_id; | 177 security_info->cert_id = visible_security_state.cert_id; |
| 178 security_info->sha1_deprecation_status = | 178 security_info->sha1_deprecation_status = |
| 179 GetSHA1DeprecationStatus(cert, visible_security_state); | 179 GetSHA1DeprecationStatus(cert, visible_security_state); |
| 180 security_info->mixed_content_status = | 180 security_info->mixed_content_status = |
| 181 GetMixedContentStatus(visible_security_state); | 181 GetMixedContentStatus(visible_security_state); |
| 182 security_info->security_bits = visible_security_state.security_bits; | 182 security_info->security_bits = visible_security_state.security_bits; |
| 183 security_info->connection_status = visible_security_state.connection_status; | 183 security_info->connection_status = visible_security_state.connection_status; |
| 184 security_info->cert_status = visible_security_state.cert_status; | 184 security_info->cert_status = visible_security_state.cert_status; |
| 185 security_info->scheme_is_cryptographic = | 185 security_info->scheme_is_cryptographic = |
| 186 visible_security_state.url.SchemeIsCryptographic(); | 186 visible_security_state.url.SchemeIsCryptographic(); |
| 187 security_info->pkp_bypassed = visible_security_state.pkp_bypassed; | |
| 187 security_info->is_secure_protocol_and_ciphersuite = | 188 security_info->is_secure_protocol_and_ciphersuite = |
| 188 (net::SSLConnectionStatusToVersion(security_info->connection_status) >= | 189 (net::SSLConnectionStatusToVersion(security_info->connection_status) >= |
| 189 net::SSL_CONNECTION_VERSION_TLS1_2 && | 190 net::SSL_CONNECTION_VERSION_TLS1_2 && |
| 190 net::IsSecureTLSCipherSuite(net::SSLConnectionStatusToCipherSuite( | 191 net::IsSecureTLSCipherSuite(net::SSLConnectionStatusToCipherSuite( |
| 191 security_info->connection_status))); | 192 security_info->connection_status))); |
| 192 | 193 |
| 193 security_info->sct_verify_statuses = | 194 security_info->sct_verify_statuses = |
| 194 visible_security_state.sct_verify_statuses; | 195 visible_security_state.sct_verify_statuses; |
| 195 | 196 |
| 196 security_info->security_level = | 197 security_info->security_level = |
| (...skipping 13 matching lines...) Expand all Loading... | |
| 210 | 211 |
| 211 SecurityStateModel::SecurityInfo::SecurityInfo() | 212 SecurityStateModel::SecurityInfo::SecurityInfo() |
| 212 : security_level(SecurityStateModel::NONE), | 213 : security_level(SecurityStateModel::NONE), |
| 213 sha1_deprecation_status(SecurityStateModel::NO_DEPRECATED_SHA1), | 214 sha1_deprecation_status(SecurityStateModel::NO_DEPRECATED_SHA1), |
| 214 mixed_content_status(SecurityStateModel::NO_MIXED_CONTENT), | 215 mixed_content_status(SecurityStateModel::NO_MIXED_CONTENT), |
| 215 scheme_is_cryptographic(false), | 216 scheme_is_cryptographic(false), |
| 216 cert_status(0), | 217 cert_status(0), |
| 217 cert_id(0), | 218 cert_id(0), |
| 218 security_bits(-1), | 219 security_bits(-1), |
| 219 connection_status(0), | 220 connection_status(0), |
| 220 is_secure_protocol_and_ciphersuite(false) {} | 221 is_secure_protocol_and_ciphersuite(false), |
| 222 pkp_bypassed(false) {} | |
| 221 | 223 |
| 222 SecurityStateModel::SecurityInfo::~SecurityInfo() {} | 224 SecurityStateModel::SecurityInfo::~SecurityInfo() {} |
| 223 | 225 |
| 224 SecurityStateModel::SecurityStateModel() {} | 226 SecurityStateModel::SecurityStateModel() {} |
| 225 | 227 |
| 226 SecurityStateModel::~SecurityStateModel() {} | 228 SecurityStateModel::~SecurityStateModel() {} |
| 227 | 229 |
| 228 const SecurityStateModel::SecurityInfo& SecurityStateModel::GetSecurityInfo() | 230 const SecurityStateModel::SecurityInfo& SecurityStateModel::GetSecurityInfo() |
| 229 const { | 231 const { |
| 230 scoped_refptr<net::X509Certificate> cert = nullptr; | 232 scoped_refptr<net::X509Certificate> cert = nullptr; |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 256 } | 258 } |
| 257 | 259 |
| 258 SecurityStateModel::VisibleSecurityState::VisibleSecurityState() | 260 SecurityStateModel::VisibleSecurityState::VisibleSecurityState() |
| 259 : initialized(false), | 261 : initialized(false), |
| 260 initial_security_level(SecurityStateModel::NONE), | 262 initial_security_level(SecurityStateModel::NONE), |
| 261 cert_id(0), | 263 cert_id(0), |
| 262 cert_status(0), | 264 cert_status(0), |
| 263 connection_status(0), | 265 connection_status(0), |
| 264 security_bits(-1), | 266 security_bits(-1), |
| 265 displayed_mixed_content(false), | 267 displayed_mixed_content(false), |
| 266 ran_mixed_content(false) {} | 268 ran_mixed_content(false) {} |
|
estark
2016/06/28 02:43:52
initialize |pkp_bypassed| here, and also check it
dadrian
2016/06/28 18:45:58
Done.
| |
| 267 | 269 |
| 268 SecurityStateModel::VisibleSecurityState::~VisibleSecurityState() {} | 270 SecurityStateModel::VisibleSecurityState::~VisibleSecurityState() {} |
| 269 | 271 |
| 270 bool SecurityStateModel::VisibleSecurityState::operator==( | 272 bool SecurityStateModel::VisibleSecurityState::operator==( |
| 271 const SecurityStateModel::VisibleSecurityState& other) const { | 273 const SecurityStateModel::VisibleSecurityState& other) const { |
| 272 return (url == other.url && | 274 return (url == other.url && |
| 273 initial_security_level == other.initial_security_level && | 275 initial_security_level == other.initial_security_level && |
| 274 cert_id == other.cert_id && cert_status == other.cert_status && | 276 cert_id == other.cert_id && cert_status == other.cert_status && |
| 275 connection_status == other.connection_status && | 277 connection_status == other.connection_status && |
| 276 security_bits == other.security_bits && | 278 security_bits == other.security_bits && |
| 277 sct_verify_statuses == other.sct_verify_statuses && | 279 sct_verify_statuses == other.sct_verify_statuses && |
| 278 displayed_mixed_content == other.displayed_mixed_content && | 280 displayed_mixed_content == other.displayed_mixed_content && |
| 279 ran_mixed_content == other.ran_mixed_content); | 281 ran_mixed_content == other.ran_mixed_content); |
| 280 } | 282 } |
| 281 | 283 |
| 282 } // namespace security_state | 284 } // namespace security_state |
| OLD | NEW |