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

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

Issue 2923403002: Drop SSLv3 cache entries (Closed)
Patch Set: Created 3 years, 6 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 | net/http/http_response_info.cc » ('j') | net/http/http_response_info.cc » ('J')
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/page_info/page_info.h" 5 #include "chrome/browser/ui/page_info/page_info.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 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 } 669 }
670 } 670 }
671 site_connection_details_ += l10n_util::GetStringFUTF16( 671 site_connection_details_ += l10n_util::GetStringFUTF16(
672 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS_AEAD, 672 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS_AEAD,
673 ASCIIToUTF16(cipher), ASCIIToUTF16(key_exchange)); 673 ASCIIToUTF16(cipher), ASCIIToUTF16(key_exchange));
674 } else { 674 } else {
675 site_connection_details_ += l10n_util::GetStringFUTF16( 675 site_connection_details_ += l10n_util::GetStringFUTF16(
676 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS, ASCIIToUTF16(cipher), 676 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTION_DETAILS, ASCIIToUTF16(cipher),
677 ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange)); 677 ASCIIToUTF16(mac), ASCIIToUTF16(key_exchange));
678 } 678 }
679
680 if (ssl_version == net::SSL_CONNECTION_VERSION_SSL3 &&
681 site_connection_status_ <
682 SITE_CONNECTION_STATUS_INSECURE_PASSIVE_SUBRESOURCE) {
683 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
684 }
685 } 679 }
686 680
687 // Check if a user decision has been made to allow or deny certificates with 681 // Check if a user decision has been made to allow or deny certificates with
688 // errors on this site. 682 // errors on this site.
689 ChromeSSLHostStateDelegate* delegate = 683 ChromeSSLHostStateDelegate* delegate =
690 ChromeSSLHostStateDelegateFactory::GetForProfile(profile_); 684 ChromeSSLHostStateDelegateFactory::GetForProfile(profile_);
691 DCHECK(delegate); 685 DCHECK(delegate);
692 // Only show an SSL decision revoke button if the user has chosen to bypass 686 // Only show an SSL decision revoke button if the user has chosen to bypass
693 // SSL host errors for this host in the past. 687 // SSL host errors for this host in the past.
694 show_ssl_decision_revoke_button_ = delegate->HasAllowException(url.host()); 688 show_ssl_decision_revoke_button_ = delegate->HasAllowException(url.host());
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 info.site_identity = UTF16ToUTF8(GetSimpleSiteName(site_url_)); 800 info.site_identity = UTF16ToUTF8(GetSimpleSiteName(site_url_));
807 801
808 info.connection_status = site_connection_status_; 802 info.connection_status = site_connection_status_;
809 info.connection_status_description = UTF16ToUTF8(site_connection_details_); 803 info.connection_status_description = UTF16ToUTF8(site_connection_details_);
810 info.identity_status = site_identity_status_; 804 info.identity_status = site_identity_status_;
811 info.identity_status_description = UTF16ToUTF8(site_identity_details_); 805 info.identity_status_description = UTF16ToUTF8(site_identity_details_);
812 info.certificate = certificate_; 806 info.certificate = certificate_;
813 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_; 807 info.show_ssl_decision_revoke_button = show_ssl_decision_revoke_button_;
814 ui_->SetIdentityInfo(info); 808 ui_->SetIdentityInfo(info);
815 } 809 }
OLDNEW
« no previous file with comments | « no previous file | net/http/http_response_info.cc » ('j') | net/http/http_response_info.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698