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

[v10.x] Update openssl 1.1.1i #36541

Merged
merged 2 commits into from
Dec 22, 2020
Merged

[v10.x] Update openssl 1.1.1i #36541

merged 2 commits into from
Dec 22, 2020

Conversation

richardlau
Copy link
Member

The first commit (deps: upgrade openssl sources to 1.1.1i) is cherry-picked from #36521.

The second commit is the regenerated OpenSSL configuration files as the equivalent commit does not cherry pick cleanly (see #32971 (comment) for some history).

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines

@nodejs-github-bot nodejs-github-bot added openssl Issues and PRs related to the OpenSSL dependency. v10.x labels Dec 16, 2020
@richardlau richardlau mentioned this pull request Dec 16, 2020
Closed
@richardlau richardlau added the request-ci Add this label to start a Jenkins CI on a PR. label Dec 16, 2020
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label Dec 16, 2020
@nodejs-github-bot
Copy link
Collaborator

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

@nodejs-github-bot
Copy link
Collaborator

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

@mhdawson
Copy link
Member

@richardlau thanks for that. Should we add some documentation in https://github.com/nodejs/node/blob/master/doc/guides/maintaining-openssl.md to explain what you need to do in order to get updates across all of the active version?

mhdawson
mhdawson approved these changes Dec 16, 2020
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.

Rubber stamp LGTM

@richardlau
Copy link
Member Author

@richardlau thanks for that. Should we add some documentation in https://github.com/nodejs/node/blob/master/doc/guides/maintaining-openssl.md to explain what you need to do in order to get updates across all of the active version?

I just followed those instructions from step 2 onwards but for the v10.x branch.

@mhdawson
Copy link
Member

@richardlau that's what I figured, but since it came as a surprise to people, I was thinking having it documented would better explain the work we need to do in order to support releases across all of the release lines.

I'll put together a PR.

mhdawson added a commit to mhdawson/io.js that referenced this pull request Dec 17, 2020
@mhdawson
doc: expand openssl instructions
1a42132 
Refs: nodejs#36541

Expand the instructions to cover what is needed when
updates are required across all active release lines
@mhdawson mhdawson mentioned this pull request Dec 17, 2020
Closed
3 tasks
@mhdawson
Copy link
Member

PR #36554 to add instructions

@richardlau richardlau added commit-queue Add this label to land a pull request using GitHub Actions. and removed commit-queue Add this label to land a pull request using GitHub Actions. labels Dec 22, 2020
MylesBorins and others added 2 commits December 22, 2020 16:13
@MylesBorins @richardlau
deps: upgrade openssl sources to 1.1.1i
d936e18 
This updates all sources in deps/openssl/openssl by:
    $ cd deps/openssl/
    $ rm -rf openssl
    $ tar zxf ~/tmp/openssl-1.1.1i.tar.gz
    $ mv openssl-1.1.1i openssl
    $ git add --all openssl
    $ git commit openssl

PR-URL: nodejs#36541
Reviewed-By: Michael Dawson <midawson@redhat.com>
@richardlau
deps: update archs files for OpenSSL-1.1.1i
b0608b5 
After an OpenSSL source update, all the config files need to be
regenerated and comitted by:
    $ cd deps/openssl/config
    $ make
    $ 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: nodejs#36541
Reviewed-By: Michael Dawson <midawson@redhat.com>
@richardlau richardlau merged commit b0608b5 into nodejs:v10.x-staging Dec 22, 2020
@richardlau
Copy link
Member Author

Landed in bd44b0e...b0608b5.

@richardlau richardlau deleted the openssl-v10.x branch December 22, 2020 17:32
mhdawson added a commit that referenced this pull request Dec 22, 2020
@mhdawson
doc: expand openssl instructions
e22b751 
Refs: #36541

Expand the instructions to cover what is needed when
updates are required across all active release lines

PR-URL: #36554
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
danielleadams pushed a commit that referenced this pull request Jan 12, 2021
@mhdawson @danielleadams
doc: expand openssl instructions
dcc93d3 
Refs: #36541

Expand the instructions to cover what is needed when
updates are required across all active release lines

PR-URL: #36554
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
targos pushed a commit that referenced this pull request May 16, 2021
@mhdawson @targos
doc: expand openssl instructions
4cf665b 
Refs: #36541

Expand the instructions to cover what is needed when
updates are required across all active release lines

PR-URL: #36554
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
targos pushed a commit that referenced this pull request Jun 11, 2021
@mhdawson @targos
doc: expand openssl instructions
7efa020 
Refs: #36541

Expand the instructions to cover what is needed when
updates are required across all active release lines

PR-URL: #36554
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mhdawson mhdawson mhdawson approved these changes

Assignees
No one assigned
Labels
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.
4 participants
@richardlau @nodejs-github-bot @mhdawson @MylesBorins