Skip to content

Commit

Permalink
build: move OPENSSL_API_COMPAT to else clause
Browse files Browse the repository at this point in the history
Currently there are a number of deprecation warnings generated when
linking with OpenSSL 3.0, for example:

In file included from ../src/crypto/crypto_scrypt.h:6,
                 from ../src/crypto/crypto_scrypt.cc:1:
../src/crypto/crypto_util.h:64:37: warning:
‘void RSA_free(RSA*)’ is deprecated: Since OpenSSL 3.0
[-Wdeprecated-declarations]
   64 | using RSAPointer = DeleteFnPtr<RSA, RSA_free>;

The reason for this is that I had placed the macro OPENSSL_API_COMPAT
inside of the node_shared_openssl="false" clause, but that was a
mistake and this macro should have gone into the else clause instead.

PR-URL: #38126
Reviewed-By: Richard Lau <[email protected]>
Reviewed-By: James M Snell <[email protected]>
  • Loading branch information
danbev committed Apr 9, 2021
1 parent e96773b commit 7df0fc5
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions node.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,6 @@
# For tests
'./deps/openssl/openssl.gyp:openssl-cli',
],
# Set 1.0.0 as the API compability level to avoid the
# deprecation warnings when using OpenSSL 3.0.
'defines': ['OPENSSL_API_COMPAT=0x10000000L'],
'conditions': [
# -force_load or --whole-archive are not applicable for
# the static library
Expand Down Expand Up @@ -364,6 +361,10 @@
],
}],
]
}, {
# Set 1.0.0 as the API compability 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' ]
Expand Down

0 comments on commit 7df0fc5

Please sign in to comment.