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 "chrome/browser/ui/website_settings/website_settings.h" | 5 #include "chrome/browser/ui/website_settings/website_settings.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <string> | 10 #include <string> |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
190 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_NO_CT | 190 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_NO_CT |
191 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_NO_CT); | 191 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_NO_CT); |
192 | 192 |
193 // Any valid SCT. | 193 // Any valid SCT. |
194 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, | 194 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, |
195 net::ct::SCT_STATUS_OK)) | 195 net::ct::SCT_STATUS_OK)) |
196 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_VERIFIED | 196 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_VERIFIED |
197 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_VERIFIED); | 197 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_VERIFIED); |
198 | 198 |
199 // Any invalid SCT. | 199 // Any invalid SCT. |
200 if (CertificateTransparencyStatusMatchAny( | 200 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, |
| 201 net::ct::SCT_STATUS_INVALID) || |
| 202 CertificateTransparencyStatusMatchAny( |
201 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_TIMESTAMP) || | 203 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_TIMESTAMP) || |
202 CertificateTransparencyStatusMatchAny( | 204 CertificateTransparencyStatusMatchAny( |
203 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_SIGNATURE)) | 205 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_SIGNATURE)) |
204 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_INVALID | 206 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_INVALID |
205 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID); | 207 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID); |
206 | 208 |
207 // All SCTs are from unknown logs. | 209 // All SCTs are from unknown logs. |
208 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_UNVERIFIED | 210 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_UNVERIFIED |
209 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_UNVERIFIED); | 211 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_UNVERIFIED); |
210 } | 212 } |
(...skipping 591 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
802 info.connection_status = site_connection_status_; | 804 info.connection_status = site_connection_status_; |
803 info.connection_status_description = | 805 info.connection_status_description = |
804 UTF16ToUTF8(site_connection_details_); | 806 UTF16ToUTF8(site_connection_details_); |
805 info.identity_status = site_identity_status_; | 807 info.identity_status = site_identity_status_; |
806 info.identity_status_description = | 808 info.identity_status_description = |
807 UTF16ToUTF8(site_identity_details_); | 809 UTF16ToUTF8(site_identity_details_); |
808 info.cert_id = cert_id_; | 810 info.cert_id = cert_id_; |
809 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 811 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
810 ui_->SetIdentityInfo(info); | 812 ui_->SetIdentityInfo(info); |
811 } | 813 } |
OLD | NEW |