Skip to content

Commit fb75531

Browse files
committed
src: gate all quic behind disabled-by-default compile flag
Due to quictls/openssl@93ae85b it is clear that we will need to revert back to using OpenSSL's official releases. This means we will be forced to re-implement at least part of the underlying QUIC implementation to use different crypto APIs. For that reason, this PR disables building any of the QUIC support by default and introduces a new compile time flag.
1 parent f6ce486 commit fb75531

File tree

3 files changed

+14
-32
lines changed

3 files changed

+14
-32
lines changed

configure.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
sys.path.insert(0, 'tools')
3939
import getmoduleversion
4040
import getnapibuildversion
41-
import getsharedopensslhasquic
4241
from gyp_node import run_gyp
4342
from utils import SearchFiles
4443

@@ -847,6 +846,12 @@
847846

848847
# End dummy list.
849848

849+
parser.add_argument('--with-quic',
850+
action='store_true',
851+
dest='quic',
852+
default=None,
853+
help='build with QUIC support')
854+
850855
parser.add_argument('--without-ssl',
851856
action='store_true',
852857
dest='without_ssl',
@@ -1743,6 +1748,7 @@ def configure_openssl(o):
17431748
variables['node_shared_ngtcp2'] = b(options.shared_ngtcp2)
17441749
variables['node_shared_nghttp3'] = b(options.shared_nghttp3)
17451750
variables['openssl_is_fips'] = b(options.openssl_is_fips)
1751+
variables['node_quic'] = b(options.quic)
17461752
variables['node_fipsinstall'] = b(False)
17471753

17481754
if options.openssl_no_asm:
@@ -1804,13 +1810,8 @@ def without_ssl_error(option):
18041810
if options.openssl_is_fips and not options.shared_openssl:
18051811
variables['node_fipsinstall'] = b(True)
18061812

1807-
if options.shared_openssl:
1808-
has_quic = getsharedopensslhasquic.get_has_quic(options.__dict__['shared_openssl_includes'])
1809-
else:
1810-
has_quic = getsharedopensslhasquic.get_has_quic('deps/openssl/openssl/include')
1811-
1812-
variables['openssl_quic'] = b(has_quic)
1813-
if has_quic:
1813+
variables['openssl_quic'] = b(options.quic)
1814+
if options.quic:
18141815
o['defines'] += ['NODE_OPENSSL_HAS_QUIC']
18151816

18161817
configure_library('openssl', o)

node.gyp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -927,12 +927,16 @@
927927
[ 'node_use_openssl=="true"', {
928928
'sources': [
929929
'<@(node_crypto_sources)',
930-
'<@(node_quic_sources)',
931930
],
932931
'dependencies': [
933932
'deps/ncrypto/ncrypto.gyp:ncrypto',
934933
],
935934
}],
935+
[ 'node_quic=="true"', {
936+
'sources': [
937+
'<@(node_quic_sources)',
938+
],
939+
}],
936940
[ 'OS in "linux freebsd mac solaris" and '
937941
'target_arch=="x64" and '
938942
'node_target_type=="executable"', {

tools/getsharedopensslhasquic.py

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)