-
-
Notifications
You must be signed in to change notification settings - Fork 34.3k
doc: update instructions for openssl updates #42353
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
Closed
Closed
Changes from 7 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
d49349b
doc: update instructions for openssl updates
mhdawson 3c02585
Update doc/contributing/maintaining-openssl.md
mhdawson 98ef750
Update doc/contributing/maintaining-openssl.md
mhdawson aacc6db
Update doc/contributing/maintaining-openssl.md
mhdawson fed3e3a
squash address comments
mhdawson ffa837f
squash:fixup
mhdawson 4fc48ea
Update doc/contributing/maintaining-openssl.md
mhdawson fe64c39
Update doc/contributing/maintaining-openssl.md
mhdawson 3c31d65
Update doc/contributing/maintaining-openssl.md
mhdawson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,13 +3,15 @@ | |
| This document describes how to update `deps/openssl/`. | ||
|
|
||
| If you need to provide updates across all active release lines you will | ||
| currently need to generate three PRs as follows: | ||
| currently need to generate four PRs as follows: | ||
|
|
||
| * a PR for master which is generated following the instructions | ||
| below. | ||
| below for OpenSSL 3.0.x. | ||
| * a PR for 16.x following the instructions in the v16.x-staging version | ||
| of this guide. | ||
| * a PR for 14.x following the instructions in the v14.x-staging version | ||
| of this guide. | ||
| * a PR which uses the same commit from the second PR to apply the | ||
| * a PR which uses the same commit from the third PR to apply the | ||
| updates to the openssl source code, with a new commit generated | ||
| by following steps 2 onwards on the 12.x line. This is | ||
| necessary because the configuration files have embedded timestamps | ||
|
|
@@ -90,7 +92,7 @@ This updates all sources in deps/openssl/openssl by: | |
| $ git commit openssl | ||
| ``` | ||
|
|
||
| ### OpenSSL 3.0.0 | ||
| ### OpenSSL 3.0.x | ||
mhdawson marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
|
||
| ```console | ||
| % git clone https://github.com/quictls/openssl | ||
|
|
@@ -104,14 +106,15 @@ This updates all sources in deps/openssl/openssl by: | |
| ``` | ||
|
|
||
| ```text | ||
| deps: upgrade openssl sources to quictls/openssl-3.0.0-alpha-16 | ||
| deps: upgrade openssl sources to quictls/openssl-3.0.2 | ||
|
|
||
| This updates all sources in deps/openssl/openssl by: | ||
| $ git clone [email protected]:quictls/openssl.git | ||
| $ cd openssl | ||
| $ git checkout openssl-3.0.2+quic | ||
| $ cd ../node/deps/openssl | ||
| $ rm -rf openssl | ||
| $ cp -R ../openssl openssl | ||
| $ cp -R ../../../openssl openssl | ||
| $ rm -rf openssl/.git* openssl/.travis* | ||
| $ git add --all openssl | ||
| $ git commit openssl | ||
|
|
@@ -178,7 +181,7 @@ to the relevant value): | |
| $ git commit | ||
| ``` | ||
|
|
||
| ### OpenSSL 3.0.0 | ||
| ### OpenSSL 3.0.x | ||
|
|
||
| ```text | ||
| deps: update archs files for quictls/openssl-3.0.0-alpha-16 | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.