diff options
| author | Daniel Bevenius <daniel.bevenius@gmail.com> | 2021-04-14 12:19:54 +0300 |
|---|---|---|
| committer | Daniel Bevenius <daniel.bevenius@gmail.com> | 2021-10-11 07:28:08 +0300 |
| commit | 66da32c045035cf2710a48773dc6f55f00e20c40 (patch) | |
| tree | 5476a5263442f875b4117c2e57d795105e63a02c /node.gypi | |
| parent | 49b7ec96a431a3e0ba0989d6b41db813aefe878a (diff) | |
deps,test,src,doc,tools: update to OpenSSL 3.0
This pull request updates the OpenSSL version that is statically
linked with Node.js from OpenSSl 1.1.1 to quictls OpenSSL 3.0.0+quic.
This pull request will replace the OpenSSL version that is currently
in the deps directory and when performing a normal build
OpenSSL 3.0+quic will be statically linked to the Node.js executable.
We will still be able to dynamically link to OpenSSL 1.1.1 and we have
a CI job which dynamically links to OpenSSL 1.1.1 which is run for
every pull request to make sure that we maintain backward compatibility.
PR-URL: https://github.com/nodejs/node/pull/38512
Reviewed-By: Michael Dawson <midawson@redhat.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'node.gypi')
| -rw-r--r-- | node.gypi | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/node.gypi b/node.gypi index 713ddbb74a1..e8aa664468a 100644 --- a/node.gypi +++ b/node.gypi @@ -320,6 +320,7 @@ 'defines': [ 'HAVE_OPENSSL=1' ], 'conditions': [ [ 'node_shared_openssl=="false"', { + 'defines': [ 'OPENSSL_API_COMPAT=0x10100000L', ], 'dependencies': [ './deps/openssl/openssl.gyp:openssl', @@ -361,10 +362,6 @@ ], }], ] - }, { - # Set 1.0.0 as the API compatibility level to avoid the - # deprecation warnings when using OpenSSL 3.0. - 'defines': [ 'OPENSSL_API_COMPAT=0x10000000L', ] }], [ 'openssl_quic=="true" and node_shared_ngtcp2=="false"', { 'dependencies': [ './deps/ngtcp2/ngtcp2.gyp:ngtcp2' ] |