diff options
author | Daniel Gustafsson <daniel@yesql.se> | 2021-02-25 18:20:33 +0100 |
---|---|---|
committer | Daniel Gustafsson <daniel@yesql.se> | 2021-02-25 18:20:33 +0100 |
commit | 09a5bff1c9cb9c305ac18f5c4f1f6233badcd8b4 (patch) | |
tree | e8c0773beb3373f233fb584b04c3cec790015f8e /lib | |
parent | 82c583dcf009f038a9ceccc695f942f24015f9ab (diff) | |
download | curl-09a5bff1c9cb9c305ac18f5c4f1f6233badcd8b4.tar.gz |
gnutls: Fix nettle discovery
Commit e06fa7462ac258c removed support for libgcrypt leaving only
support for nettle which has been the default crypto library in
GnuTLS for a long time. There were however a few conditionals on
USE_GNUTLS_NETTLE which cause compilation errors in the metalink
code (as it used the gcrypt fallback instead as a result). See the
below autobuild for an example of the error:
https://curl.se/dev/log.cgi?id=20210225123226-30704#prob1
This removes all uses of USE_GNUTLS_NETTLE and also removes the
gcrypt support from the metalink code while at it.
Closes #6656
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/curl_ntlm_core.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/curl_ntlm_core.h b/lib/curl_ntlm_core.h index fab628c59..95ed9e64f 100644 --- a/lib/curl_ntlm_core.h +++ b/lib/curl_ntlm_core.h @@ -30,7 +30,6 @@ then it must be initialized to be used by NTLM. */ #if !defined(USE_OPENSSL) && \ !defined(USE_WOLFSSL) && \ - !defined(USE_GNUTLS_NETTLE) && \ !defined(USE_GNUTLS) && \ defined(USE_NSS) #define NTLM_NEEDS_NSS_INIT |