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 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_NO_CT | 152 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_NO_CT |
153 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_NO_CT); | 153 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_NO_CT); |
154 | 154 |
155 // Any valid SCT. | 155 // Any valid SCT. |
156 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, | 156 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, |
157 net::ct::SCT_STATUS_OK)) | 157 net::ct::SCT_STATUS_OK)) |
158 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_VERIFIED | 158 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_VERIFIED |
159 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_VERIFIED); | 159 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_VERIFIED); |
160 | 160 |
161 // Any invalid SCT. | 161 // Any invalid SCT. |
162 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, | 162 if (CertificateTransparencyStatusMatchAny( |
163 net::ct::SCT_STATUS_INVALID)) | 163 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_TIMESTAMP) || |
| 164 CertificateTransparencyStatusMatchAny( |
| 165 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_SIGNATURE)) |
164 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_INVALID | 166 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_INVALID |
165 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID); | 167 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID); |
166 | 168 |
167 // All SCTs are from unknown logs. | 169 // All SCTs are from unknown logs. |
168 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_UNVERIFIED | 170 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_UNVERIFIED |
169 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_UNVERIFIED); | 171 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_UNVERIFIED); |
170 } | 172 } |
171 | 173 |
172 // This function will return SITE_IDENTITY_STATUS_CERT or | 174 // This function will return SITE_IDENTITY_STATUS_CERT or |
173 // SITE_IDENTITY_STATUS_EV_CERT depending on |is_ev| unless all SCTs | 175 // SITE_IDENTITY_STATUS_EV_CERT depending on |is_ev| unless all SCTs |
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 info.connection_status = site_connection_status_; | 761 info.connection_status = site_connection_status_; |
760 info.connection_status_description = | 762 info.connection_status_description = |
761 UTF16ToUTF8(site_connection_details_); | 763 UTF16ToUTF8(site_connection_details_); |
762 info.identity_status = site_identity_status_; | 764 info.identity_status = site_identity_status_; |
763 info.identity_status_description = | 765 info.identity_status_description = |
764 UTF16ToUTF8(site_identity_details_); | 766 UTF16ToUTF8(site_identity_details_); |
765 info.cert_id = cert_id_; | 767 info.cert_id = cert_id_; |
766 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; | 768 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; |
767 ui_->SetIdentityInfo(info); | 769 ui_->SetIdentityInfo(info); |
768 } | 770 } |
OLD | NEW |