From d49349b0aa7159fbec0a51ca3a1e9e7bb064ca6e Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 15 Mar 2022 17:17:41 -0400 Subject: [PATCH 1/9] 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 --- doc/contributing/maintaining-openssl.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/contributing/maintaining-openssl.md b/doc/contributing/maintaining-openssl.md index 76fcec9ee9e2d8..89ae87c3ecf2e1 100644 --- a/doc/contributing/maintaining-openssl.md +++ b/doc/contributing/maintaining-openssl.md @@ -3,10 +3,12 @@ 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 which is generated following the instructions + below for OpenSSL 1.1.1 * 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 From 3c02585f48e783e1fe5f2a8040205ca2409c41a0 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 15 Mar 2022 17:27:57 -0400 Subject: [PATCH 2/9] Update doc/contributing/maintaining-openssl.md --- doc/contributing/maintaining-openssl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/maintaining-openssl.md b/doc/contributing/maintaining-openssl.md index 89ae87c3ecf2e1..e758bb4997bc42 100644 --- a/doc/contributing/maintaining-openssl.md +++ b/doc/contributing/maintaining-openssl.md @@ -11,7 +11,7 @@ currently need to generate four PRs as follows: below for OpenSSL 1.1.1 * 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 From 98ef750b9999a11a457b437d5e2de543d9a05df4 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 15 Mar 2022 17:28:03 -0400 Subject: [PATCH 3/9] Update doc/contributing/maintaining-openssl.md Co-authored-by: Antoine du Hamel --- doc/contributing/maintaining-openssl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/maintaining-openssl.md b/doc/contributing/maintaining-openssl.md index e758bb4997bc42..cee4cdb427bc3c 100644 --- a/doc/contributing/maintaining-openssl.md +++ b/doc/contributing/maintaining-openssl.md @@ -6,7 +6,7 @@ If you need to provide updates across all active release lines you will currently need to generate four PRs as follows: * a PR for master which is generated following the instructions - below for OpenSSL 3.0.x + below for OpenSSL 3.0.x. * a PR for 16.x which is generated following the instructions below for OpenSSL 1.1.1 * a PR for 14.x following the instructions in the v14.x-staging version From aacc6db7b6731503ed8280451a8e810b3dacbb5c Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 15 Mar 2022 17:31:26 -0400 Subject: [PATCH 4/9] Update doc/contributing/maintaining-openssl.md Co-authored-by: Antoine du Hamel --- doc/contributing/maintaining-openssl.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/contributing/maintaining-openssl.md b/doc/contributing/maintaining-openssl.md index cee4cdb427bc3c..f179db64db8ac2 100644 --- a/doc/contributing/maintaining-openssl.md +++ b/doc/contributing/maintaining-openssl.md @@ -7,8 +7,8 @@ currently need to generate four PRs as follows: * a PR for master which is generated following the instructions below for OpenSSL 3.0.x. -* a PR for 16.x which is generated following the instructions - below for OpenSSL 1.1.1 +* 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 third PR to apply the From fed3e3a70e6b99eb89e25e50e9df577cc65e1277 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 15 Mar 2022 20:08:45 -0400 Subject: [PATCH 5/9] squash address comments --- doc/contributing/maintaining-openssl.md | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/doc/contributing/maintaining-openssl.md b/doc/contributing/maintaining-openssl.md index f179db64db8ac2..413becccd163e6 100644 --- a/doc/contributing/maintaining-openssl.md +++ b/doc/contributing/maintaining-openssl.md @@ -92,7 +92,7 @@ This updates all sources in deps/openssl/openssl by: $ git commit openssl ``` -### OpenSSL 3.0.0 +### OpenSSL 3.0.x ```console % git clone https://github.com/quictls/openssl @@ -106,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 git@github.com: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 @@ -154,6 +155,8 @@ please ask @shigeki for details. Update all architecture dependent files. Do not forget to git add or remove files if they are changed before committing: +### OpenSSL 1.1.1 + ```console % git add deps/openssl/config/archs % git add deps/openssl/openssl/include/crypto/bn_conf.h @@ -162,6 +165,16 @@ files if they are changed before committing: % git commit ``` +### OpenSSL 3.0.x + +```console + $ make -C deps/openssl/config + $ git add deps/openssl/config/archs + $ git add deps/openssl/openssl + $ git add deps/openssl/config + $ git commit +``` + The commit message can be written as (with the openssl version set to the relevant value): @@ -180,7 +193,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 @@ -190,6 +203,7 @@ regenerated and committed by: $ make -C deps/openssl/config $ git add deps/openssl/config/archs $ git add deps/openssl/openssl + $ git add deps/openssl/config $ git commit ``` From ffa837f82f129167d645eae8b6d32d4c520f7766 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 15 Mar 2022 20:20:27 -0400 Subject: [PATCH 6/9] squash:fixup --- doc/contributing/maintaining-openssl.md | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/doc/contributing/maintaining-openssl.md b/doc/contributing/maintaining-openssl.md index 413becccd163e6..01ecb702ada283 100644 --- a/doc/contributing/maintaining-openssl.md +++ b/doc/contributing/maintaining-openssl.md @@ -155,8 +155,6 @@ please ask @shigeki for details. Update all architecture dependent files. Do not forget to git add or remove files if they are changed before committing: -### OpenSSL 1.1.1 - ```console % git add deps/openssl/config/archs % git add deps/openssl/openssl/include/crypto/bn_conf.h @@ -165,16 +163,6 @@ files if they are changed before committing: % git commit ``` -### OpenSSL 3.0.x - -```console - $ make -C deps/openssl/config - $ git add deps/openssl/config/archs - $ git add deps/openssl/openssl - $ git add deps/openssl/config - $ git commit -``` - The commit message can be written as (with the openssl version set to the relevant value): From 4fc48eab3c2b4851d6908bbaad5de2a7332cd638 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Tue, 15 Mar 2022 20:28:46 -0400 Subject: [PATCH 7/9] Update doc/contributing/maintaining-openssl.md --- doc/contributing/maintaining-openssl.md | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/contributing/maintaining-openssl.md b/doc/contributing/maintaining-openssl.md index 01ecb702ada283..b3d42420dd8e54 100644 --- a/doc/contributing/maintaining-openssl.md +++ b/doc/contributing/maintaining-openssl.md @@ -191,7 +191,6 @@ regenerated and committed by: $ make -C deps/openssl/config $ git add deps/openssl/config/archs $ git add deps/openssl/openssl - $ git add deps/openssl/config $ git commit ``` From fe64c398f05ce84d0f481506a4b937621b29b8a5 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Wed, 16 Mar 2022 14:12:39 -0400 Subject: [PATCH 8/9] Update doc/contributing/maintaining-openssl.md Co-authored-by: Antoine du Hamel --- doc/contributing/maintaining-openssl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/maintaining-openssl.md b/doc/contributing/maintaining-openssl.md index b3d42420dd8e54..a819d5958e5b82 100644 --- a/doc/contributing/maintaining-openssl.md +++ b/doc/contributing/maintaining-openssl.md @@ -6,7 +6,7 @@ If you need to provide updates across all active release lines you will currently need to generate four PRs as follows: * a PR for master which is generated following the instructions - below for OpenSSL 3.0.x. + below for OpenSSL 3.x.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 From 3c31d654e21dab756e4170c30b9b6646b609af00 Mon Sep 17 00:00:00 2001 From: Michael Dawson Date: Wed, 16 Mar 2022 14:13:09 -0400 Subject: [PATCH 9/9] Update doc/contributing/maintaining-openssl.md --- doc/contributing/maintaining-openssl.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/maintaining-openssl.md b/doc/contributing/maintaining-openssl.md index a819d5958e5b82..9228b9c6bb107c 100644 --- a/doc/contributing/maintaining-openssl.md +++ b/doc/contributing/maintaining-openssl.md @@ -92,7 +92,7 @@ This updates all sources in deps/openssl/openssl by: $ git commit openssl ``` -### OpenSSL 3.0.x +### OpenSSL 3.x.x ```console % git clone https://github.com/quictls/openssl