Bläddra i källkod

Enable-legacy-TLS-interstitital-warning.patch

none 4 år sedan
förälder
incheckning
311b3ebfd9
1 ändrade filer med 10 tillägg och 7 borttagningar
  1. 10 7
      build/patches/Enable-legacy-TLS-interstitital-warning.patch

+ 10 - 7
build/patches/Enable-legacy-TLS-interstitital-warning.patch

@@ -3,11 +3,15 @@ Date: Fri, 17 Jul 2020 09:28:36 +0200
 Subject: Enable legacy TLS interstitital warning
 Subject: Enable legacy TLS interstitital warning
 
 
 Expose show-legacy-tls-warnings flag on Android as well
 Expose show-legacy-tls-warnings flag on Android as well
-FILE:Enable-legacy-TLS-interstitital-warning.patch
-FILE:Enable-legacy-TLS-interstitital-warning.patch
 ---
 ---
+ chrome/browser/about_flags.cc                 |  2 --
+ chrome/browser/ssl/tls_deprecation_config.cc  | 22 +------------------
+ components/security_state/core/features.cc    |  2 +-
+ .../network/legacy_tls_config_distributor.cc  | 21 +-----------------
+ services/network/ssl_config_service_mojo.cc   |  7 ++----
+ 5 files changed, 5 insertions(+), 49 deletions(-)
+
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
 diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
-index 92e0f04179..5a14be48a8 100644
 --- a/chrome/browser/about_flags.cc
 --- a/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 +++ b/chrome/browser/about_flags.cc
 @@ -6167,11 +6167,9 @@ const FeatureEntry kFeatureEntries[] = {
 @@ -6167,11 +6167,9 @@ const FeatureEntry kFeatureEntries[] = {
@@ -23,7 +27,6 @@ index 92e0f04179..5a14be48a8 100644
  #if BUILDFLAG(IS_CHROMEOS_ASH)
  #if BUILDFLAG(IS_CHROMEOS_ASH)
      {"enable-assistant-aec", flag_descriptions::kEnableGoogleAssistantAecName,
      {"enable-assistant-aec", flag_descriptions::kEnableGoogleAssistantAecName,
 diff --git a/chrome/browser/ssl/tls_deprecation_config.cc b/chrome/browser/ssl/tls_deprecation_config.cc
 diff --git a/chrome/browser/ssl/tls_deprecation_config.cc b/chrome/browser/ssl/tls_deprecation_config.cc
-index ae6ba0c8c0..7d1345c2ef 100644
 --- a/chrome/browser/ssl/tls_deprecation_config.cc
 --- a/chrome/browser/ssl/tls_deprecation_config.cc
 +++ b/chrome/browser/ssl/tls_deprecation_config.cc
 +++ b/chrome/browser/ssl/tls_deprecation_config.cc
 @@ -58,27 +58,7 @@ void SetRemoteTLSDeprecationConfig(const std::string& binary_config) {
 @@ -58,27 +58,7 @@ void SetRemoteTLSDeprecationConfig(const std::string& binary_config) {
@@ -56,7 +59,6 @@ index ae6ba0c8c0..7d1345c2ef 100644
  
  
  void ResetTLSDeprecationConfigForTesting() {
  void ResetTLSDeprecationConfigForTesting() {
 diff --git a/components/security_state/core/features.cc b/components/security_state/core/features.cc
 diff --git a/components/security_state/core/features.cc b/components/security_state/core/features.cc
-index 2fb3a02cad..64a2050932 100644
 --- a/components/security_state/core/features.cc
 --- a/components/security_state/core/features.cc
 +++ b/components/security_state/core/features.cc
 +++ b/components/security_state/core/features.cc
 @@ -8,7 +8,7 @@ namespace security_state {
 @@ -8,7 +8,7 @@ namespace security_state {
@@ -69,7 +71,6 @@ index 2fb3a02cad..64a2050932 100644
  const base::Feature kSafetyTipUI{"SafetyTip", base::FEATURE_ENABLED_BY_DEFAULT};
  const base::Feature kSafetyTipUI{"SafetyTip", base::FEATURE_ENABLED_BY_DEFAULT};
  
  
 diff --git a/services/network/legacy_tls_config_distributor.cc b/services/network/legacy_tls_config_distributor.cc
 diff --git a/services/network/legacy_tls_config_distributor.cc b/services/network/legacy_tls_config_distributor.cc
-index 5158b3ab2a..a5c30e3a96 100644
 --- a/services/network/legacy_tls_config_distributor.cc
 --- a/services/network/legacy_tls_config_distributor.cc
 +++ b/services/network/legacy_tls_config_distributor.cc
 +++ b/services/network/legacy_tls_config_distributor.cc
 @@ -51,26 +51,7 @@ scoped_refptr<LegacyTLSExperimentConfig> LegacyTLSExperimentConfig::Parse(
 @@ -51,26 +51,7 @@ scoped_refptr<LegacyTLSExperimentConfig> LegacyTLSExperimentConfig::Parse(
@@ -101,7 +102,6 @@ index 5158b3ab2a..a5c30e3a96 100644
  
  
  LegacyTLSConfigDistributor::LegacyTLSConfigDistributor() = default;
  LegacyTLSConfigDistributor::LegacyTLSConfigDistributor() = default;
 diff --git a/services/network/ssl_config_service_mojo.cc b/services/network/ssl_config_service_mojo.cc
 diff --git a/services/network/ssl_config_service_mojo.cc b/services/network/ssl_config_service_mojo.cc
-index 247d8dfae4..3b33b0f942 100644
 --- a/services/network/ssl_config_service_mojo.cc
 --- a/services/network/ssl_config_service_mojo.cc
 +++ b/services/network/ssl_config_service_mojo.cc
 +++ b/services/network/ssl_config_service_mojo.cc
 @@ -120,11 +120,8 @@ bool SSLConfigServiceMojo::CanShareConnectionWithClientCerts(
 @@ -120,11 +120,8 @@ bool SSLConfigServiceMojo::CanShareConnectionWithClientCerts(
@@ -118,3 +118,6 @@ index 247d8dfae4..3b33b0f942 100644
  }
  }
  
  
  void SSLConfigServiceMojo::OnNewCRLSet(scoped_refptr<net::CRLSet> crl_set) {
  void SSLConfigServiceMojo::OnNewCRLSet(scoped_refptr<net::CRLSet> crl_set) {
+-- 
+2.17.1
+