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

[v14.x] Update openssl 1.1.1i #36521

Closed

Conversation

MylesBorins
Copy link
Contributor

Manually created this on v14.x as we don't need all the quic patches that are included in #36520

I've checked and this will cleanly cherry-pick to 12.x and 10.x

tarball for update: https://www.openssl.org/source/openssl-1.1.1i.tar.gz

/cc @nodejs/crypto @nodejs/lts

@nodejs-github-bot nodejs-github-bot added the openssl Issues and PRs related to the OpenSSL dependency. label Dec 15, 2020
@MylesBorins MylesBorins added request-ci Add this label to start a Jenkins CI on a PR. and removed request-ci Add this label to start a Jenkins CI on a PR. labels Dec 15, 2020
@nodejs-github-bot
Copy link
Collaborator

@nodejs-github-bot
Copy link
Collaborator

@richardlau
Copy link
Member

The second commit should be titled deps: update archs files for OpenSSL-1.1.1i.

@richardlau
Copy link
Member

These commits cherry-pick cleanly onto v12.x-staging but not onto v10.x-staging.

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
After an OpenSSL source update, all the config files need to be
regenerated and committed by:
  $ make gen-openssl
  $ 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
Copy link
Member

These commits cherry-pick cleanly onto v12.x-staging but not onto v10.x-staging.

So I've dug a bit and it's not expected to be able to cherry-pick the openssl config from v12.x+ back to v10.x, see #32971 (comment). I've opened #36541 to manually backport the openssl update to v10.x-staging.

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

MylesBorins added a commit that referenced this pull request Dec 17, 2020
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: #36521
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Shelley Vohr <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
MylesBorins added a commit that referenced this pull request Dec 17, 2020
After an OpenSSL source update, all the config files need to be
regenerated and committed by:
  $ make gen-openssl
  $ 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: #36521
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Shelley Vohr <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
@MylesBorins
Copy link
Contributor Author

landed in f9f01b9...12a0111

@MylesBorins
Copy link
Contributor Author

Backported to v12.x in 76ea9c5...941b1ab

CI: https://ci.nodejs.org/job/node-test-commit/42998/

richardlau pushed a commit that referenced this pull request Dec 17, 2020
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: #36521
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Shelley Vohr <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
richardlau pushed a commit that referenced this pull request Dec 17, 2020
After an OpenSSL source update, all the config files need to be
regenerated and committed by:
  $ make gen-openssl
  $ 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: #36521
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Shelley Vohr <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
@richardlau
Copy link
Member

Backported to v12.x in 76ea9c5...941b1ab

FYI These commits were missing metadata. I've force pushed the commits with metadata added to v12.x-staging as 76ea9c5...96ec482.

@MylesBorins
Copy link
Contributor Author

@richardlau thanks for getting that, apologies

BethGriggs pushed a commit that referenced this pull request Dec 17, 2020
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: #36521
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Shelley Vohr <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
BethGriggs pushed a commit that referenced this pull request Dec 17, 2020
After an OpenSSL source update, all the config files need to be
regenerated and committed by:
  $ make gen-openssl
  $ 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: #36521
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: Shelley Vohr <[email protected]>
Reviewed-By: Michael Dawson <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
openssl Issues and PRs related to the OpenSSL dependency.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants