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

[v14.x] update to OpenSSL 1.1.1n #42347

Closed
wants to merge 3 commits into from
Closed

[v14.x] update to OpenSSL 1.1.1n #42347

wants to merge 3 commits into from

Conversation

richardlau
Copy link
Member

@richardlau richardlau added the request-ci Add this label to start a Jenkins CI on a PR. label Mar 15, 2022
@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. v14.x labels Mar 15, 2022
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Mar 15, 2022
@nodejs-github-bot

This comment was marked as outdated.

Sign in to view
@richardlau
Copy link
Member Author

https://github.com/nodejs/node/runs/5558087600?check_suite_focus=true
I'll push a commit later to pin the actions onto windows-2019 instead of windows-latest and hope that fixes the workflow for Node.js 14 🤞.

@richardlau richardlau mentioned this pull request Mar 15, 2022
Closed
@richardlau
Copy link
Member Author

https://github.com/nodejs/node/runs/5558087600?check_suite_focus=true I'll push a commit later to pin the actions onto windows-2019 instead of windows-latest and hope that fixes the workflow for Node.js 14 🤞.

#42350 does just that and appears to work.

bengl and others added 3 commits March 15, 2022 19:24
@bengl @richardlau
doc: add release key for Bryan English
35c6842 
Adds Bryan English and his public key to the README for releases.

PR-URL: nodejs#42102
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Beth Griggs <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Mestery <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
Reviewed-By: Danielle Adams <[email protected]>
@richardlau
deps: upgrade openssl sources to 1.1.1n
f89eaf7 
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1n.tar.gz
    $ mv openssl-1.1.1n openssl
    $ git add --all openssl
    $ git commit openssl
@richardlau
deps: update archs files for OpenSSL-1.1.1n
40c308a 
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/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit
@richardlau richardlau force-pushed the openssl1.1.1n-v14.x branch from 3383bfb to 40c308a Compare March 15, 2022 23:30
@richardlau richardlau added the request-ci Add this label to start a Jenkins CI on a PR. label Mar 16, 2022
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Mar 16, 2022
@nodejs-github-bot

This comment was marked as outdated.

Sign in to view
@nodejs-github-bot

This comment was marked as outdated.

Sign in to view
joesepi
joesepi approved these changes Mar 16, 2022
View reviewed changes
Copy link
Member

@joesepi joesepi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@richardlau richardlau added the fast-track PRs that do not need to wait for 48 hours to land. label Mar 16, 2022
@github-actions
Copy link
Contributor

Fast-track has been requested by @richardlau. Please 👍 to approve.

mhdawson
mhdawson approved these changes Mar 16, 2022
View reviewed changes
Copy link
Member

@mhdawson mhdawson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nodejs-github-bot
Copy link
Collaborator

CI: https://ci.nodejs.org/job/node-test-pull-request/43072/

@VoltrexKeyva VoltrexKeyva removed the needs-ci PRs that need a full CI run. label Mar 16, 2022
richardlau added a commit that referenced this pull request Mar 16, 2022
@richardlau
deps: upgrade openssl sources to 1.1.1n
c83dd99 
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1n.tar.gz
    $ mv openssl-1.1.1n openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: #42347
Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-March/000218.html
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Joe Sepi <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
richardlau added a commit that referenced this pull request Mar 16, 2022
@richardlau
deps: update archs files for OpenSSL-1.1.1n
3b1a0b2 
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/include/crypto/bn_conf.h
    $ git add deps/openssl/openssl/include/crypto/dso_conf.h
    $ git add deps/openssl/openssl/include/openssl/opensslconf.h
    $ git commit

PR-URL: #42347
Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-March/000218.html
Reviewed-By: Darshan Sen <[email protected]>
Reviewed-By: Joe Sepi <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
@richardlau
Copy link
Member Author

Landed in b5c52e3...3b1a0b2.

@richardlau richardlau closed this Mar 16, 2022
@richardlau richardlau deleted the openssl1.1.1n-v14.x branch March 16, 2022 23:45
@github-actions github-actions bot mentioned this pull request Mar 17, 2022
Open
38 tasks
@richardlau richardlau mentioned this pull request Mar 17, 2022
Merged
This was referenced Mar 18, 2022
Open
Open
Open
Open
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RaisinTen RaisinTen RaisinTen approved these changes

@mhdawson mhdawson mhdawson approved these changes

@tniessen tniessen tniessen approved these changes

@Trott Trott Trott approved these changes

@joesepi joesepi joesepi approved these changes

Assignees
No one assigned
Labels
dependencies Pull requests that update a dependency file. fast-track PRs that do not need to wait for 48 hours to land. 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.
9 participants
@richardlau @nodejs-github-bot @joesepi @Trott @tniessen @mhdawson @RaisinTen @VoltrexKeyva @bengl