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.

Sign up for GitHub

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

Jump to bottom

[v17.x] deps: update openssl to openssl-3.0.2+quic #42354

Closed
wants to merge 934 commits into from
Closed

[v17.x] deps: update openssl to openssl-3.0.2+quic #42354

wants to merge 934 commits into from

Conversation

hassaanp
Copy link
Contributor

Updated openssl dep to openssl-3.0.2+quic using the maintenance guide.

Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-March/000217.html

tniessen and others added 30 commits February 7, 2022 23:29
@tniessen @ruyadorno
doc: improve wording surrounding TLS 1.3 ciphers
af641bd 
Spelling out numbers makes this part easier to read. Also remove the
unnecessary word 'last'.

PR-URL: nodejs#41778
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Nitzan Uziely <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
@mhdawson @ruyadorno
test: exclude ibm i tests until we resolve
ea96640 
Refs: nodejs#39683

These are being worked, but we really should have
marked flaky a long time ago in ordert to make
then nightlies non-red.

Signed-off-by: Michael Dawson <[email protected]>

PR-URL: nodejs#41812
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
@caioagiani @ruyadorno
src: fix typo in js_native_api_v8.cc
bbfa586 
PR-URL: nodejs#41764
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Jiawen Geng <[email protected]>
@tniessen @ruyadorno
doc: use UDPv4/UDPv6 consistently with TCPv4/TCPv6
e5db136 
(Arguably, the whole terminology is not perfect, but at least it will be
consistent with TCP now.)

PR-URL: nodejs#41824
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Mestery <[email protected]>
@tniessen @ruyadorno
doc: align tls port types with net port types
4eb1938 
PR-URL: nodejs#41799
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@Trott @ruyadorno
test: avoid using Object.prototype methods directly on objects
87902a7 
This prepares us to enable the no-prototype-builtins ESLint rule.

Refs: https://eslint.org/docs/rules/no-prototype-builtins

PR-URL: nodejs#41801
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Mestery <[email protected]>
@Trott @ruyadorno
tools,test: enable no-prototype-builtins
34dfc60 
PR-URL: nodejs#41801
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Mestery <[email protected]>
@atesgoral @ruyadorno
doc: use example.com for examples
d726a34 
PR-URL: nodejs#41827
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Beth Griggs <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Mestery <[email protected]>
@tony-go @ruyadorno
doc: add note about resource type in async_hooks
4db343b 
PR-URL: nodejs#41797
Reviewed-By: Stephen Belanger <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Gerhard Stöbich <[email protected]>
Reviewed-By: Vladimir de Turckheim <[email protected]>
@iMoses @ruyadorno
stream: use synchronous error validation & validate abort signal option
e11a079 
made sure top level methods aren't async/generators
so that validation errors could be caught synchronously
also added validation for the abort signal option

PR-URL: nodejs#41777
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Nitzan Uziely <[email protected]>
@benjamingr @ruyadorno
buffer: fix atob/btoa no-arg case
6064b1d 
PR-URL: nodejs#41478
Fixes: nodejs#41450
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Filip Skokan <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
@yashLadha @ruyadorno
async_hooks: fix imports in context example
0844935 
Added imports for packages that is mentioned in the example of
async_hooks context example.

