bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 68.0.3433.0 (#559327)

Browse Source 
Known issues:
- Windows now requires VS 2017 15.7.1 with 10.0.17134.0 SDK.
This commit is contained in:
Marshall Greenblatt
2018-05-21 15:54:08 +03:00
parent 12cc069b69
commit 08ff72fa20
55 changed files with 414 additions and 356 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
patch/patches/net_security_expiration_1994.patch
View File

@ -1,8 +1,8 @@
diff --git net/cert/ct_policy_enforcer.cc net/cert/ct_policy_enforcer.cc
index 0f7778089273..40111e89a2e0 100644
--- net/cert/ct_policy_enforcer.cc
+++ net/cert/ct_policy_enforcer.cc
@@ -35,15 +35,6 @@ namespace net {
diff --git components/certificate_transparency/chrome_ct_policy_enforcer.cc components/certificate_transparency/chrome_ct_policy_enforcer.cc
index a2e2b493def0..c08872260c68 100644
--- components/certificate_transparency/chrome_ct_policy_enforcer.cc
+++ components/certificate_transparency/chrome_ct_policy_enforcer.cc
@@ -36,15 +36,6 @@ namespace certificate_transparency {
namespace {
@ -18,11 +18,14 @@ index 0f7778089273..40111e89a2e0 100644
// Returns a rounded-down months difference of |start| and |end|,
// together with an indication of whether the last month was
// a full month, because the range starts specified in the policy
@@ -302,4 +293,13 @@ ct::CTPolicyCompliance CTPolicyEnforcer::CheckCompliance(
@@ -304,4 +295,16 @@ CTPolicyCompliance ChromeCTPolicyEnforcer::CheckCompliance(
return compliance;
}
+bool CTPolicyEnforcer::IsBuildTimely() const {
+// Returns true if the current build is recent enough to ensure that
+// built-in security information (e.g. CT Logs) is fresh enough.
+// TODO(eranm): Move to base or net/base
+bool ChromeCTPolicyEnforcer::IsBuildTimely() const {
+ if (!enforce_net_security_expiration_)
+ return true;
+
@ -31,15 +34,15 @@ index 0f7778089273..40111e89a2e0 100644
+ return (base::Time::Now() - build_time).InDays() < 70 /* 10 weeks */;
+}
+
} // namespace net
diff --git net/cert/ct_policy_enforcer.h net/cert/ct_policy_enforcer.h
index fb6f4847cfe9..aa4c1cdafb9f 100644
--- net/cert/ct_policy_enforcer.h
+++ net/cert/ct_policy_enforcer.h
@@ -42,6 +42,17 @@ class NET_EXPORT CTPolicyEnforcer {
X509Certificate* cert,
const SCTList& verified_scts,
const NetLogWithSource& net_log);
} // namespace certificate_transparency
diff --git components/certificate_transparency/chrome_ct_policy_enforcer.h components/certificate_transparency/chrome_ct_policy_enforcer.h
index f61ff0d0564a..e6727c7b1cbc 100644
--- components/certificate_transparency/chrome_ct_policy_enforcer.h
+++ components/certificate_transparency/chrome_ct_policy_enforcer.h
@@ -26,6 +26,17 @@ class ChromeCTPolicyEnforcer : public net::CTPolicyEnforcer {
net::X509Certificate* cert,
const net::ct::SCTList& verified_scts,
const net::NetLogWithSource& net_log) override;
+
+ void set_enforce_net_security_expiration(bool enforce) {
+ enforce_net_security_expiration_ = enforce;
@ -53,12 +56,12 @@ index fb6f4847cfe9..aa4c1cdafb9f 100644
+ bool enforce_net_security_expiration_ = true;
};
} // namespace net
} // namespace certificate_transparency
diff --git net/http/transport_security_state.cc net/http/transport_security_state.cc
index 3802937bc0c4..941cf0007fd6 100644
index 5177ef21fdfe..5a98b43c9512 100644
--- net/http/transport_security_state.cc
+++ net/http/transport_security_state.cc
@@ -1559,8 +1559,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
@@ -1562,8 +1562,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
sent_expect_ct_reports_cache_.Clear();
}