| 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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 subject_name)); | 540 subject_name)); |
| 541 } else if (ssl.security_bits < 0) { | 541 } else if (ssl.security_bits < 0) { |
| 542 // Security strength is unknown. Say nothing. | 542 // Security strength is unknown. Say nothing. |
| 543 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; | 543 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; |
| 544 } else if (ssl.security_bits == 0) { | 544 } else if (ssl.security_bits == 0) { |
| 545 DCHECK_NE(ssl.security_style, content::SECURITY_STYLE_UNAUTHENTICATED); | 545 DCHECK_NE(ssl.security_style, content::SECURITY_STYLE_UNAUTHENTICATED); |
| 546 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; | 546 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; |
| 547 site_connection_details_.assign(l10n_util::GetStringFUTF16( | 547 site_connection_details_.assign(l10n_util::GetStringFUTF16( |
| 548 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, | 548 IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, |
| 549 subject_name)); | 549 subject_name)); |
| 550 } else if (ssl.security_bits < 80) { | |
| 551 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED_ERROR; | |
| 552 site_connection_details_.assign(l10n_util::GetStringFUTF16( | |
| 553 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, | |
| 554 subject_name)); | |
| 555 } else { | 550 } else { |
| 556 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED; | 551 site_connection_status_ = SITE_CONNECTION_STATUS_ENCRYPTED; |
| 557 site_connection_details_.assign(l10n_util::GetStringFUTF16( | 552 |
| 558 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, | 553 if (net::SSLConnectionStatusToVersion(ssl.connection_status) >= |
| 559 subject_name, | 554 net::SSL_CONNECTION_VERSION_TLS1_2 && |
| 560 base::IntToString16(ssl.security_bits))); | 555 net::IsSecureTLSCipherSuite( |
| 556 net::SSLConnectionStatusToCipherSuite(ssl.connection_status))) { |
| 557 site_connection_details_.assign(l10n_util::GetStringFUTF16( |
| 558 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_CONNECTION_TEXT, |
| 559 subject_name)); |
| 560 } else { |
| 561 site_connection_details_.assign(l10n_util::GetStringFUTF16( |
| 562 IDS_PAGE_INFO_SECURITY_TAB_WEAK_ENCRYPTION_CONNECTION_TEXT, |
| 563 subject_name)); |
| 564 } |
| 565 |
| 561 if (ssl.content_status) { | 566 if (ssl.content_status) { |
| 562 bool ran_insecure_content = | 567 bool ran_insecure_content = |
| 563 !!(ssl.content_status & content::SSLStatus::RAN_INSECURE_CONTENT); | 568 !!(ssl.content_status & content::SSLStatus::RAN_INSECURE_CONTENT); |
| 564 site_connection_status_ = ran_insecure_content ? | 569 site_connection_status_ = ran_insecure_content ? |
| 565 SITE_CONNECTION_STATUS_ENCRYPTED_ERROR | 570 SITE_CONNECTION_STATUS_ENCRYPTED_ERROR |
| 566 : SITE_CONNECTION_STATUS_MIXED_CONTENT; | 571 : SITE_CONNECTION_STATUS_MIXED_CONTENT; |
| 567 site_connection_details_.assign(l10n_util::GetStringFUTF16( | 572 site_connection_details_.assign(l10n_util::GetStringFUTF16( |
| 568 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK, | 573 IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK, |
| 569 site_connection_details_, | 574 site_connection_details_, |
| 570 l10n_util::GetStringUTF16(ran_insecure_content ? | 575 l10n_util::GetStringUTF16(ran_insecure_content ? |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 795 if (visited_before_today) { | 800 if (visited_before_today) { |
| 796 first_visit_text = l10n_util::GetStringFUTF16( | 801 first_visit_text = l10n_util::GetStringFUTF16( |
| 797 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, | 802 IDS_PAGE_INFO_SECURITY_TAB_VISITED_BEFORE_TODAY, |
| 798 base::TimeFormatShortDate(first_visit)); | 803 base::TimeFormatShortDate(first_visit)); |
| 799 } else { | 804 } else { |
| 800 first_visit_text = l10n_util::GetStringUTF16( | 805 first_visit_text = l10n_util::GetStringUTF16( |
| 801 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); | 806 IDS_PAGE_INFO_SECURITY_TAB_FIRST_VISITED_TODAY); |
| 802 } | 807 } |
| 803 ui_->SetFirstVisit(first_visit_text); | 808 ui_->SetFirstVisit(first_visit_text); |
| 804 } | 809 } |
| OLD | NEW |