OLD | NEW |
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/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
9 #include "chrome/common/time_format.h" | 9 #include "chrome/common/time_format.h" |
10 #include "content/public/browser/cert_store.h" | 10 #include "content/public/browser/cert_store.h" |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 details = l10n_util::GetStringFUTF16( | 186 details = l10n_util::GetStringFUTF16( |
187 IDS_CERT_ERROR_WEAK_KEY_DETAILS, UTF8ToUTF16(request_url.host())); | 187 IDS_CERT_ERROR_WEAK_KEY_DETAILS, UTF8ToUTF16(request_url.host())); |
188 short_description = l10n_util::GetStringUTF16( | 188 short_description = l10n_util::GetStringUTF16( |
189 IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION); | 189 IDS_CERT_ERROR_WEAK_KEY_DESCRIPTION); |
190 extra_info.push_back( | 190 extra_info.push_back( |
191 l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXTRA_INFO_1)); | 191 l10n_util::GetStringUTF16(IDS_CERT_ERROR_EXTRA_INFO_1)); |
192 extra_info.push_back( | 192 extra_info.push_back( |
193 l10n_util::GetStringUTF16( | 193 l10n_util::GetStringUTF16( |
194 IDS_CERT_ERROR_WEAK_KEY_EXTRA_INFO_2)); | 194 IDS_CERT_ERROR_WEAK_KEY_EXTRA_INFO_2)); |
195 break; | 195 break; |
196 case CERT_NOT_IN_DNS: | |
197 title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_NOT_IN_DNS_TITLE); | |
198 details = l10n_util::GetStringUTF16(IDS_CERT_ERROR_NOT_IN_DNS_DETAILS); | |
199 short_description = l10n_util::GetStringUTF16( | |
200 IDS_CERT_ERROR_NOT_IN_DNS_DESCRIPTION); | |
201 extra_info.push_back( | |
202 l10n_util::GetStringUTF16(IDS_CERT_ERROR_NOT_IN_DNS_EXTRA_INFO)); | |
203 break; | |
204 case UNKNOWN: | 196 case UNKNOWN: |
205 title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_TITLE); | 197 title = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_TITLE); |
206 details = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS); | 198 details = l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DETAILS); |
207 short_description = | 199 short_description = |
208 l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DESCRIPTION); | 200 l10n_util::GetStringUTF16(IDS_CERT_ERROR_UNKNOWN_ERROR_DESCRIPTION); |
209 break; | 201 break; |
210 default: | 202 default: |
211 NOTREACHED(); | 203 NOTREACHED(); |
212 } | 204 } |
213 return SSLErrorInfo(title, details, short_description, extra_info); | 205 return SSLErrorInfo(title, details, short_description, extra_info); |
(...skipping 18 matching lines...) Expand all Loading... |
232 case net::ERR_CERT_UNABLE_TO_CHECK_REVOCATION: | 224 case net::ERR_CERT_UNABLE_TO_CHECK_REVOCATION: |
233 return CERT_UNABLE_TO_CHECK_REVOCATION; | 225 return CERT_UNABLE_TO_CHECK_REVOCATION; |
234 case net::ERR_CERT_REVOKED: | 226 case net::ERR_CERT_REVOKED: |
235 return CERT_REVOKED; | 227 return CERT_REVOKED; |
236 case net::ERR_CERT_INVALID: | 228 case net::ERR_CERT_INVALID: |
237 return CERT_INVALID; | 229 return CERT_INVALID; |
238 case net::ERR_CERT_WEAK_SIGNATURE_ALGORITHM: | 230 case net::ERR_CERT_WEAK_SIGNATURE_ALGORITHM: |
239 return CERT_WEAK_SIGNATURE_ALGORITHM; | 231 return CERT_WEAK_SIGNATURE_ALGORITHM; |
240 case net::ERR_CERT_WEAK_KEY: | 232 case net::ERR_CERT_WEAK_KEY: |
241 return CERT_WEAK_KEY; | 233 return CERT_WEAK_KEY; |
242 case net::ERR_CERT_NOT_IN_DNS: | |
243 return CERT_NOT_IN_DNS; | |
244 default: | 234 default: |
245 NOTREACHED(); | 235 NOTREACHED(); |
246 return UNKNOWN; | 236 return UNKNOWN; |
247 } | 237 } |
248 } | 238 } |
249 | 239 |
250 // static | 240 // static |
251 int SSLErrorInfo::GetErrorsForCertStatus(int cert_id, | 241 int SSLErrorInfo::GetErrorsForCertStatus(int cert_id, |
252 net::CertStatus cert_status, | 242 net::CertStatus cert_status, |
253 const GURL& url, | 243 const GURL& url, |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 bool r = content::CertStore::GetInstance()->RetrieveCert( | 276 bool r = content::CertStore::GetInstance()->RetrieveCert( |
287 cert_id, &cert); | 277 cert_id, &cert); |
288 DCHECK(r); | 278 DCHECK(r); |
289 } | 279 } |
290 if (errors) | 280 if (errors) |
291 errors->push_back(SSLErrorInfo::CreateError(kErrorTypes[i], cert, url)); | 281 errors->push_back(SSLErrorInfo::CreateError(kErrorTypes[i], cert, url)); |
292 } | 282 } |
293 } | 283 } |
294 return count; | 284 return count; |
295 } | 285 } |
OLD | NEW |