diff options
Diffstat (limited to 'devel/electron29/files/patch-base_rand__util__posix.cc')
-rw-r--r-- | devel/electron29/files/patch-base_rand__util__posix.cc | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/devel/electron29/files/patch-base_rand__util__posix.cc b/devel/electron29/files/patch-base_rand__util__posix.cc new file mode 100644 index 000000000000..9e95d5bad527 --- /dev/null +++ b/devel/electron29/files/patch-base_rand__util__posix.cc @@ -0,0 +1,62 @@ +--- base/rand_util_posix.cc.orig 2024-02-21 00:20:30 UTC ++++ base/rand_util_posix.cc +@@ -23,7 +23,7 @@ + #include "base/time/time.h" + #include "build/build_config.h" + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + #include "third_party/lss/linux_syscall_support.h" + #elif BUILDFLAG(IS_MAC) + // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. +@@ -40,6 +40,7 @@ namespace { + + namespace { + ++#if !BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_AIX) + // AIX has no 64-bit support for O_CLOEXEC. + static constexpr int kOpenFlags = O_RDONLY; +@@ -64,10 +65,11 @@ class URandomFd { + private: + const int fd_; + }; ++#endif + + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID)) && \ +- !BUILDFLAG(IS_NACL) ++ !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + // TODO(pasko): Unify reading kernel version numbers in: + // mojo/core/channel_linux.cc + // chrome/browser/android/seccomp_support_detector.cc +@@ -177,6 +179,7 @@ void RandBytes(span<uint8_t> output, bool avoid_alloca + namespace { + + void RandBytes(span<uint8_t> output, bool avoid_allocation) { ++#if !BUILDFLAG(IS_BSD) + #if !BUILDFLAG(IS_NACL) + // The BoringSSL experiment takes priority over everything else. + if (!avoid_allocation && internal::UseBoringSSLForRandBytes()) { +@@ -215,6 +218,9 @@ void RandBytes(span<uint8_t> output, bool avoid_alloca + const int urandom_fd = GetUrandomFD(); + const bool success = ReadFromFD(urandom_fd, as_writable_chars(output)); + CHECK(success); ++#else ++ arc4random_buf(output.data(), output.size()); ++#endif + } + + } // namespace +@@ -239,9 +245,11 @@ void RandBytes(void* output, size_t output_length) { + RandBytes(make_span(reinterpret_cast<uint8_t*>(output), output_length)); + } + ++#if !BUILDFLAG(IS_BSD) + int GetUrandomFD() { + static NoDestructor<URandomFd> urandom_fd; + return urandom_fd->fd(); + } ++#endif + + } // namespace base |