Skip to content

Commit 04a7c00

Browse files
mhdawsonbengl
authored andcommitted
doc: update instructions for openssl updates
Update to reflect additional PRs needed as some branches now use OpenSSL 3.x Signed-off-by: Michael Dawson <[email protected]> PR-URL: #42353 Reviewed-By: Richard Lau <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Darshan Sen <[email protected]>
1 parent d9a5c2b commit 04a7c00

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

doc/contributing/maintaining-openssl.md

+10-7
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@
33
This document describes how to update `deps/openssl/`.
44

55
If you need to provide updates across all active release lines you will
6-
currently need to generate three PRs as follows:
6+
currently need to generate four PRs as follows:
77

88
* a PR for master which is generated following the instructions
9-
below.
9+
below for OpenSSL 3.x.x.
10+
* a PR for 16.x following the instructions in the v16.x-staging version
11+
of this guide.
1012
* a PR for 14.x following the instructions in the v14.x-staging version
1113
of this guide.
12-
* a PR which uses the same commit from the second PR to apply the
14+
* a PR which uses the same commit from the third PR to apply the
1315
updates to the openssl source code, with a new commit generated
1416
by following steps 2 onwards on the 12.x line. This is
1517
necessary because the configuration files have embedded timestamps
@@ -90,7 +92,7 @@ This updates all sources in deps/openssl/openssl by:
9092
$ git commit openssl
9193
```
9294

93-
### OpenSSL 3.0.0
95+
### OpenSSL 3.x.x
9496

9597
```console
9698
% git clone https://github.com/quictls/openssl
@@ -104,14 +106,15 @@ This updates all sources in deps/openssl/openssl by:
104106
```
105107

106108
```text
107-
deps: upgrade openssl sources to quictls/openssl-3.0.0-alpha-16
109+
deps: upgrade openssl sources to quictls/openssl-3.0.2
108110
109111
This updates all sources in deps/openssl/openssl by:
110112
$ git clone [email protected]:quictls/openssl.git
111113
$ cd openssl
114+
$ git checkout openssl-3.0.2+quic
112115
$ cd ../node/deps/openssl
113116
$ rm -rf openssl
114-
$ cp -R ../openssl openssl
117+
$ cp -R ../../../openssl openssl
115118
$ rm -rf openssl/.git* openssl/.travis*
116119
$ git add --all openssl
117120
$ git commit openssl
@@ -178,7 +181,7 @@ to the relevant value):
178181
$ git commit
179182
```
180183

181-
### OpenSSL 3.0.0
184+
### OpenSSL 3.0.x
182185

183186
```text
184187
deps: update archs files for quictls/openssl-3.0.0-alpha-16

0 commit comments

Comments
 (0)