Skip to content

Conversation

@LiviaMedeiros
Copy link
Member

@LiviaMedeiros LiviaMedeiros commented Jun 27, 2022

Backport of: #42837 and #42999.
Conflict caused by: #42768 semver-minor PRs that contain new features and should be released in the next minor version.

/cc @danielleadams
1656e1b is the same as 6be94c9, but it's absent on current v16.x-staging branch and backported commit depends on it. Please let me know if I should rebase to keep only ceee7be backported.

vmoroz and others added 4 commits June 22, 2022 21:05
PR-URL: nodejs#42459 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de> Backport-PR-URL: nodejs#43293
 [Compiler] Remove untrusted code mitigations. These are no longer enabled, so remove the code mitigation logic from the codebase. BUG=chromium:1003890 Change-Id: I536bb1732e8463281c21da446bbba8f47ede8ebe Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3045704 Commit-Queue: Ross McIlroy <rmcilroy@chromium.org> Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Clemens Backes <clemensb@chromium.org> Cr-Commit-Position: refs/heads/master@{#76256} Refs: v8/v8@4ab70f6 Fixes: nodejs#43296 PR-URL: nodejs#43328 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Jiawen Geng <technicalcute@gmail.com> Reviewed-By: Mohammed Keyvanzadeh <mohammadkeyvanzade94@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de>
This updates all sources in deps/openssl/openssl by: $ git clone https://github.com/quictls/openssl $ cd openssl $ git checkout OpenSSL_1_1_1p+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: nodejs#43535 Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-June/000228.html Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
 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: nodejs#43535 Refs: https://mta.openssl.org/pipermail/openssl-announce/2022-June/000228.html Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Danielle Adams <adamzdanielle@gmail.com>
@nodejs-github-bot nodejs-github-bot added needs-ci PRs that need a full CI run. test Issues and PRs related to the tests. v16.x labels Jun 27, 2022
LiviaMedeiros and others added 2 commits June 27, 2022 23:52
PR-URL: nodejs#42837 Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Backport-PR-URL: nodejs#43588
PR-URL: nodejs#42999 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Backport-PR-URL: nodejs#43588
@LiviaMedeiros LiviaMedeiros force-pushed the backport-v16.x-42999 branch from 68817e0 to ceee7be Compare June 27, 2022 15:54
@nodejs-github-bot

This comment was marked as outdated.

@targos
Copy link
Member

targos commented Jul 18, 2022

#42768 landed on v16.x-staging and there are no conflicts with the other commits, so I'm closing this. Thanks anyway @LiviaMedeiros

@targos targos closed this Jul 18, 2022
@LiviaMedeiros
Copy link
Member Author

LiviaMedeiros commented Jul 18, 2022 via email

@targos
Copy link
Member

targos commented Jul 18, 2022

My comment just said that the semver minor change landed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-ci PRs that need a full CI run. test Issues and PRs related to the tests.

6 participants