resolve,import: always use openssl (#36937)

diff --cc NEWS
index 38342dc87fe6074d514a6ada51d0bbcc5e74d343,ddc17bf00b64c84f1c013409c034e354c5719fc0..5afaf8e0832168de4375504ee0f4e853c9037420
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -63,10 -55,15 +63,16 @@@ CHANGES WITH 258 in spe
  
          * Support for the SystemdOptions EFI variable has been removed.
  
 -        * The 'split-usr', 'rootlibdir', and 'rootprefix' meson options, which
 -          were deprecated in v255, have been removed.
 +        * The meson options 'split-usr', 'rootlibdir', 'rootprefix' (deprecated
 +          in v255), 'default-hierarchy' (v256), and 'nscd' (v257) have been
 +          removed.
  
+         * OpenSSL is the only crypto backend for systemd-resolved and
+           systemd-importd, and support for gnutls and gcrypt has been removed.
+           Hence, support for 'dns-over-tls=gnutls' meson option has been
+           removed. Also, 'cryptolib' meson option has been deprecated, and will
+           be removed in a future release.
+ 
          Announcements of Future Feature Removals:
  
          * The D-Bus method org.freedesktop.systemd1.StartAuxiliaryScope() is

diff --cc TODO
Simple merge

diff --cc meson.build
Simple merge

diff --cc meson_options.txt
Simple merge

diff --cc src/basic/gcrypt-util.c
Simple merge

diff --cc src/basic/gcrypt-util.h
Simple merge

diff --cc src/import/meson.build
Simple merge

diff --cc src/import/pull-job.c
Simple merge

diff --cc src/resolve/resolved-dns-dnssec.c
index ab2de46a4f3ea915fd862f098b437e40b2d411b4,09bfa8a59a6c031bbccf7d81611f83873ade1c94..ccd4ff9196a47d1482c3729b3b0ed384a4973bbd
--- 1/src/resolve/resolved-dns-dnssec.c
--- 2/src/resolve/resolved-dns-dnssec.c
+++ b/src/resolve/resolved-dns-dnssec.c
@@@ -4,9 -4,7 +4,8 @@@
  #include "dns-domain.h"
  #include "fd-util.h"
  #include "fileio.h"
- #include "gcrypt-util.h"
  #include "hexdecoct.h"
 +#include "log.h"
  #include "memory-util.h"
  #include "memstream-util.h"
  #include "openssl-util.h"

diff --cc src/resolve/resolved-dns-packet.c
Simple merge

diff --cc src/resolve/resolved-link.c
Simple merge

diff --cc src/shared/openssl-util.c
Simple merge

diff --cc src/test/meson.build
Simple merge