Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump node to v16.17.0 (main) #35350

Merged
merged 23 commits into from
Aug 29, 2022
Merged
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
241b207
chore: bump node in DEPS to v16.17.0
electron-roller[bot] Aug 16, 2022
61e7fad
chore: fixup asar patch
codebytere Aug 22, 2022
30c7840
lib: use null-prototype objects for property descriptors
codebytere Aug 22, 2022
9aa457e
src: make SecureContext fields private
codebytere Aug 22, 2022
9828218
crypto: remove Node.js-specific webcrypto extensions
codebytere Aug 22, 2022
2dae231
test: refactor to top-level await
codebytere Aug 22, 2022
d90f914
deps: cherry-pick two libuv fixes
codebytere Aug 22, 2022
cd8b004
src: slim down env-inl.h
codebytere Aug 22, 2022
9afd11e
util: add AggregateError.prototype.errors to inspect output
codebytere Aug 22, 2022
e1bbdd2
esm: improve performance & tidy tests
codebytere Aug 22, 2022
734423c
src: NodeArrayBufferAllocator delegates to v8's allocator
codebytere Aug 23, 2022
f4ca633
chore: update patch indices
codebytere Aug 23, 2022
f7a5006
chore: update filenames
codebytere Aug 23, 2022
109a027
src: refactor IsSupportedAuthenticatedMode
codebytere Aug 23, 2022
6a969f5
src: add --openssl-legacy-provider option
codebytere Aug 23, 2022
1476ff6
lib,src: add source map support for global eval
codebytere Aug 24, 2022
28089cd
trace_events: trace net connect event
codebytere Aug 24, 2022
18d73b9
deps: update ICU to 71.1
codebytere Aug 24, 2022
16462bc
lib: give names to promisified exists() and question()
codebytere Aug 24, 2022
4829355
crypto: add CFRG curves to Web Crypto API
codebytere Aug 24, 2022
b9becbe
src: fix memory leak for v8.serialize
codebytere Aug 24, 2022
ed65e52
buffer: fix atob input validation
codebytere Aug 25, 2022
0f89c67
src: fix ssize_t error from nghttp2.h
codebytere Aug 25, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
src: refactor IsSupportedAuthenticatedMode
  • Loading branch information
codebytere committed Aug 25, 2022
commit 109a027ca465366f53a04ab9ea954c96ffdd56ca
Original file line number Diff line number Diff line change
@@ -16,6 +16,20 @@ Upstreams:
- https://github.com/nodejs/node/pull/39138
- https://github.com/nodejs/node/pull/39136

diff --git a/src/crypto/crypto_cipher.cc b/src/crypto/crypto_cipher.cc
index 6c663a2b21d0a29708700d0e19b8e30fa696a1d0..1e4ff83faec60887e8169e612ac1a956130d7e4a 100644
--- a/src/crypto/crypto_cipher.cc
+++ b/src/crypto/crypto_cipher.cc
@@ -25,7 +25,8 @@ using v8::Value;
namespace crypto {
namespace {
bool IsSupportedAuthenticatedMode(const EVP_CIPHER* cipher) {
- switch (EVP_CIPHER_mode(cipher)) {
+ const int mode = EVP_CIPHER_mode(cipher);
+ switch (mode) {
case EVP_CIPH_CCM_MODE:
case EVP_CIPH_GCM_MODE:
#ifndef OPENSSL_NO_OCB
diff --git a/src/crypto/crypto_common.cc b/src/crypto/crypto_common.cc
index ed1aea868d8385b6411103c614f4d12688c8cb30..4864d7cd6a310f31bfdda399996bd2c47977667a 100644
--- a/src/crypto/crypto_common.cc