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

Unified Diff: components/security_state/content/content_utils.cc

Issue 2616553002: Remove obsolete SHA-1 UX elements (Closed)
Patch Set: Final nits Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/pageinfo_strings.grdp ('k') | components/security_state/core/security_state.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/security_state/content/content_utils.cc
diff --git a/components/security_state/content/content_utils.cc b/components/security_state/content/content_utils.cc
index ec7b804210ea536175b5e8394df1a2ab80a619a9..71b9d1c5fe93043db787a8fae01e4a0f4ae57671 100644
--- a/components/security_state/content/content_utils.cc
+++ b/components/security_state/content/content_utils.cc
@@ -230,19 +230,11 @@ blink::WebSecurityStyle GetSecurityStyle(
return security_style;
}
- if (security_info.sha1_deprecation_status ==
- security_state::DEPRECATED_SHA1_MAJOR) {
- security_style_explanations->broken_explanations.push_back(
- content::SecurityStyleExplanation(
- l10n_util::GetStringUTF8(IDS_MAJOR_SHA1),
- l10n_util::GetStringUTF8(IDS_MAJOR_SHA1_DESCRIPTION),
- !!security_info.certificate));
- } else if (security_info.sha1_deprecation_status ==
- security_state::DEPRECATED_SHA1_MINOR) {
+ if (security_info.sha1_in_chain) {
security_style_explanations->unauthenticated_explanations.push_back(
content::SecurityStyleExplanation(
- l10n_util::GetStringUTF8(IDS_MINOR_SHA1),
- l10n_util::GetStringUTF8(IDS_MINOR_SHA1_DESCRIPTION),
+ l10n_util::GetStringUTF8(IDS_SHA1),
+ l10n_util::GetStringUTF8(IDS_SHA1_DESCRIPTION),
!!security_info.certificate));
}
@@ -299,11 +291,9 @@ blink::WebSecurityStyle GetSecurityStyle(
security_style_explanations->broken_explanations.push_back(explanation);
}
} else {
- // If the certificate does not have errors and is not using
- // deprecated SHA1, then add an explanation that the certificate is
- // valid.
- if (security_info.sha1_deprecation_status ==
- security_state::NO_DEPRECATED_SHA1) {
+ // If the certificate does not have errors and is not using SHA1, then add
+ // an explanation that the certificate is valid.
+ if (!security_info.sha1_in_chain) {
security_style_explanations->secure_explanations.push_back(
content::SecurityStyleExplanation(
l10n_util::GetStringUTF8(IDS_VALID_SERVER_CERTIFICATE),
« no previous file with comments | « components/pageinfo_strings.grdp ('k') | components/security_state/core/security_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698