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 /packages | |
| 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 'packages')
| -rw-r--r-- | packages/vms/generate_config_vms_h_curl.com | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/packages/vms/generate_config_vms_h_curl.com b/packages/vms/generate_config_vms_h_curl.com index 6c65b24cb..6c60bdf4b 100644 --- a/packages/vms/generate_config_vms_h_curl.com +++ b/packages/vms/generate_config_vms_h_curl.com @@ -331,9 +331,6 @@ $write cvh "#endif" $write cvh "#ifdef USE_GNUTLS" $write cvh "#undef USE_GNUTLS" $write cvh "#endif" -$write cvh "#ifdef USE_GNUTLS_NETTLE" -$write cvh "#undef USE_GNUTLS_NETTLE" -$write cvh "#endif" $write cvh "#ifdef USE_LIBRTMP" $write cvh "#undef USE_LIBRTMP" $write cvh "#endif" |