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

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

Issue 2382983002: Remove the last of the TLS fallback code. (Closed)
Patch Set: mmenke comments Created 4 years, 2 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
« no previous file with comments | « no previous file | components/error_page/common/localized_error.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS, 652 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS,
653 ASCIIToUTF16(cipher), ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange)); 653 ASCIIToUTF16(cipher), ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange));
654 } 654 }
655 655
656 if (ssl_version == net::SSL_CONNECTION_VERSION_SSL3 && 656 if (ssl_version == net::SSL_CONNECTION_VERSION_SSL3 &&
657 site_connection_status_ < 657 site_connection_status_ <
658 SITE_CONNECTION_STATUS_INSECURE_PASSIVE_SUBRESOURCE) { 658 SITE_CONNECTION_STATUS_INSECURE_PASSIVE_SUBRESOURCE) {
659 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; 659 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
660 } 660 }
661 661
662 const bool did_fallback = (security_info.connection_status &
663 net::SSL_CONNECTION_VERSION_FALLBACK) != 0;
664 if (did_fallback) {
665 site_connection_details_ += ASCIIToUTF16("\n\n");
666 site_connection_details_ += l10n_util::GetStringUTF16(
667 IDS_PAGE_INFO_SECURITY_TAB_FALLBACK_MESSAGE);
668 }
669
670 if (no_renegotiation) { 662 if (no_renegotiation) {
671 site_connection_details_ += ASCIIToUTF16("\n\n"); 663 site_connection_details_ += ASCIIToUTF16("\n\n");
672 site_connection_details_ += l10n_util::GetStringUTF16( 664 site_connection_details_ += l10n_util::GetStringUTF16(
673 IDS_PAGE_INFO_SECURITY_TAB_RENEGOTIATION_MESSAGE); 665 IDS_PAGE_INFO_SECURITY_TAB_RENEGOTIATION_MESSAGE);
674 } 666 }
675 } 667 }
676 668
677 // Check if a user decision has been made to allow or deny certificates with 669 // Check if a user decision has been made to allow or deny certificates with
678 // errors on this site. 670 // errors on this site.
679 ChromeSSLHostStateDelegate* delegate = 671 ChromeSSLHostStateDelegate* delegate =
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 info.connection_status = site_connection_status_; 798 info.connection_status = site_connection_status_;
807 info.connection_status_description = 799 info.connection_status_description =
808 UTF16ToUTF8(site_connection_details_); 800 UTF16ToUTF8(site_connection_details_);
809 info.identity_status = site_identity_status_; 801 info.identity_status = site_identity_status_;
810 info.identity_status_description = 802 info.identity_status_description =
811 UTF16ToUTF8(site_identity_details_); 803 UTF16ToUTF8(site_identity_details_);
812 info.certificate = certificate_; 804 info.certificate = certificate_;
813 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 805 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
814 ui_->SetIdentityInfo(info); 806 ui_->SetIdentityInfo(info);
815 } 807 }
OLDNEW
« no previous file with comments | « no previous file | components/error_page/common/localized_error.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698