mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 10:13:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

resolved: default to OpenSSL

Browse Source 
If both gnutls and openssl are available, prefer openssl.
We are gradually moving toward supporting openssl only as the
crypto library, and the resolved gnutls backend will be dropped
at some point, so start nudging users toward the openssl one.
This commit is contained in:
Luca Boccassi 2022-05-17 20:09:49 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent 6be96a9aed
commit 1f9aa3d2a6
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meson.build
View File

@ -1595,20 +1595,20 @@ if dns_over_tls != 'false'
error('Sorry, -Ddns-over-tls=gnutls is not supported when openssl is used as the cryptolib') error('Sorry, -Ddns-over-tls=gnutls is not supported when openssl is used as the cryptolib')
endif endif
if dns_over_tls == 'openssl' or conf.get('PREFER_OPENSSL') == 1 if dns_over_tls == 'gnutls'
have_gnutls = false
else
have_gnutls = (conf.get('HAVE_GNUTLS') == 1 and libgnutls.version().version_compare('>= 3.6.0'))
if dns_over_tls == 'gnutls' and not have_gnutls
error('DNS-over-TLS support was requested with gnutls, but dependencies are not available')
endif
endif
if dns_over_tls == 'gnutls' or have_gnutls
have_openssl = false have_openssl = false
else else
have_openssl = conf.get('HAVE_OPENSSL') == 1 have_openssl = conf.get('HAVE_OPENSSL') == 1
if dns_over_tls != 'auto' and not have_openssl if dns_over_tls == 'openssl' and not have_openssl
str = dns_over_tls == 'openssl' ? ' with openssl' : '' error('DNS-over-TLS support was requested with openssl, but dependencies are not available')
endif
endif
if dns_over_tls == 'openssl' or have_openssl
have_gnutls = false
else
have_gnutls = conf.get('HAVE_GNUTLS') == 1 and libgnutls.version().version_compare('>= 3.6.0')
if dns_over_tls != 'auto' and not have_gnutls
str = dns_over_tls == 'gnutls' ? ' with gnutls' : ''
error('DNS-over-TLS support was requested@0@, but dependencies are not available'.format(str)) error('DNS-over-TLS support was requested@0@, but dependencies are not available'.format(str))
endif endif
endif endif