| 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/ui/website_settings/website_settings.h" | 5 #include "chrome/browser/ui/website_settings/website_settings.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 494 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 505 site_identity_details_.assign(l10n_util::GetStringFUTF16( | 505 site_identity_details_.assign(l10n_util::GetStringFUTF16( |
| 506 GetSiteIdentityDetailsMessageByCTInfo( | 506 GetSiteIdentityDetailsMessageByCTInfo( |
| 507 ssl.signed_certificate_timestamp_ids, false /* not EV */), | 507 ssl.signed_certificate_timestamp_ids, false /* not EV */), |
| 508 issuer_name)); | 508 issuer_name)); |
| 509 } | 509 } |
| 510 // The date after which no new SHA-1 certificates may be issued. | 510 // The date after which no new SHA-1 certificates may be issued. |
| 511 // 2016-01-01 00:00:00 UTC | 511 // 2016-01-01 00:00:00 UTC |
| 512 static const int64_t kSHA1LastIssuanceDate = INT64_C(13096080000000000); | 512 static const int64_t kSHA1LastIssuanceDate = INT64_C(13096080000000000); |
| 513 if ((ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) && | 513 if ((ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) && |
| 514 cert->valid_expiry() > | 514 cert->valid_expiry() > |
| 515 base::Time::FromInternalValue(kSHA1LastIssuanceDate) && | 515 base::Time::FromInternalValue(kSHA1LastIssuanceDate)) { |
| 516 // NOTE: This use of SHA1IdentityUIWarning needs to be kept in sync | |
| 517 // with ToolbarModelImpl::IsDeprecatedSHA1Present(). | |
| 518 base::FieldTrialList::FindFullName("SHA1IdentityUIWarning") == | |
| 519 "Enabled") { | |
| 520 site_identity_status_ = | 516 site_identity_status_ = |
| 521 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM; | 517 SITE_IDENTITY_STATUS_DEPRECATED_SIGNATURE_ALGORITHM; |
| 522 site_identity_details_ += | 518 site_identity_details_ += |
| 523 UTF8ToUTF16("\n\n") + | 519 UTF8ToUTF16("\n\n") + |
| 524 l10n_util::GetStringUTF16( | 520 l10n_util::GetStringUTF16( |
| 525 IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM); | 521 IDS_PAGE_INFO_SECURITY_TAB_DEPRECATED_SIGNATURE_ALGORITHM); |
| 526 } | 522 } |
| 527 } | 523 } |
| 528 } else { | 524 } else { |
| 529 // HTTP or HTTPS with errors (not warnings). | 525 // HTTP or HTTPS with errors (not warnings). |
| (...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 805 if (visited_before_today) { | 801 if (visited_before_today) { |
| 806 first_visit_text = l10n_util::GetStringFUTF16( | 802 first_visit_text = l10n_util::GetStringFUTF16( |
| 807 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, | 803 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, |
| 808 base::TimeFormatShortDate(first_visit)); | 804 base::TimeFormatShortDate(first_visit)); |
| 809 } else { | 805 } else { |
| 810 first_visit_text = l10n_util::GetStringUTF16( | 806 first_visit_text = l10n_util::GetStringUTF16( |
| 811 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); | 807 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); |
| 812 } | 808 } |
| 813 ui_->SetFirstVisit(first_visit_text); | 809 ui_->SetFirstVisit(first_visit_text); |
| 814 } | 810 } |
| OLD | NEW |