OLD | NEW |
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 "net/ssl/ssl_info.h" | 5 #include "net/ssl/ssl_info.h" |
6 | 6 |
7 #include "base/pickle.h" | 7 #include "base/pickle.h" |
8 #include "net/cert/cert_status_flags.h" | 8 #include "net/cert/cert_status_flags.h" |
9 #include "net/cert/ct_policy_status.h" | 9 #include "net/cert/ct_policy_status.h" |
10 #include "net/cert/signed_certificate_timestamp.h" | 10 #include "net/cert/signed_certificate_timestamp.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 } | 24 } |
25 | 25 |
26 SSLInfo& SSLInfo::operator=(const SSLInfo& info) { | 26 SSLInfo& SSLInfo::operator=(const SSLInfo& info) { |
27 cert = info.cert; | 27 cert = info.cert; |
28 unverified_cert = info.unverified_cert; | 28 unverified_cert = info.unverified_cert; |
29 cert_status = info.cert_status; | 29 cert_status = info.cert_status; |
30 security_bits = info.security_bits; | 30 security_bits = info.security_bits; |
31 key_exchange_info = info.key_exchange_info; | 31 key_exchange_info = info.key_exchange_info; |
32 connection_status = info.connection_status; | 32 connection_status = info.connection_status; |
33 is_issued_by_known_root = info.is_issued_by_known_root; | 33 is_issued_by_known_root = info.is_issued_by_known_root; |
| 34 pkp_bypassed = info.pkp_bypassed; |
34 client_cert_sent = info.client_cert_sent; | 35 client_cert_sent = info.client_cert_sent; |
35 channel_id_sent = info.channel_id_sent; | 36 channel_id_sent = info.channel_id_sent; |
36 token_binding_negotiated = info.token_binding_negotiated; | 37 token_binding_negotiated = info.token_binding_negotiated; |
37 token_binding_key_param = info.token_binding_key_param; | 38 token_binding_key_param = info.token_binding_key_param; |
38 handshake_type = info.handshake_type; | 39 handshake_type = info.handshake_type; |
39 public_key_hashes = info.public_key_hashes; | 40 public_key_hashes = info.public_key_hashes; |
40 pinning_failure_log = info.pinning_failure_log; | 41 pinning_failure_log = info.pinning_failure_log; |
41 signed_certificate_timestamps = info.signed_certificate_timestamps; | 42 signed_certificate_timestamps = info.signed_certificate_timestamps; |
42 ct_compliance_details_available = info.ct_compliance_details_available; | 43 ct_compliance_details_available = info.ct_compliance_details_available; |
43 ct_ev_policy_compliance = info.ct_ev_policy_compliance; | 44 ct_ev_policy_compliance = info.ct_ev_policy_compliance; |
44 ct_cert_policy_compliance = info.ct_cert_policy_compliance; | 45 ct_cert_policy_compliance = info.ct_cert_policy_compliance; |
45 | 46 |
46 return *this; | 47 return *this; |
47 } | 48 } |
48 | 49 |
49 void SSLInfo::Reset() { | 50 void SSLInfo::Reset() { |
50 cert = NULL; | 51 cert = NULL; |
51 unverified_cert = NULL; | 52 unverified_cert = NULL; |
52 cert_status = 0; | 53 cert_status = 0; |
53 security_bits = -1; | 54 security_bits = -1; |
54 key_exchange_info = 0; | 55 key_exchange_info = 0; |
55 connection_status = 0; | 56 connection_status = 0; |
56 is_issued_by_known_root = false; | 57 is_issued_by_known_root = false; |
| 58 pkp_bypassed = false; |
57 client_cert_sent = false; | 59 client_cert_sent = false; |
58 channel_id_sent = false; | 60 channel_id_sent = false; |
59 token_binding_negotiated = false; | 61 token_binding_negotiated = false; |
60 token_binding_key_param = TB_PARAM_ECDSAP256; | 62 token_binding_key_param = TB_PARAM_ECDSAP256; |
61 handshake_type = HANDSHAKE_UNKNOWN; | 63 handshake_type = HANDSHAKE_UNKNOWN; |
62 public_key_hashes.clear(); | 64 public_key_hashes.clear(); |
63 pinning_failure_log.clear(); | 65 pinning_failure_log.clear(); |
64 signed_certificate_timestamps.clear(); | 66 signed_certificate_timestamps.clear(); |
65 ct_compliance_details_available = false; | 67 ct_compliance_details_available = false; |
66 ct_ev_policy_compliance = ct::EVPolicyCompliance::EV_POLICY_DOES_NOT_APPLY; | 68 ct_ev_policy_compliance = ct::EVPolicyCompliance::EV_POLICY_DOES_NOT_APPLY; |
(...skipping 19 matching lines...) Expand all Loading... |
86 signed_certificate_timestamps.push_back( | 88 signed_certificate_timestamps.push_back( |
87 SignedCertificateTimestampAndStatus(sct, ct::SCT_STATUS_LOG_UNKNOWN)); | 89 SignedCertificateTimestampAndStatus(sct, ct::SCT_STATUS_LOG_UNKNOWN)); |
88 } | 90 } |
89 | 91 |
90 ct_compliance_details_available = ct_verify_result.ct_policies_applied; | 92 ct_compliance_details_available = ct_verify_result.ct_policies_applied; |
91 ct_cert_policy_compliance = ct_verify_result.cert_policy_compliance; | 93 ct_cert_policy_compliance = ct_verify_result.cert_policy_compliance; |
92 ct_ev_policy_compliance = ct_verify_result.ev_policy_compliance; | 94 ct_ev_policy_compliance = ct_verify_result.ev_policy_compliance; |
93 } | 95 } |
94 | 96 |
95 } // namespace net | 97 } // namespace net |
OLD | NEW |