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

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

Issue 2294373002: Certificate Transparency: Remove the obsolete invalid sct status. (Closed)
Patch Set: Making common headers available to nacl code Created 4 years, 3 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 178 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_NO_CT 189 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_NO_CT
190 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_NO_CT); 190 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_NO_CT);
191 191
192 // Any valid SCT. 192 // Any valid SCT.
193 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, 193 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses,
194 net::ct::SCT_STATUS_OK)) 194 net::ct::SCT_STATUS_OK))
195 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_VERIFIED 195 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_VERIFIED
196 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_VERIFIED); 196 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_VERIFIED);
197 197
198 // Any invalid SCT. 198 // Any invalid SCT.
199 if (CertificateTransparencyStatusMatchAny(sct_verify_statuses, 199 if (CertificateTransparencyStatusMatchAny(
200 net::ct::SCT_STATUS_INVALID) ||
201 CertificateTransparencyStatusMatchAny(
202 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_TIMESTAMP) || 200 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_TIMESTAMP) ||
203 CertificateTransparencyStatusMatchAny( 201 CertificateTransparencyStatusMatchAny(
204 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_SIGNATURE)) 202 sct_verify_statuses, net::ct::SCT_STATUS_INVALID_SIGNATURE))
205 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_INVALID 203 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_INVALID
206 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID); 204 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_INVALID);
207 205
208 // All SCTs are from unknown logs. 206 // All SCTs are from unknown logs.
209 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_UNVERIFIED 207 return (is_ev ? IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_EV_CT_UNVERIFIED
210 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_UNVERIFIED); 208 : IDS_PAGE_INFO_SECURITY_TAB_SECURE_IDENTITY_CT_UNVERIFIED);
211 } 209 }
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
807 info.connection_status = site_connection_status_; 805 info.connection_status = site_connection_status_;
808 info.connection_status_description = 806 info.connection_status_description =
809 UTF16ToUTF8(site_connection_details_); 807 UTF16ToUTF8(site_connection_details_);
810 info.identity_status = site_identity_status_; 808 info.identity_status = site_identity_status_;
811 info.identity_status_description = 809 info.identity_status_description =
812 UTF16ToUTF8(site_identity_details_); 810 UTF16ToUTF8(site_identity_details_);
813 info.certificate = certificate_; 811 info.certificate = certificate_;
814 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 812 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
815 ui_->SetIdentityInfo(info); 813 ui_->SetIdentityInfo(info);
816 } 814 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698