chore: update patch to match upstream

electron · Mar 26, 2024 · 225f456 · 225f456
1 parent 1d6496e
commit 225f456
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/patches/node/feat_optionally_prevent_calling_v8_enablewebassemblytraphandler.patch b/patches/node/feat_optionally_prevent_calling_v8_enablewebassemblytraphandler.patch
@@ -10,7 +10,7 @@ already been called.
 This should be upstreamed.
 
 diff --git a/src/node.cc b/src/node.cc
-index 2bed5aec6a1bc362ef4e1e0d6715951537676270..f19948f50fef3518ec3a78b6d685dc35eeec5418 100644
+index 1d77a8b31cb0bfbeeeac594b6e1ac7dd303c902d..dadddf33527beebfcde12214da4084badbd27af1 100644
 --- a/src/node.cc
 +++ b/src/node.cc
 @@ -605,6 +605,7 @@ static void PlatformInit(ProcessInitializationFlags::Flags flags) {

diff --git a/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch b/patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch
@@ -374,7 +374,7 @@ index 5734d8fdc5505e1586f571c19b840bd56e9c9f1f..3034b114e081e2b32dd5b71653927a41
  }  // namespace
 
 diff --git a/src/node.cc b/src/node.cc
-index 524f80ee69ee5248e045a2b61faf5610c9ba4285..2bed5aec6a1bc362ef4e1e0d6715951537676270 100644
+index 524f80ee69ee5248e045a2b61faf5610c9ba4285..1d77a8b31cb0bfbeeeac594b6e1ac7dd303c902d 100644
 --- a/src/node.cc
 +++ b/src/node.cc
 @@ -1027,7 +1027,8 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
@@ -387,16 +387,14 @@ index 524f80ee69ee5248e045a2b61faf5610c9ba4285..2bed5aec6a1bc362ef4e1e0d67159515
      auto GetOpenSSLErrorString = []() -> std::string {
        std::string ret;
        ERR_print_errors_cb(
-@@ -1118,7 +1119,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
-
-     // Ensure CSPRNG is properly seeded.
-     CHECK(crypto::CSPRNG(nullptr, 0).is_ok());
+@@ -1127,13 +1128,13 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
+       CHECK(crypto::CSPRNG(buffer, length).is_ok());
+       return true;
+     });
 -
 +#endif // !defined(OPENSSL_IS_BORINGSSL)
-     V8::SetEntropySource([](unsigned char* buffer, size_t length) {
-       // V8 falls back to very weak entropy when this function fails
-       // and /dev/urandom isn't available. That wouldn't be so bad if
-@@ -1133,7 +1134,7 @@ InitializeOncePerProcessInternal(const std::vector<std::string>& args,
+     {
+       std::string extra_ca_certs;
        if (credentials::SafeGetenv("NODE_EXTRA_CA_CERTS", &extra_ca_certs))
          crypto::UseExtraCaCerts(extra_ca_certs);
      }