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

Side by Side Diff: chrome/browser/ui/website_settings/website_settings.cc

Issue 2208073002: DO NOT REVIEW: Certificate Transparency: Extend SCT verify result enum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CT: Formatting and compilation fixes. Created 4 years, 4 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 "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 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_NO_CT 155 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_NO_CT
156 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_NO_CT); 156 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_NO_CT);
157 157
158 // Any valid SCT. 158 // Any valid SCT.
159 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, 159 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses,
160 net::ct::SCT_STATUS_OK)) 160 net::ct::SCT_STATUS_OK))
161 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_VERIFIED 161 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_VERIFIED
162 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_VERIFIED); 162 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_VERIFIED);
163 163
164 // Any invalid SCT. 164 // Any invalid SCT.
165 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, 165 if (CertificateTransparencyStatusMatchAny(
166 net::ct::SCT_STATUS_INVALID)) 166 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_SIGNATURE) ||
167 CertificateTransparencyStatusMatchAny(
168 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_TIMESTAMP))
167 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_INVALID 169 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_INVALID
168 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID); 170 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID);
169 171
170 // All SCTs are from unknown logs. 172 // All SCTs are from unknown logs.
171 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_UNVERIFIED 173 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_UNVERIFIED
172 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_UNVERIFIED); 174 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_UNVERIFIED);
173 } 175 }
174 176
175 // This function will return SITE_IDENTITY_STATUS_CERT or 177 // This function will return SITE_IDENTITY_STATUS_CERT or
176 // SITE_IDENTITY_STATUS_EV_CERT depending on |is_ev| unless all SCTs 178 // SITE_IDENTITY_STATUS_EV_CERT depending on |is_ev| unless all SCTs
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
757 info.connection_status = site_connection_status_; 759 info.connection_status = site_connection_status_;
758 info.connection_status_description = 760 info.connection_status_description =
759 UTF16ToUTF8(site_connection_details_); 761 UTF16ToUTF8(site_connection_details_);
760 info.identity_status = site_identity_status_; 762 info.identity_status = site_identity_status_;
761 info.identity_status_description = 763 info.identity_status_description =
762 UTF16ToUTF8(site_identity_details_); 764 UTF16ToUTF8(site_identity_details_);
763 info.cert_id = cert_id_; 765 info.cert_id = cert_id_;
764 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 766 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
765 ui_->SetIdentityInfo(info); 767 ui_->SetIdentityInfo(info);
766 } 768 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698