[v16.x] reland OpenSSL_1_1_1v+quic #49098
Closed
Conversation
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
This reverts commit 362d4c7.
This updates all sources in deps/openssl/openssl by:
$ git clone https://github.com/quictls/openssl
$ cd openssl
$ git checkout OpenSSL_1_1_1v+quic
$ cd ../node/deps/openssl
$ rm -rf openssl
$ cp -R ../openssl openssl
$ rm -rf openssl/.git* openssl/.travis*
$ git add --all openssl
$ git commit openssl
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
added
openssl
nodejs-github-bot
added
dependencies
github-actions
bot
removed
the
request-ci
Member
Author
|
FWIW: $ git log --oneline --shortstat deps/openssl
5c31bd31f5 (HEAD -> v16.x-reland-openssl1.1.1v+quic, origin/v16.x-reland-openssl1.1.1v+quic) deps: update archs files for OpenSSL_1_1_1v+quic
133 files changed, 140 insertions(+), 137 deletions(-)
3603d8a478 deps: upgrade openssl sources to OpenSSL_1_1_1v+quic
14 files changed, 97 insertions(+), 17 deletions(-)
d3fb63bb34 Revert "deps: upgrade openssl sources to OpenSSL_1_1_1v"
15172 files changed, 14 insertions(+), 21007 deletions(-)
40c3958a5a deps: update archs files for OpenSSL-1.1.1v
133 files changed, 205 insertions(+), 202 deletions(-)
a9ac9da89a deps: fix openssl crypto clean
1 file changed, 2 insertions(+), 2 deletions(-)
362d4c7494 deps: upgrade openssl sources to OpenSSL_1_1_1v
15175 files changed, 21007 insertions(+), 17 deletions(-)
155d3aac02 deps: update archs files for OpenSSL-1.1.1u+quic
202 files changed, 304 insertions(+), 1077 deletions(-)
8d4c8f8ebe deps: upgrade openssl sources to OpenSSL_1_1_1u
48 files changed, 1011 insertions(+), 810 deletions(-) |
Collaborator
Collaborator
Collaborator
29 tasks
lpinca
approved these changes
Aug 11, 2023
Collaborator
tniessen
approved these changes
Aug 11, 2023
Member
Author
|
Landed in aa40a04...51ab9ba. |
richardlau
added a commit
that referenced
this pull request
Aug 23, 2023
This reverts commit 362d4c7. PR-URL: #49098 Refs: #49043 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Tobias Nießen <[email protected]>
richardlau
added a commit
that referenced
this pull request
Aug 23, 2023
This updates all sources in deps/openssl/openssl by:
$ git clone https://github.com/quictls/openssl
$ cd openssl
$ git checkout OpenSSL_1_1_1v+quic
$ cd ../node/deps/openssl
$ rm -rf openssl
$ cp -R ../openssl openssl
$ rm -rf openssl/.git* openssl/.travis*
$ git add --all openssl
$ git commit openssl
PR-URL: #49098
Refs: #49043
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
richardlau
added a commit
that referenced
this pull request
Aug 23, 2023
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: #49098
Refs: #49043
Reviewed-By: Luigi Pinca <[email protected]>
Reviewed-By: Tobias Nießen <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
Refs: #49043
The recent update to OpenSSL_1_1_1v+quic changed an abnormally large number of files (15000+ according to git). Further inspection shows most of the changes were the addition of files under
deps/openssl/openssl/fuzz/corporawhich are supposed to be ignored bynode/deps/openssl/.gitignore
Line 1 in aa40a04
This PR reverts 362d4c7 and re-lands OpenSSL_1_1_1v+quic following the instructions in https://github.com/nodejs/node/blob/v16.x-staging/doc/contributing/maintaining-openssl.md.
I don't believe that any of the extra files affects the compiled result so we do not need to rebuild Node.js 16.20.2. I am, however, looking at doing a final Node.js 16 release before it goes End-of-Life next month and this tidy up would be a nice thing to include.