[v10.x] openssl 1.1.1g #32982
Closed
[v10.x] openssl 1.1.1g #32982
Conversation
This file contains 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
nodejs-github-bot
added
openssl
4 tasks
|
Pushed a fixup --- some files that are present on 12.x were here, and didn't get regenerated because 10.x doesn't use them. I rm -rfed deps/openssl/config/arch, and then regenerated the config again, and it looks they are gone. |
|
There was a comment here about conflict markers, but it got deleted or something? Not sure why it was in my email but not visible here. Anyhow, whoever that was, thanks for noticing. |
|
Hey @sam-github , it was me who I deleted it because I was afraid I was wrong. |
|
You were correct, though the files aren't used so it wouldn't have caused issues, but it wasn't intended or tidy. And hey, we've all been wrong on github before, its no big deal even if you were, if something doesn't make sense to you, this is the place to ask. |
This updates all sources in deps/openssl/openssl by:
$ cd deps/openssl/
$ rm -rf openssl
$ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
$ mv openssl-1.1.0h openssl
$ git add --all openssl
$ git commit openssl
PR-URL: nodejs#32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
This updates all sources in deps/openssl/openssl by:
$ cd deps/openssl/
$ rm -rf openssl
$ tar zxf ~/tmp/openssl-1.1.1g.tar.gz
$ mv openssl-1.1.1g openssl
$ git add --all openssl
$ git commit openssl
After an OpenSSL source update, all the config files need to be regenerated and committed 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
richardlau
force-pushed
the
openssl1.1.1g-v10.x
branch
from
79e338d to
51b43b2
Compare
richardlau
approved these changes
Jul 1, 2020
richardlau
pushed a commit
that referenced
this pull request
Jul 1, 2020
This updates all sources in deps/openssl/openssl by:
$ cd deps/openssl/
$ rm -rf openssl
$ tar zxf ~/tmp/openssl-1.1.1f.tar.gz
$ mv openssl-1.1.0h openssl
$ git add --all openssl
$ git commit openssl
Backport-PR-URL: #32982
PR-URL: #32583
Reviewed-By: Sam Roberts <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
richardlau
pushed a commit
that referenced
this pull request
Jul 1, 2020
This updates all sources in deps/openssl/openssl by:
$ cd deps/openssl/
$ rm -rf openssl
$ tar zxf ~/tmp/openssl-1.1.1g.tar.gz
$ mv openssl-1.1.1g openssl
$ git add --all openssl
$ git commit openssl
PR-URL: #32982
Reviewed-By: Richard Lau <[email protected]>
richardlau
pushed a commit
that referenced
this pull request
Jul 1, 2020
After an OpenSSL source update, all the config files need to be regenerated and committed 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: #32982 Reviewed-By: Richard Lau <[email protected]>
|
Landed in aaf2f82...745b329. |
richardlau
added a commit
that referenced
this pull request
Jul 2, 2020
richardlau
added a commit
that referenced
this pull request
Jul 13, 2020
richardlau
added a commit
that referenced
this pull request
Jul 15, 2020
BethGriggs
pushed a commit
that referenced
this pull request
Jul 21, 2020
cjihrig
pushed a commit
that referenced
this pull request
Jul 23, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Backport-of: #32971
I had to cherry-pick 1.1.1f before 1.1.1g, and regenerate the config, no other edits were required.
Checklist
make -j4 test(UNIX), orvcbuild test(Windows) passes