| Index: chrome/browser/ui/website_settings/website_settings.cc
|
| diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc
|
| index ac71f0eb51dd21bb5c510a6248e76f1ce5ef48a3..bbef28dcace84254db9320735adb544e643ec63a 100644
|
| --- a/chrome/browser/ui/website_settings/website_settings.cc
|
| +++ b/chrome/browser/ui/website_settings/website_settings.cc
|
| @@ -547,17 +547,22 @@ void WebsiteSettings::Init(Profile* profile,
|
| site_connection_details_.assign(l10n_util::GetStringFUTF16(
|
| IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT,
|
| subject_name));
|
| - } else if (ssl.security_bits < 80) {
|
| - site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR;
|
| - site_connection_details_.assign(l10n_util::GetStringFUTF16(
|
| - IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT,
|
| - subject_name));
|
| } else {
|
| site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED;
|
| - site_connection_details_.assign(l10n_util::GetStringFUTF16(
|
| - IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,
|
| - subject_name,
|
| - base::IntToString16(ssl.security_bits)));
|
| +
|
| + if (net::SSLConnectionStatusToVersion(ssl.connection_status) >=
|
| + net::SSL_CONNECTION_VERSION_TLS1_2 &&
|
| + net::IsSecureTLSCipherSuite(
|
| + net::SSLConnectionStatusToCipherSuite(ssl.connection_status))) {
|
| + site_connection_details_.assign(l10n_util::GetStringFUTF16(
|
| + IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT,
|
| + subject_name));
|
| + } else {
|
| + site_connection_details_.assign(l10n_util::GetStringFUTF16(
|
| + IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT,
|
| + subject_name));
|
| + }
|
| +
|
| if (ssl.content_status) {
|
| bool ran_insecure_content =
|
| !!(ssl.content_status & content::SSLStatus::RAN_INSECURE_CONTENT);
|
|
|