2019-10-01 13:30:07 +02:00
|
|
|
diff --git base/BUILD.gn base/BUILD.gn
|
2023-09-15 21:51:43 +02:00
|
|
|
index 82cb596dcbb36..16c057933e1f8 100644
|
2019-10-01 13:30:07 +02:00
|
|
|
--- base/BUILD.gn
|
|
|
|
+++ base/BUILD.gn
|
2023-04-04 20:00:13 +02:00
|
|
|
@@ -40,6 +40,7 @@ import("//build/config/ui.gni")
|
2023-01-03 00:34:43 +01:00
|
|
|
import("//build/nocompile.gni")
|
2019-10-01 13:30:07 +02:00
|
|
|
import("//build/timestamp.gni")
|
2020-07-08 19:23:29 +02:00
|
|
|
import("//build_overrides/build.gni")
|
2019-10-01 13:30:07 +02:00
|
|
|
+import("//cef/libcef/features/features.gni")
|
|
|
|
import("//testing/libfuzzer/fuzzer_test.gni")
|
|
|
|
import("//testing/test.gni")
|
2022-04-21 20:58:48 +02:00
|
|
|
|
2023-09-15 21:51:43 +02:00
|
|
|
@@ -1502,7 +1503,11 @@ component("base") {
|
2019-10-01 13:30:07 +02:00
|
|
|
"hash/md5_constexpr_internal.h",
|
|
|
|
"hash/sha1.h",
|
|
|
|
]
|
|
|
|
- if (is_nacl) {
|
|
|
|
+ deps += [ "//cef/libcef/features" ]
|
|
|
|
+ if (enable_cef) {
|
|
|
|
+ configs += [ "//cef/libcef/features:config" ]
|
|
|
|
+ }
|
|
|
|
+ if (is_nacl || is_cef_sandbox_build) {
|
|
|
|
sources += [
|
|
|
|
"hash/md5_nacl.cc",
|
|
|
|
"hash/md5_nacl.h",
|
2023-09-15 21:51:43 +02:00
|
|
|
@@ -1911,6 +1916,12 @@ component("base") {
|
2020-10-08 21:54:42 +02:00
|
|
|
defines += [ "COM_INIT_CHECK_HOOK_DISABLED" ]
|
|
|
|
}
|
|
|
|
|
|
|
|
+ if (!use_custom_libcxx) {
|
|
|
|
+ # Enable the VS 2015 Update 2 fix when building with the MSVC standard
|
|
|
|
+ # library.
|
|
|
|
+ defines += [ "_ENABLE_ATOMIC_ALIGNMENT_FIX" ]
|
|
|
|
+ }
|
|
|
|
+
|
2021-08-20 01:40:49 +02:00
|
|
|
libs += [
|
|
|
|
"cfgmgr32.lib",
|
2023-02-27 19:52:38 +01:00
|
|
|
"ntdll.lib",
|
2022-08-23 03:37:40 +02:00
|
|
|
diff --git base/allocator/dispatcher/dispatcher.cc base/allocator/dispatcher/dispatcher.cc
|
2023-08-09 23:17:17 +02:00
|
|
|
index 616e2e89af7d3..2a2993e74d53a 100644
|
2022-08-23 03:37:40 +02:00
|
|
|
--- base/allocator/dispatcher/dispatcher.cc
|
|
|
|
+++ base/allocator/dispatcher/dispatcher.cc
|
2023-08-09 23:17:17 +02:00
|
|
|
@@ -10,6 +10,7 @@
|
2023-04-26 21:55:59 +02:00
|
|
|
#include "base/check.h"
|
2022-08-23 03:37:40 +02:00
|
|
|
#include "base/dcheck_is_on.h"
|
|
|
|
#include "base/no_destructor.h"
|
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
|
|
|
|
#if DCHECK_IS_ON()
|
|
|
|
#include <atomic>
|
2023-08-09 23:17:17 +02:00
|
|
|
@@ -33,7 +34,7 @@ struct Dispatcher::Impl {
|
2022-08-23 03:37:40 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void Reset() {
|
|
|
|
-#if DCHECK_IS_ON()
|
|
|
|
+#if DCHECK_IS_ON() && !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
DCHECK([&]() {
|
2022-09-26 21:30:45 +02:00
|
|
|
auto const was_set = is_initialized_check_flag_.test_and_set();
|
2022-08-23 03:37:40 +02:00
|
|
|
is_initialized_check_flag_.clear();
|
2019-10-01 13:30:07 +02:00
|
|
|
diff --git base/hash/md5.h base/hash/md5.h
|
2022-09-26 21:30:45 +02:00
|
|
|
index aa889f350e8f7..50acac8a69225 100644
|
2019-10-01 13:30:07 +02:00
|
|
|
--- base/hash/md5.h
|
|
|
|
+++ base/hash/md5.h
|
|
|
|
@@ -10,8 +10,9 @@
|
|
|
|
#include "base/base_export.h"
|
|
|
|
#include "base/strings/string_piece.h"
|
|
|
|
#include "build/build_config.h"
|
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
|
2022-01-25 21:26:51 +01:00
|
|
|
-#if BUILDFLAG(IS_NACL)
|
|
|
|
+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
2019-10-01 13:30:07 +02:00
|
|
|
#include "base/hash/md5_nacl.h"
|
|
|
|
#else
|
|
|
|
#include "base/hash/md5_boringssl.h"
|
2021-04-21 00:52:34 +02:00
|
|
|
diff --git base/hash/sha1.h base/hash/sha1.h
|
2022-09-26 21:30:45 +02:00
|
|
|
index 29626e5853c6e..2fb1c61504c5d 100644
|
2021-04-21 00:52:34 +02:00
|
|
|
--- base/hash/sha1.h
|
|
|
|
+++ base/hash/sha1.h
|
|
|
|
@@ -14,7 +14,9 @@
|
|
|
|
#include "base/containers/span.h"
|
|
|
|
#include "base/strings/string_piece.h"
|
|
|
|
#include "build/build_config.h"
|
2022-01-25 21:26:51 +01:00
|
|
|
-#if BUILDFLAG(IS_NACL)
|
2021-04-21 00:52:34 +02:00
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
+
|
2022-01-25 21:26:51 +01:00
|
|
|
+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
2021-04-21 00:52:34 +02:00
|
|
|
#include "base/hash/sha1_nacl.h"
|
|
|
|
#else
|
|
|
|
#include "base/hash/sha1_boringssl.h"
|
2022-10-17 19:27:40 +02:00
|
|
|
diff --git base/rand_util.h base/rand_util.h
|
2023-05-30 10:55:32 +02:00
|
|
|
index c9dd1249660c1..7d68b0d893e3d 100644
|
2022-10-17 19:27:40 +02:00
|
|
|
--- base/rand_util.h
|
|
|
|
+++ base/rand_util.h
|
|
|
|
@@ -15,8 +15,9 @@
|
|
|
|
#include "base/compiler_specific.h"
|
|
|
|
#include "base/gtest_prod_util.h"
|
|
|
|
#include "build/build_config.h"
|
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
|
|
|
|
-#if !BUILDFLAG(IS_NACL)
|
|
|
|
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
#include "third_party/boringssl/src/include/openssl/rand.h"
|
|
|
|
#endif
|
|
|
|
|
2023-04-26 21:55:59 +02:00
|
|
|
@@ -97,7 +98,7 @@ class RandomBitGenerator {
|
2022-10-17 19:27:40 +02:00
|
|
|
~RandomBitGenerator() = default;
|
|
|
|
};
|
|
|
|
|
|
|
|
-#if !BUILDFLAG(IS_NACL)
|
|
|
|
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
class NonAllocatingRandomBitGenerator {
|
|
|
|
public:
|
|
|
|
using result_type = uint64_t;
|
2022-09-26 21:30:45 +02:00
|
|
|
diff --git base/rand_util_win.cc base/rand_util_win.cc
|
2023-07-21 00:11:34 +02:00
|
|
|
index 549f4362af8b6..f08b1b2e7f061 100644
|
2022-09-26 21:30:45 +02:00
|
|
|
--- base/rand_util_win.cc
|
|
|
|
+++ base/rand_util_win.cc
|
2023-07-21 00:11:34 +02:00
|
|
|
@@ -15,8 +15,12 @@
|
2022-09-26 21:30:45 +02:00
|
|
|
|
|
|
|
#include "base/check.h"
|
2023-07-21 00:11:34 +02:00
|
|
|
#include "base/feature_list.h"
|
2022-09-26 21:30:45 +02:00
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
+
|
|
|
|
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
#include "third_party/boringssl/src/include/openssl/crypto.h"
|
|
|
|
#include "third_party/boringssl/src/include/openssl/rand.h"
|
|
|
|
+#endif
|
|
|
|
|
2023-07-21 00:11:34 +02:00
|
|
|
// Prototype for ProcessPrng.
|
|
|
|
// See: https://learn.microsoft.com/en-us/windows/win32/seccng/processprng
|
|
|
|
@@ -28,6 +32,7 @@ namespace base {
|
2022-09-26 21:30:45 +02:00
|
|
|
|
|
|
|
namespace internal {
|
|
|
|
|
|
|
|
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
namespace {
|
|
|
|
|
|
|
|
// The BoringSSl helpers are duplicated in rand_util_fuchsia.cc and
|
2023-07-21 00:11:34 +02:00
|
|
|
@@ -49,6 +54,10 @@ bool UseBoringSSLForRandBytes() {
|
2022-09-26 21:30:45 +02:00
|
|
|
return g_use_boringssl.load(std::memory_order_relaxed);
|
|
|
|
}
|
|
|
|
|
|
|
|
+#else // !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
+void ConfigureBoringSSLBackedRandBytesFieldTrial() {}
|
|
|
|
+#endif
|
|
|
|
+
|
|
|
|
} // namespace internal
|
|
|
|
|
2022-10-17 19:27:40 +02:00
|
|
|
namespace {
|
2023-07-21 00:11:34 +02:00
|
|
|
@@ -66,6 +75,7 @@ decltype(&ProcessPrng) GetProcessPrng() {
|
|
|
|
}
|
2022-10-17 19:27:40 +02:00
|
|
|
|
|
|
|
void RandBytes(void* output, size_t output_length, bool avoid_allocation) {
|
2022-09-26 21:30:45 +02:00
|
|
|
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
2022-10-17 19:27:40 +02:00
|
|
|
if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) {
|
2022-09-26 21:30:45 +02:00
|
|
|
// Ensure BoringSSL is initialized so it can use things like RDRAND.
|
|
|
|
CRYPTO_library_init();
|
2023-07-21 00:11:34 +02:00
|
|
|
@@ -73,6 +83,7 @@ void RandBytes(void* output, size_t output_length, bool avoid_allocation) {
|
2022-09-26 21:30:45 +02:00
|
|
|
(void)RAND_bytes(static_cast<uint8_t*>(output), output_length);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
+#endif // !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
|
2023-07-21 00:11:34 +02:00
|
|
|
static decltype(&ProcessPrng) process_prng_fn = GetProcessPrng();
|
|
|
|
BOOL success = process_prng_fn(static_cast<BYTE*>(output), output_length);
|
2021-08-20 01:40:49 +02:00
|
|
|
diff --git base/unguessable_token.cc base/unguessable_token.cc
|
2023-01-30 18:43:54 +01:00
|
|
|
index aa7423f88d278..1b2c7d3e3c4a0 100644
|
2021-08-20 01:40:49 +02:00
|
|
|
--- base/unguessable_token.cc
|
|
|
|
+++ base/unguessable_token.cc
|
2023-01-03 00:34:43 +01:00
|
|
|
@@ -10,8 +10,9 @@
|
2021-08-20 01:40:49 +02:00
|
|
|
#include "base/format_macros.h"
|
|
|
|
#include "base/rand_util.h"
|
|
|
|
#include "build/build_config.h"
|
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
|
2022-01-25 21:26:51 +01:00
|
|
|
-#if !BUILDFLAG(IS_NACL)
|
|
|
|
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
2021-08-20 01:40:49 +02:00
|
|
|
#include "third_party/boringssl/src/include/openssl/mem.h"
|
|
|
|
#endif
|
|
|
|
|
2023-01-30 18:43:54 +01:00
|
|
|
@@ -46,7 +47,7 @@ absl::optional<UnguessableToken> UnguessableToken::Deserialize(uint64_t high,
|
2021-08-20 01:40:49 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
bool UnguessableToken::operator==(const UnguessableToken& other) const {
|
2022-01-25 21:26:51 +01:00
|
|
|
-#if BUILDFLAG(IS_NACL)
|
|
|
|
+#if BUILDFLAG(IS_NACL) || BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
2021-08-20 01:40:49 +02:00
|
|
|
// BoringSSL is unavailable for NaCl builds so it remains timing dependent.
|
|
|
|
return token_ == other.token_;
|
|
|
|
#else
|
2023-01-03 00:34:43 +01:00
|
|
|
diff --git base/win/sid.cc base/win/sid.cc
|
2023-04-04 20:00:13 +02:00
|
|
|
index 0f1a2ec79aa4b..7f92778a4a776 100644
|
2023-01-03 00:34:43 +01:00
|
|
|
--- base/win/sid.cc
|
|
|
|
+++ base/win/sid.cc
|
2023-04-04 20:00:13 +02:00
|
|
|
@@ -15,6 +15,7 @@
|
2023-01-03 00:34:43 +01:00
|
|
|
#include <utility>
|
|
|
|
|
|
|
|
#include "base/check.h"
|
|
|
|
+#include "base/notreached.h"
|
|
|
|
#include "base/no_destructor.h"
|
|
|
|
#include "base/rand_util.h"
|
2023-04-04 20:00:13 +02:00
|
|
|
#include "base/ranges/algorithm.h"
|
|
|
|
@@ -22,8 +23,12 @@
|
2023-01-03 00:34:43 +01:00
|
|
|
#include "base/win/scoped_handle.h"
|
|
|
|
#include "base/win/scoped_localalloc.h"
|
|
|
|
#include "base/win/windows_version.h"
|
|
|
|
+#include "cef/libcef/features/features.h"
|
|
|
|
+
|
|
|
|
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
#include "third_party/boringssl/src/include/openssl/crypto.h"
|
|
|
|
#include "third_party/boringssl/src/include/openssl/sha.h"
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
namespace base::win {
|
|
|
|
|
|
|
|
@@ -124,6 +129,7 @@ Sid Sid::FromNamedCapability(const std::wstring& capability_name) {
|
|
|
|
if (known_cap != known_capabilities->end()) {
|
|
|
|
return FromKnownCapability(known_cap->second);
|
|
|
|
}
|
|
|
|
+#if !BUILDFLAG(IS_CEF_SANDBOX_BUILD)
|
|
|
|
CRYPTO_library_init();
|
|
|
|
static_assert((SHA256_DIGEST_LENGTH / sizeof(DWORD)) ==
|
|
|
|
SECURITY_APP_PACKAGE_RID_COUNT);
|
|
|
|
@@ -136,6 +142,10 @@ Sid Sid::FromNamedCapability(const std::wstring& capability_name) {
|
|
|
|
reinterpret_cast<uint8_t*>(&rids[2]));
|
|
|
|
return FromSubAuthorities(SECURITY_APP_PACKAGE_AUTHORITY, std::size(rids),
|
|
|
|
rids);
|
|
|
|
+#else
|
|
|
|
+ NOTREACHED();
|
|
|
|
+ return Sid(WellKnownSid::kNull);
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
Sid Sid::FromKnownSid(WellKnownSid type) {
|