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.

Sign up for GitHub

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

doc: update maintaining openssl guide #39878

Closed
wants to merge 1 commit into from
Closed

doc: update maintaining openssl guide #39878

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions doc/guides/maintaining-openssl.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,13 @@ currently need to generate three PRs as follows:

* a PR for master which is generated following the instructions
below.
* a PR for 14.x following the instruction below based on the
14,x branch. This PR should cherry pick back to the active release
lines except for the 10.x line.
* 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
updates to the openssl source code, with a new commit generated
by following steps 2 onwards on the 10.x line. This is
necessary because differences in 10.x requires that the
configuration files be regenerated specifically for 10.x.
by following steps 2 onwards on the 12.x line. This is
necessary because the configuration files have embedded timestamps
which lead to merge conflicts if cherry-picked from the second PR.

## Use of the quictls/openssl fork

Expand Down