Skip to content

Commit ec24b51

Browse files
chore: bump node to v20.15.0 (main) (#42616)
* chore: bump node in DEPS to v20.15.0 * doc: Add OpenSSL errors to API docs nodejs/node#34213 * test: crypto-rsa-dsa testing for dynamic openssl nodejs/node#52781 * src: allow preventing debug signal handler start nodejs/node#46681 * cli: allow running wasm in limited vmemory with --disable-wasm-trap-handler nodejs/node#52766 * chore: fixup indices --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
1 parent c628de5 commit ec24b51

16 files changed

Lines changed: 42 additions & 149 deletions

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ vars = {
44
'chromium_version':
55
'127.0.6521.0',
66
'node_version':
7-
'v20.14.0',
7+
'v20.15.0',
88
'nan_version':
99
'e14bdcd1f72d62bca1d541b66da43130384ec213',
1010
'squirrel.mac_version':

‎patches/node/.patches‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ fix_account_for_debugger_agent_race_condition.patch
1313
fix_readbarrier_undefined_symbol_error_on_woa_arm64.patch
1414
fix_suppress_clang_-wdeprecated-declarations_in_libuv.patch
1515
fix_serdes_test.patch
16-
feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch
1716
feat_add_uv_loop_interrupt_on_io_change_option_to_uv_loop_configure.patch
1817
support_v8_sandboxed_pointers.patch
1918
build_ensure_native_module_compilation_fails_if_not_using_a_new.patch
@@ -33,7 +32,6 @@ fix_assert_module_in_the_renderer_process.patch
3332
fix_add_trusted_space_and_trusted_lo_space_to_the_v8_heap.patch
3433
win_process_avoid_assert_after_spawning_store_app_4152.patch
3534
chore_remove_use_of_deprecated_kmaxlength.patch
36-
feat_optionally_prevent_calling_v8_enablewebassemblytraphandler.patch
3735
src_update_default_v8_platform_to_override_functions_with_location.patch
3836
fix_capture_embedder_exceptions_before_entering_v8.patch
3937
spec_add_iterator_to_global_intrinsics.patch

‎patches/node/build_ensure_native_module_compilation_fails_if_not_using_a_new.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ index 9a27610992612b59eadcc8e481683cf1e6a5dbb6..1fad20645d059ad5f3efaa9279f582f9
4040
# list in v8/BUILD.gn.
4141
['v8_enable_v8_checks == 1', {
4242
diff --git a/configure.py b/configure.py
43-
index 11c0df455451d4ab4bea066a8361246cbf10bf1d..c30052f02f97df78e0d9294784cb3efb3fd2d1a7 100755
43+
index f189ba2bf09fc248b3c1ce3c3535b939a4160ad2..2c24db93618f88f5f07e95a3edf63fb7942ac009 100755
4444
--- a/configure.py
4545
+++ b/configure.py
46-
@@ -1501,6 +1501,7 @@ def configure_library(lib, output, pkgname=None):
46+
@@ -1559,6 +1559,7 @@ def configure_library(lib, output, pkgname=None):
4747

4848

4949
def configure_v8(o):

‎patches/node/build_ensure_v8_pointer_compression_sandbox_is_enabled_on_64bit.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ index 1fad20645d059ad5f3efaa9279f582f99cb1006b..4fbb33550e8a044b92997a42eb6603f1
2222
['target_arch in "ppc64 s390x"', {
2323
'v8_enable_backtrace': 1,
2424
diff --git a/configure.py b/configure.py
25-
index c30052f02f97df78e0d9294784cb3efb3fd2d1a7..5fb89e56fde52d01b3806ec4e8549cbeb5ffca66 100755
25+
index 2c24db93618f88f5f07e95a3edf63fb7942ac009..4e6dc7378e4435b90246eb072379cea1bfdad09c 100755
2626
--- a/configure.py
2727
+++ b/configure.py
28-
@@ -1515,6 +1515,7 @@ def configure_v8(o):
28+
@@ -1573,6 +1573,7 @@ def configure_v8(o):
2929
o['variables']['v8_use_siphash'] = 0 if options.without_siphash else 1
3030
o['variables']['v8_enable_maglev'] = 1 if options.v8_enable_maglev else 0
3131
o['variables']['v8_enable_pointer_compression'] = 1 if options.enable_pointer_compression else 0

‎patches/node/feat_add_knostartdebugsignalhandler_to_environment_to_prevent.patch‎

Lines changed: 0 additions & 69 deletions
This file was deleted.

‎patches/node/feat_optionally_prevent_calling_v8_enablewebassemblytraphandler.patch‎

Lines changed: 0 additions & 38 deletions
This file was deleted.

‎patches/node/fix_assert_module_in_the_renderer_process.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ index f9d29f0065b1de63a62cfdce74a9705c22dd87d7..3f44160f1bd40fc2d4658f10edf0d0b3
5858
}
5959

6060
diff --git a/src/node_options.cc b/src/node_options.cc
61-
index dae3237abc95362db81a1f529becfac43454d709..ee8e6f342bf4956c5f186337b6c051e1d62a6dcd 100644
61+
index 753311e15f161547be4277016efe11cc57d351db..8e98b76e29824565739010b885375d63c992bdf8 100644
6262
--- a/src/node_options.cc
6363
+++ b/src/node_options.cc
64-
@@ -1301,6 +1301,11 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
64+
@@ -1317,6 +1317,11 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
6565
Local<Context> context = env->context();
6666
Local<Object> ret = Object::New(isolate);
6767

‎patches/node/fix_crypto_tests_to_run_with_bssl.patch‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,7 @@ index 1785f5eef3d202976666081d09850ed744d83446..e88227a215ba4f7fa196f7642ae694a5
549549
});
550550

551551
diff --git a/test/parallel/test-crypto-rsa-dsa.js b/test/parallel/test-crypto-rsa-dsa.js
552-
index ecda345989789d0745b631385e7411305c1c6375..542a0a16f3f2eba4efd31e807a3bc34b6752d798 100644
552+
index 5f4fafdfffbf726b7cb39c472baa3df25c9794cf..73bb53b0405b20f51b13326cc70e52755c674366 100644
553553
--- a/test/parallel/test-crypto-rsa-dsa.js
554554
+++ b/test/parallel/test-crypto-rsa-dsa.js
555555
@@ -28,12 +28,11 @@ const dsaPkcs8KeyPem = fixtures.readKey('dsa_private_pkcs8.pem');
@@ -577,10 +577,10 @@ index ecda345989789d0745b631385e7411305c1c6375..542a0a16f3f2eba4efd31e807a3bc34b
577577
- if (padding === constants.RSA_PKCS1_PADDING) {
578578
+ // BoringSSL does not support RSA_PKCS1_PADDING.
579579
+ if (false) {
580-
// TODO(richardlau): see if it's possible to determine implicit rejection
581-
// support when dynamically linked against OpenSSL.
582580
if (!process.config.variables.node_shared_openssl) {
583-
@@ -419,7 +419,7 @@ assert.throws(() => {
581+
assert.throws(() => {
582+
crypto.privateDecrypt({
583+
@@ -466,7 +466,7 @@ assert.throws(() => {
584584
assert.strictEqual(verify2.verify(publicKey, signature, 'hex'), true);
585585
}
586586

@@ -589,7 +589,7 @@ index ecda345989789d0745b631385e7411305c1c6375..542a0a16f3f2eba4efd31e807a3bc34b
589589
//
590590
// Test DSA signing and verification
591591
//
592-
@@ -494,3 +494,4 @@ const input = 'I AM THE WALRUS';
592+
@@ -541,3 +541,4 @@ const input = 'I AM THE WALRUS';
593593

594594
assert.strictEqual(verify.verify(dsaPubPem, signature, 'hex'), true);
595595
}

‎patches/node/fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ index cdc2f7aaa8efd8b5d9090455c92d81b2bef460b7..12414204361e7227f7f7736a07388ade
2222
int thread_pool_size,
2323
node::tracing::TracingController* tracing_controller) {
2424
diff --git a/src/node.h b/src/node.h
25-
index 58c021f67e92c3fdcb4b173c00acae0722994222..24dd1d9fe8de5993863f9fcd0ce7f65ec5460cce 100644
25+
index 7047a667f7f1b2a09aa409b2933aad4b3a4af929..c267ed1eeaa2d8b6ecd5a1563a4e9440bf0cca00 100644
2626
--- a/src/node.h
2727
+++ b/src/node.h
2828
@@ -133,6 +133,7 @@ struct SnapshotData;
@@ -33,7 +33,7 @@ index 58c021f67e92c3fdcb4b173c00acae0722994222..24dd1d9fe8de5993863f9fcd0ce7f65e
3333
class TracingController;
3434

3535
}
36-
@@ -824,6 +825,8 @@ NODE_EXTERN void GetNodeReport(Environment* env,
36+
@@ -828,6 +829,8 @@ NODE_EXTERN void GetNodeReport(Environment* env,
3737
NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(Environment* env);
3838
NODE_EXTERN MultiIsolatePlatform* GetMultiIsolatePlatform(IsolateData* env);
3939

‎patches/node/fix_handle_boringssl_and_openssl_incompatibilities.patch‎

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ index 67cd4f2adf15e7d8511f561c54163b1842e971af..7e0e1a62289289b8362870ba4869c974
4848

4949
const EVP_MD* digest = nullptr;
5050
diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
51-
index 3517c39ad0b71a4d3efefeee2a3d55b70494bc1d..7164e539880e6d33ee1ea1fb77bae8adf4095708 100644
51+
index ee1c7931a5c83eec00fe05807ddb97572fe70cc9..8e297e57fdbc9fd42beb6e4a33cc91b9dd7316b8 100644
5252
--- a/src/crypto/crypto_common.cc
5353
+++ b/src/crypto/crypto_common.cc
5454
@@ -158,7 +158,7 @@ const char* GetClientHelloALPN(const SSLPointer& ssl) {
@@ -77,7 +77,7 @@ index 3517c39ad0b71a4d3efefeee2a3d55b70494bc1d..7164e539880e6d33ee1ea1fb77bae8ad
7777
if (!SSL_client_hello_get0_ext(
7878
ssl.get(),
7979
TLSEXT_TYPE_server_name,
80-
@@ -199,15 +201,20 @@ const char* GetClientHelloServerName(const SSLPointer& ssl) {
80+
@@ -199,6 +201,8 @@ const char* GetClientHelloServerName(const SSLPointer& ssl) {
8181
if (len + 2 > rem)
8282
return nullptr;
8383
return reinterpret_cast<const char*>(buf + 5);
@@ -86,22 +86,18 @@ index 3517c39ad0b71a4d3efefeee2a3d55b70494bc1d..7164e539880e6d33ee1ea1fb77bae8ad
8686
}
8787

8888
const char* GetServerName(SSL* ssl) {
89-
return SSL_get_servername(ssl, TLSEXT_NAMETYPE_host_name);
89+
@@ -206,7 +210,10 @@ const char* GetServerName(SSL* ssl) {
9090
}
9191

92-
-bool SetGroups(SecureContext* sc, const char* groups) {
93-
- return SSL_CTX_set1_groups_list(sc->ctx().get(), groups) == 1;
94-
-}
95-
+ bool SetGroups(SecureContext* sc, const char* groups) {
92+
bool SetGroups(SecureContext* sc, const char* groups) {
9693
+#ifndef OPENSSL_IS_BORINGSSL
97-
+ return SSL_CTX_set1_groups_list(sc->ctx().get(), groups) == 1;
94+
return SSL_CTX_set1_groups_list(sc->ctx().get(), groups) == 1;
9895
+#endif
9996
+ return SSL_CTX_set1_curves_list(sc->ctx().get(), groups) == 1;
100-
+ }
97+
}
10198

102-
const char* X509ErrorCode(long err) { // NOLINT(runtime/int)
103-
const char* code = "UNSPECIFIED";
104-
@@ -1042,14 +1049,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
99+
// When adding or removing errors below, please also update the list in the API
100+
@@ -1044,14 +1051,14 @@ MaybeLocal<Array> GetClientHelloCiphers(
105101
Environment* env,
106102
const SSLPointer& ssl) {
107103
EscapableHandleScope scope(env->isolate());
@@ -375,7 +371,7 @@ index 5734d8fdc5505e1586f571c19b840bd56e9c9f1f..3034b114e081e2b32dd5b71653927a41
375371
} // namespace
376372

377373
diff --git a/src/env.h b/src/env.h
378-
index 904dda4caf9695acec72bd95ba235b92b07eabe2..c0c99456471788d40218152291a32db5fbdf1101 100644
374+
index 3b3724d6c7156b87555be31470e75b1cf28b5e3f..910c69b6d1d17ef25201dbb39d3d074f4f3f011f 100644
379375
--- a/src/env.h
380376
+++ b/src/env.h
381377
@@ -49,7 +49,7 @@
@@ -387,7 +383,7 @@ index 904dda4caf9695acec72bd95ba235b92b07eabe2..c0c99456471788d40218152291a32db5
387383
#include <openssl/evp.h>
388384
#endif
389385

390-
@@ -1035,7 +1035,7 @@ class Environment : public MemoryRetainer {
386+
@@ -1036,7 +1036,7 @@ class Environment : public MemoryRetainer {
391387
kExitInfoFieldCount
392388
};
393389

@@ -423,7 +419,7 @@ index cf051585e779e2b03bd7b95fe5008b89cc7f8162..9de49c6828468fdf846dcd4ad445390f
423419
#if NODE_OPENSSL_HAS_QUIC
424420
#include <openssl/quic.h>
425421
diff --git a/src/node_options.cc b/src/node_options.cc
426-
index 937ce44696175dc80edabcd9fc2709a6716d1a66..dae3237abc95362db81a1f529becfac43454d709 100644
422+
index 7110b4d984b72fa8c9bef2cbe6e37b1871e14d08..753311e15f161547be4277016efe11cc57d351db 100644
427423
--- a/src/node_options.cc
428424
+++ b/src/node_options.cc
429425
@@ -6,7 +6,7 @@
@@ -436,7 +432,7 @@ index 937ce44696175dc80edabcd9fc2709a6716d1a66..dae3237abc95362db81a1f529becfac4
436432
#endif
437433

438434
diff --git a/src/node_options.h b/src/node_options.h
439-
index 0a2f5512f689f87b73aa582782c484f73a4ebc43..e1985f2188eec6869521aecd39d2d74d5cc1616a 100644
435+
index 3c67c3680b045786dafb8435f5b311c3f386a943..546c3979e2c8d7498aa92df4c89ee867c6485080 100644
440436
--- a/src/node_options.h
441437
+++ b/src/node_options.h
442438
@@ -11,7 +11,7 @@

0 commit comments

Comments
 (0)