X Tutup
Skip to content

Commit 542abcd

Browse files
codebyterecodebytere
authored
chore: bump Node.js to v16.2.0 (electron#29244)
1 parent 9a7e61c commit 542abcd

File tree

51 files changed

+1814
-1484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1814
-1484
lines changed

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ vars = {
1616
'chromium_version':
1717
'93.0.4539.0',
1818
'node_version':
19-
'v14.17.0',
19+
'v16.2.0',
2020
'nan_version':
2121
# The following commit hash of NAN is v2.14.2 with *only* changes to the
2222
# test suite. This should be updated to a specific tag when one becomes

‎patches/boringssl/.patches‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
expose_ripemd160.patch
22
expose_aes-cfb.patch
33
expose_des-ede3.patch
4+
src_add_impl_for_evp_pkey_get0.patch
5+
ensure_name_not_null_in_evp_get_cipherbyname.patch

‎patches/boringssl/ensure_name_not_null_in_evp_get_cipherbyname.patch‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Shelley Vohr <shelley.vohr@gmail.com>
3+
Date: Wed, 2 Jun 2021 11:58:18 +0200
4+
Subject: Ensure name not null in EVP_get_cipherbyname
5+
6+
This adds a check to EVP_get_cipherbyname which ensures that name
7+
is not null when passed to OPENSSL_strcasecmp, which cannot handle
8+
null values.
9+
10+
OpenSSL already ensures this in their implementation of
11+
EVP_get_cipherbyname by using OBJ_NAME_get, so this improves parity.
12+
13+
Upstreamed at https://boringssl-review.googlesource.com/c/boringssl/+/47844.
14+
15+
diff --git a/crypto/cipher_extra/cipher_extra.c b/crypto/cipher_extra/cipher_extra.c
16+
index e771ed6589b4579cc35300d5b2a1b68d92e444f5..8205e121c152fe4e2d8df34a1ac2fe0498381f31 100644
17+
--- a/crypto/cipher_extra/cipher_extra.c
18+
+++ b/crypto/cipher_extra/cipher_extra.c
19+
@@ -89,6 +89,10 @@ const EVP_CIPHER *EVP_get_cipherbynid(int nid) {
20+
}
21+
22+
const EVP_CIPHER *EVP_get_cipherbyname(const char *name) {
23+
+ if (name == NULL) {
24+
+ return NULL;
25+
+ }
26+
+
27+
if (OPENSSL_strcasecmp(name, "rc4") == 0) {
28+
return EVP_rc4();
29+
} else if (OPENSSL_strcasecmp(name, "des-cbc") == 0) {

‎patches/boringssl/src_add_impl_for_evp_pkey_get0.patch‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Shelley Vohr <shelley.vohr@gmail.com>
3+
Date: Mon, 31 May 2021 11:30:38 +0200
4+
Subject: src: add impl for EVP_PKEY_get0
5+
6+
This adds the missing implementation for EVP_PKEY_get0, which Node.js
7+
uses and which is present in OpenSSL but not BoringSSL.
8+
9+
This will be upstreamed either fully or as a shim.
10+
11+
diff --git a/crypto/evp/evp.c b/crypto/evp/evp.c
12+
index 653d6573fdf1c542010698e9f6d1cf8170ea2f0c..738cec60a9fed4bfad56c7b2b75c44eb225abfcf 100644
13+
--- a/crypto/evp/evp.c
14+
+++ b/crypto/evp/evp.c
15+
@@ -224,6 +224,10 @@ int EVP_PKEY_type(int nid) {
16+
return meth->pkey_id;
17+
}
18+
19+
+void *EVP_PKEY_get0(const EVP_PKEY *pkey) {
20+
+ return pkey->pkey.ptr;
21+
+}
22+
+
23+
int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key) {
24+
if (EVP_PKEY_assign_RSA(pkey, key)) {
25+
RSA_up_ref(key);
26+
diff --git a/include/openssl/evp.h b/include/openssl/evp.h
27+
index 378eb320f7c01df33850cca9d0111db32ffa6175..9eebf9c609abd31ed63c1f1c720c716d074e3f6d 100644
28+
--- a/include/openssl/evp.h
29+
+++ b/include/openssl/evp.h
30+
@@ -156,6 +156,8 @@ OPENSSL_EXPORT int EVP_PKEY_type(int nid);
31+
// returned lower-level objects are considered to also mutate the |EVP_PKEY| and
32+
// may not be called concurrently with other operations on the |EVP_PKEY|.
33+
34+
+OPENSSL_EXPORT void *EVP_PKEY_get0(const EVP_PKEY *pkey);
35+
+
36+
OPENSSL_EXPORT int EVP_PKEY_set1_RSA(EVP_PKEY *pkey, RSA *key);
37+
OPENSSL_EXPORT int EVP_PKEY_assign_RSA(EVP_PKEY *pkey, RSA *key);
38+
OPENSSL_EXPORT RSA *EVP_PKEY_get0_RSA(const EVP_PKEY *pkey);

‎patches/node/.patches‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,21 @@ feat_add_flags_for_low-level_hooks_and_exceptions.patch
1111
fix_expose_tracing_agent_and_use_tracing_tracingcontroller_instead.patch
1212
pass_all_globals_through_require.patch
1313
fixme_comment_trace_event_macro.patch
14-
fix_key_gen_apis_are_not_available_in_boringssl.patch
1514
build_modify_js2c_py_to_allow_injection_of_original-fs_and_custom_embedder_js.patch
1615
refactor_allow_embedder_overriding_of_internal_fs_calls.patch
1716
chore_allow_the_node_entrypoint_to_be_a_builtin_module.patch
1817
chore_add_context_to_context_aware_module_prevention.patch
1918
chore_read_nobrowserglobals_from_global_not_process.patch
2019
enable_31_bit_smis_on_64bit_arch_and_ptr_compression.patch
21-
fix_use_crypto_impls_for_compat.patch
22-
fix_comment_out_incompatible_crypto_modules.patch
23-
update_tests_after_increasing_typed_array_size.patch
24-
feat_add_implementation_of_v8_platform_postjob.patch
20+
fix_handle_boringssl_and_openssl_incompatibilities.patch
2521
fix_-wincompatible-pointer-types-discards-qualifiers_error.patch
2622
fix_add_v8_enable_reverse_jsargs_defines_in_common_gypi.patch
2723
fix_allow_preventing_initializeinspector_in_env.patch
2824
src_allow_embedders_to_provide_a_custom_pageallocator_to.patch
29-
allow_preventing_preparestacktracecallback.patch
30-
fix_remove_outdated_--experimental-wasm-bigint_flag.patch
3125
fix_crypto_tests_to_run_with_bssl.patch
32-
build_add_mjs_support_to_js2c.patch
33-
src_inline_asynccleanuphookhandle_in_headers.patch
3426
fix_handle_new_tostring_behavior_in_v8_serdes_test.patch
35-
node-api_faster_threadsafe_function.patch
36-
src_remove_extra_semi_after_member_fn.patch
27+
src_remove_extra_semis_from_member_fns.patch
28+
src_add_node_use_v8_platform_in_initializeonceperprocess.patch
29+
tls_tweak_clientcertengine_argument_parsing.patch
30+
src_add_get_set_pair_for_unhandled_rejections_mode.patch
31+
fix_account_for_debugger_agent_race_condition.patch

‎patches/node/allow_preventing_preparestacktracecallback.patch‎

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

0 commit comments

Comments
 (0)
X Tutup