[v14.x] deps: update OpenSSL 1.1.1t #46566
Closed
+2,690
−613
Conversation
This file contains 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
This updates all sources in deps/openssl/openssl by:
$ cd deps/openssl/
$ rm -rf openssl
$ tar zxf ~/tmp/openssl-1.1.1t.tar.gz
$ mv openssl-1.1.1t openssl
$ git add --all openssl
$ git commit openssl
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
|
Review requested:
|
nodejs-github-bot
added
dependencies
This comment was marked as outdated.
This comment was marked as outdated.
richardlau
approved these changes
Feb 8, 2023
richardlau
added
the
fast-track
This comment was marked as outdated.
This comment was marked as outdated.
|
This has failed to compile for Windows arm64: 13:17:47 openssl.lib(rsa_sup_mul.obj) : error LNK2019: unresolved external symbol _umul128 referenced in function _mul_add_limb [C:\workspace\node-compile-windows\node\deps\openssl\openssl-cli.vcxproj]
13:17:47 ..\..\out\Release\openssl-cli.exe : fatal error LNK1120: 1 unresolved externals [C:\workspace\node-compile-windows\node\deps\openssl\openssl-cli.vcxproj]@nodejs/platform-windows-arm |
Looks like we've hit openssl/openssl#20234. There's two competing open PRs:
We'll either have to float one of those patches or somehow temporarily stop building on Windows ARM64 as it doesn't sound like OpenSSL will be fixing this any time soon as to them, openssl/openssl#20234 (comment):
|
|
Cc @StefanStojanovic for Windows Arm64 |
|
Checking if cherry-picking the changes from openssl/openssl#20244 fixes the Win ARM64 build. |
Original commit message:
rsa: add msvc intrinsic for non x64 platforms
_umul128() is x86_64 (x64) only, while __umulh() works everywhere, but
doesn't generate optimal code on x64
Refs: openssl/openssl#20244
richardlau
approved these changes
Feb 10, 2023
BethGriggs
approved these changes
Feb 13, 2023
richardlau
removed
the
fast-track
richardlau
pushed a commit
that referenced
this pull request
Feb 13, 2023
This updates all sources in deps/openssl/openssl by:
$ cd deps/openssl/
$ rm -rf openssl
$ tar zxf ~/tmp/openssl-1.1.1t.tar.gz
$ mv openssl-1.1.1t openssl
$ git add --all openssl
$ git commit openssl
PR-URL: #46566
Refs: https://mta.openssl.org/pipermail/openssl-announce/2023-February/000251.html
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Beth Griggs <bethanyngriggs@gmail.com>
richardlau
pushed a commit
that referenced
this pull request
Feb 13, 2023
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: #46566 Refs: https://mta.openssl.org/pipermail/openssl-announce/2023-February/000251.html Reviewed-By: Richard Lau <rlau@redhat.com> Reviewed-By: Beth Griggs <bethanyngriggs@gmail.com>
richardlau
added a commit
that referenced
this pull request
Feb 13, 2023
Original commit message:
rsa: add msvc intrinsic for non x64 platforms
_umul128() is x86_64 (x64) only, while __umulh() works everywhere, but
doesn't generate optimal code on x64
PR-URL: #46566
Refs: openssl/openssl#20244
Refs: https://mta.openssl.org/pipermail/openssl-announce/2023-February/000251.html
Reviewed-By: Richard Lau <rlau@redhat.com>
Reviewed-By: Beth Griggs <bethanyngriggs@gmail.com>
|
Landed in 224e93c...9e62215. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Updated openssl dep to openssl-1.1.1t using the maintenance guide.
Refs: https://mta.openssl.org/pipermail/openssl-announce/2023-February/000251.html