[v14.x] Update openssl 1.1.1i#36521
Closed
MylesBorins wants to merge 2 commits into
Closed
Conversation
nodejs-github-bot
added
the
openssl
MylesBorins
added
request-ci
Collaborator
Collaborator
richardlau
approved these changes
Dec 15, 2020
Member
|
The second commit should be titled |
MylesBorins
force-pushed
the
update-openssl-1.1.1i-14.x
branch
from
6cf7cf5 to
7051246
Compare
Member
|
These commits cherry-pick cleanly onto |
BethGriggs
force-pushed
the
v14.x-staging
branch
from
4b315a5 to
71c3efe
Compare
codebytere
approved these changes
Dec 15, 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
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
MylesBorins
force-pushed
the
update-openssl-1.1.1i-14.x
branch
from
7051246 to
84c9983
Compare
2 tasks
Member
So I've dug a bit and it's not expected to be able to cherry-pick the openssl config from |
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 <rlau@redhat.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
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 <rlau@redhat.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
Contributor
Author
|
landed in f9f01b9...12a0111 |
Contributor
Author
|
Backported to v12.x in 76ea9c5...941b1ab |
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 <rlau@redhat.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
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 <rlau@redhat.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
Member
FYI These commits were missing metadata. I've force pushed the commits with metadata added to |
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 <rlau@redhat.com>
Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Reviewed-By: Michael Dawson <midawson@redhat.com>
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 <rlau@redhat.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com> Reviewed-By: Michael Dawson <midawson@redhat.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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