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

Side by Side Diff: chrome/browser/ssl/ssl_error_info.cc

Issue 508823009: Mark SHA-1 as deprecated (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cert_verify_result_sha1
Patch Set: Slight tweak to allow levels of errors Created 6 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 | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.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/ssl/ssl_error_info.h" 5 #include "chrome/browser/ssl/ssl_error_info.h"
6 6
7 #include "base/i18n/time_formatting.h" 7 #include "base/i18n/time_formatting.h"
8 #include "base/strings/string_number_conversions.h" 8 #include "base/strings/string_number_conversions.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "chrome/grit/chromium_strings.h" 10 #include "chrome/grit/chromium_strings.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DETAILS, 143 IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DETAILS,
144 UTF8ToUTF16(request_url.host())); 144 UTF8ToUTF16(request_url.host()));
145 short_description = l10n_util::GetStringUTF16( 145 short_description = l10n_util::GetStringUTF16(
146 IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DESCRIPTION); 146 IDS_CERT_ERROR_NAME_CONSTRAINT_VIOLATION_DESCRIPTION);
147 break; 147 break;
148 case CERT_PINNED_KEY_MISSING: 148 case CERT_PINNED_KEY_MISSING:
149 details = l10n_util::GetStringUTF16( 149 details = l10n_util::GetStringUTF16(
150 IDS_ERRORPAGES_SUMMARY_PINNING_FAILURE); 150 IDS_ERRORPAGES_SUMMARY_PINNING_FAILURE);
151 short_description = l10n_util::GetStringUTF16( 151 short_description = l10n_util::GetStringUTF16(
152 IDS_ERRORPAGES_DETAILS_PINNING_FAILURE); 152 IDS_ERRORPAGES_DETAILS_PINNING_FAILURE);
153 break;
153 case UNKNOWN: 154 case UNKNOWN:
154 details = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS); 155 details = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS);
155 short_description = 156 short_description =
156 l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DESCRIPTION); 157 l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DESCRIPTION);
157 break; 158 break;
158 case CERT_UNABLE_TO_CHECK_REVOCATION: // Deprecated. 159 case CERT_UNABLE_TO_CHECK_REVOCATION: // Deprecated.
159 default: 160 default:
160 NOTREACHED(); 161 NOTREACHED();
161 } 162 }
162 return SSLErrorInfo(details, short_description); 163 return SSLErrorInfo(details, short_description);
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 cert_id, &cert); 243 cert_id, &cert);
243 DCHECK(r); 244 DCHECK(r);
244 } 245 }
245 if (errors) 246 if (errors)
246 errors->push_back( 247 errors->push_back(
247 SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url)); 248 SSLErrorInfo::CreateError(kErrorTypes[i], cert.get(), url));
248 } 249 }
249 } 250 }
250 return count; 251 return count;
251 } 252 }
OLDNEW
« no previous file with comments | « chrome/app/google_chrome_strings.grd ('k') | chrome/browser/ui/toolbar/toolbar_model_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698