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.3403.0 (#552595)

Browse Source
This commit is contained in:
Marshall Greenblatt
2018-05-16 12:28:49 +03:00
parent 58413e16b1
commit 84e2286995
31 changed files with 207 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patch/patches/net_security_expiration_1994.patch
View File

@@ -55,10 +55,10 @@ index fb6f4847cfe9..aa4c1cdafb9f 100644
} // namespace net
diff --git net/http/transport_security_state.cc net/http/transport_security_state.cc
index c82981c270e3..25c6a3950830 100644
index 3802937bc0c4..941cf0007fd6 100644
--- net/http/transport_security_state.cc
+++ net/http/transport_security_state.cc
@@ -1581,8 +1581,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
@@ -1559,8 +1559,10 @@ void TransportSecurityState::ClearReportCachesForTesting() {
sent_expect_ct_reports_cache_.Clear();
}
@@ -72,10 +72,10 @@ index c82981c270e3..25c6a3950830 100644
// We consider built-in information to be timely for 10 weeks.
return (base::Time::Now() - build_time).InDays() < 70 /* 10 weeks */;
diff --git net/http/transport_security_state.h net/http/transport_security_state.h
index ed2c644c3c81..4c7a43990c8b 100644
index 5f7873f76376..bccb857b682d 100644
--- net/http/transport_security_state.h
+++ net/http/transport_security_state.h
@@ -582,6 +582,10 @@ class NET_EXPORT TransportSecurityState {
@@ -593,6 +593,10 @@ class NET_EXPORT TransportSecurityState {
// Expect-CT reports.
void ClearReportCachesForTesting();
@@ -86,7 +86,7 @@ index ed2c644c3c81..4c7a43990c8b 100644
private:
friend class TransportSecurityStateTest;
friend class TransportSecurityStateStaticFuzzer;
@@ -602,7 +606,7 @@ class NET_EXPORT TransportSecurityState {
@@ -613,7 +617,7 @@ class NET_EXPORT TransportSecurityState {
// IsBuildTimely returns true if the current build is new enough ensure that
// built in security information (i.e. HSTS preloading and pinning
// information) is timely.
@@ -95,7 +95,7 @@ index ed2c644c3c81..4c7a43990c8b 100644
// Helper method for actually checking pins.
PKPStatus CheckPublicKeyPinsImpl(
@@ -711,6 +715,8 @@ class NET_EXPORT TransportSecurityState {
@@ -722,6 +726,8 @@ class NET_EXPORT TransportSecurityState {
// True if public key pinning bypass is enabled for local trust anchors.
bool enable_pkp_bypass_for_local_trust_anchors_;