PR-URL: nodejs#39229
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Gerhard Stöbich <[email protected]>
@VerteDinde @ruyadorno
doc: add registry numbers for Electron 19 and 20
49f6b97 
PR-URL: nodejs#41814
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Tierney Cyren <[email protected]>
@devsnek @ruyadorno
deps: V8: cherry-pick cc9a8a37445e
bee4451 
Original commit message:

    fix overflow check in error formatting

    Bug: v8:12494
    Change-Id: Iba2684173296aa236f1a1c73a5606c21472eff06
    Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3426634
    Reviewed-by: Jakob Kummerow <[email protected]>
    Commit-Queue: Gus Caplan <[email protected]>
    Cr-Commit-Position: refs/heads/main@{#78909}

Refs: v8/v8@cc9a8a3

PR-URL: nodejs#41823
Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Mary Marchini <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
@ofirbarak @ruyadorno
http2: fix no response event on continue request
499171b 
When sending a continue request, server response with null,
it does not fires the response event type

Fixes: nodejs#38258

PR-URL: nodejs#41739
Refs: nodejs#38561
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: James M Snell <[email protected]>
@mhdawson @ruyadorno
crypto: check return code from EVP_DigestUpdate
e117c0f 
Coverity was complaining that we did not check the
return code. We seem to check in the other place it
is called and the method already handles returning
a result.

Signed-off-by: Michael Dawson <[email protected]>

PR-URL: nodejs#41800
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Filip Skokan <[email protected]>
@mhdawson @ruyadorno
doc: add initial version of maintaining-http.md
cb16fad 
- document strategy based on Next-10 mini-summit
- initial top level info on http API implementations

Refs: nodejs/next-10#114

Signed-off-by: Michael Dawson <[email protected]>

PR-URL: nodejs#41798
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
@tniessen @ruyadorno
doc: use sentence case for X509 error codes header
d3a4c62 
Refs: nodejs#33889

PR-URL: nodejs#41829
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@tniessen @ruyadorno
doc: fix X509 CA acronym capitalization
7aeaa27 
PR-URL: nodejs#41841
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
@Flarna @ruyadorno
doc: add overhead hints for heap snapshot generation
72a857f 
Added some hints that creation of an heap snapshot has significant
overhead on memory requirement and event loop utilization.

PR-URL: nodejs#41822
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
@mhdawson @ruyadorno
doc: feature management proposal
451f333 
Refs: nodejs#40823
Refs: nodejs#41113

Signed-off-by: Michael Dawson <[email protected]>

PR-URL: nodejs#41420
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: Mary Marchini <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: Gireesh Punathil <[email protected]>
@ErickWendel @ruyadorno
readline: improve code coverage for readline promises
cbcf794 
PR-URL: nodejs#41817
Refs: https://coverage.nodejs.org/coverage-7123a00b03a90862/lib/readline/promises.js.html#L42
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Zijian Liu <[email protected]>
@nodejs-github-bot @ruyadorno
tools: update doc to [email protected]
32cdae7 
PR-URL: nodejs#41854
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Zijian Liu <[email protected]>
Reviewed-By: Mestery <[email protected]>
@nodejs-github-bot @ruyadorno
tools: update lint-md-dependencies to [email protected]
72f02d8 
PR-URL: nodejs#41737
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Mestery <[email protected]>
@Trott @ruyadorno
benchmark: enable no-empty ESLint rule
ad32ad6 
PR-URL: nodejs#41831
Refs: https://eslint.org/docs/rules/no-empty
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
@Trott @ruyadorno
doc: remove empty block from console.timeEnd() example
c3721fc 
PR-URL: nodejs#41831
Refs: https://eslint.org/docs/rules/no-empty
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
@Trott @ruyadorno
doc: add comments to empty blocks in worker_threads text
8a42a20 
PR-URL: nodejs#41831
Refs: https://eslint.org/docs/rules/no-empty
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
@Trott @ruyadorno
lib: add comments to empty catch statements
4834be3 
PR-URL: nodejs#41831
Refs: https://eslint.org/docs/rules/no-empty
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
@Trott @ruyadorno
policy: revise manifest.js to avoid empty blocks
e1ae61b 
PR-URL: nodejs#41831
Refs: https://eslint.org/docs/rules/no-empty
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
@Trott @ruyadorno
stream: remove empty block
6c82276 
PR-URL: nodejs#41831
Refs: https://eslint.org/docs/rules/no-empty
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
Trott and others added 13 commits March 7, 2022 17:44
@Trott @sxa
doc: remove "considered" for clarity
555da9b 
"considered undefined" suggests that it's not REALLY undefined. It's
really undefined. Be firm!

PR-URL: nodejs#42218
Reviewed-By: Akhil Marsonya <[email protected]>
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
@RafaelGSS @sxa
http2: add edge case to GOAWAY request
1de8087 
PR-URL: nodejs#42190
Reviewed-By: Matteo Collina <[email protected]>
Reviewed-By: Antoine du Hamel <[email protected]>
@tniessen @sxa
doc: remove erroneous comma in cluster explainer
6183749 
PR-URL: nodejs#42238
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Mohammed Keyvanzadeh <[email protected]>
@XadillaX @sxa
url, src: modify one special_back_slash
ecb5980 
Make it always equals to `false`.

PR-URL: nodejs#42112
Reviewed-By: Darshan Sen <[email protected]>
@addaleax @sxa
src: return proper URLs from node_api_get_module_file_name
98b1be0 
Using `file://${path}` does not properly escape special URL characters.

PR-URL: nodejs#41758
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Juan José Arboleda <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
@mhdawson @sxa
doc: update stale feature messages
fc7d429 
- update the messages to reflect additional
  bikeshedding that took place when action
  was implemented in
  https://github.com/nodejs/node/blob/master/.github/workflows/close-stale-feature-requests.yml.
- fix links to this document in messages as
  we moved the contributing docs location.

Signed-off-by: Michael Dawson <[email protected]>

PR-URL: nodejs#42217
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Benjamin Gruenbaum <[email protected]>
@sxa
2022-03-09, Version 17.7.0 (Current)
05c2520 
Notable changes:

* (SEMVER-MINOR) crypto: add KeyObject.prototype.equals method (Filip Skokan) nodejs#42093
* (SEMVER-MINOR) net: add new options to net.Socket and net.Server (Paolo Insogna) nodejs#41310
* (SEMVER-MINOR) src: allow preventing InitializeInspector in env (Shelley Vohr) nodejs#35025
* doc: add release key for Bryan English (Bryan English) nodejs#42102

Dependency Updates:

* deps: update nghttp2 to 1.47.0 (Yash Ladha) nodejs#42127
* deps: upgrade npm to 8.5.2 (npm team) nodejs#42122

New Collaborators:

* doc: add JakobJingleheimer to collaborators list (Jacob Smith) nodejs#42185
* doc: move bnoordhuis back to collaborators (Ben Noordhuis) nodejs#42064

PR-URL: nodejs#42254
@BethGriggs
Working on v17.7.1
ea81c5e 
PR-URL: nodejs#42254
@aduh95 @sxa
url: revert fix url.parse() for @hostname
96a9e00 
This reverts commit 010cb71.

Refs: nodejs#42279

PR-URL: nodejs#42280
Fixes: nodejs#42279
Reviewed-By: Stewart X Addison <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
@sxa
2022-03-10, Version 17.7.1 (Current)
8fe7979 
Notable changes:

Fixed regression in url.resolve()

This release fixes an issue introduced in Node.js v17.7.0 with some URLs
that contain `@`. This issue affected yarn 1. This version reverts the
change that introduced the regression.

PR-URL: nodejs#42285
@BethGriggs
Working on v17.7.2
0694177 
PR-URL: nodejs#42285
@hassaanp
deps: upgrade openssl sources to quictls/openssl-3.0.2+quic
bddde35 
This updates all sources in deps/openssl/openssl by:
    $ git clone [email protected]:quictls/openssl.git
    $ cd openssl
    $ cd ../node/deps/openssl
    $ rm -rf openssl
    $ cp -R ../openssl openssl
    $ rm -rf openssl/.git* openssl/.travis*
    $ git add --all openssl
    $ git commit openssl
@hassaanp
deps: update archs files for quictls/openssl-3.0.2+quic
7535b0f 
After an OpenSSL source update, all the config files need to be
regenerated and committed by:
    $ make -C deps/openssl/config
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/openssl
    $ git commit
@nodejs-github-bot nodejs-github-bot added dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run. openssl Issues and PRs related to the OpenSSL dependency. v17.x labels Mar 15, 2022
@richardlau
Copy link
Member

I think this should have been opened against master rather than v17.x-staging -- we should be able to cherry-pick openssl updates from master to current (v17.x-staging).

@mhdawson
test: fix tests affected by OpenSSL update
d0b96b8 
Last OpenSSL 3 update changes behaviour back to be
closer to that of OpenSSL 1.1.1. Remove some instances
where we expected different errors from OpenSSL 3 versus
OpenSSL 1.1.1.

Signed-off-by: Michael Dawson <[email protected]>
@mhdawson
Copy link
Member

It also needs a commit to fix up 2 failing tests. I'll push a commit to this branch with those fixes. It will cherrypick against master as well

@mhdawson
Copy link
Member

Pushed commit to fix the 2 tests I'd seen fail on master, in addition I think 17.x will need d4d0b09

@mhdawson
Copy link
Member

@hassaanp just to summarize what @richardlau suggested and related additional commits that will be needed for tests to pass

  1. The PR should be against master as that PR should be able to be cherry-picked cleanly to 17.x
  2. The PR I pushed onto this PR - d0b96b8 will also be needed in the PR on master. You should be able to cherry pick that from this PR to the PR against master

When the releaser builds 17.x they will need to cherry pick over the PRs to update OpenSSL, the PR to fix the tests and #42342. @danielleadams FYI since I think you are doing the 16.x and 17.x release

@hassaanp
Copy link
Contributor Author

@hassaanp just to summarize what @richardlau suggested and related additional commits that will be needed for tests to pass

  1. The PR should be against master as that PR should be able to be cherry-picked cleanly to 17.x
  2. The PR I pushed onto this PR - d0b96b8 will also be needed in the PR on master. You should be able to cherry pick that from this PR to the PR against master

When the releaser builds 17.x they will need to cherry pick over the PRs to update OpenSSL, the PR to fix the tests and #42342. @danielleadams FYI since I think you are doing the 16.x and 17.x release

Acknowledged @mhdawson.
I understand that I need to create a new PR against master. Does that mean I should I close this one then?

@RaisinTen
Copy link
Contributor

@hassaanp closing the PR shouldn't be necessary. You may click on the Edit button and change the base from v17.x-staging to master.

@hassaanp hassaanp changed the base branch from v17.x-staging to master March 16, 2022 04:39
@hassaanp
Copy link
Contributor Author

@RaisinTen I have changed the base like you suggested but it seems to have added a lot of conflicts. Any suggestions on how to proceed here?

@RaisinTen
Copy link
Contributor

You'll have to rebase and fix the git conflicts. Tbh, I think it would be easier to open a new PR.

@hassaanp
Copy link
Contributor Author

Yeah, I think that would be an easier route.
I am going to open a PR against master and we can then cherry pick the commits on to 17.x like @mhdawson and @richardlau suggested. Closing this one.

@hassaanp hassaanp closed this Mar 16, 2022
richardlau pushed a commit to nodejs/build that referenced this pull request Mar 16, 2022
@RaisinTen
ansible: update OpenSSL to 3.0.2+quic (#2898)
132c7dd 
Otherwise, the tests using OpenSSL as a shared library would fail on CI.

Refs: nodejs/node#42354 (comment)

Signed-off-by: Darshan Sen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file. needs-ci PRs that need a full CI run. openssl Issues and PRs related to the OpenSSL dependency.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.