From b9c173ebad458398450d207b0c4e34b401fd0486 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 13 Jan 2025 23:49:09 +0100 Subject: [PATCH] sha256/hmac: use these with TLS builds now Used by the SSL session cache code. Bug: https://curl.se/mail/lib-2025-01/0041.html Reported-by: Aleksander Mazur Closes #15994 --- lib/curl_hmac.h | 6 +++--- lib/curl_sha256.h | 2 +- lib/hmac.c | 5 +++-- lib/sha256.c | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/curl_hmac.h b/lib/curl_hmac.h index ed5035ca63..f54edeb49e 100644 --- a/lib/curl_hmac.h +++ b/lib/curl_hmac.h @@ -24,9 +24,9 @@ * ***************************************************************************/ -#if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) \ - || !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) \ - || defined(USE_LIBSSH2) +#if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) || \ + !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) || \ + defined(USE_SSL) #include diff --git a/lib/curl_sha256.h b/lib/curl_sha256.h index 00e5b74c58..f532939d05 100644 --- a/lib/curl_sha256.h +++ b/lib/curl_sha256.h @@ -26,7 +26,7 @@ ***************************************************************************/ #if !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) \ - || defined(USE_LIBSSH2) + || defined(USE_LIBSSH2) || defined(USE_SSL) #include #include "curl_hmac.h" diff --git a/lib/hmac.c b/lib/hmac.c index 088c9bdcec..7b8a29e692 100644 --- a/lib/hmac.c +++ b/lib/hmac.c @@ -26,8 +26,9 @@ #include "curl_setup.h" -#if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) \ - || !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) +#if (defined(USE_CURL_NTLM_CORE) && !defined(USE_WINDOWS_SSPI)) || \ + !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) || \ + defined(USE_SSL) #include diff --git a/lib/sha256.c b/lib/sha256.c index c5bb921bb3..4af858eb70 100644 --- a/lib/sha256.c +++ b/lib/sha256.c @@ -26,7 +26,7 @@ #include "curl_setup.h" #if !defined(CURL_DISABLE_AWS) || !defined(CURL_DISABLE_DIGEST_AUTH) \ - || defined(USE_LIBSSH2) + || defined(USE_LIBSSH2) || defined(USE_SSL) #include "warnless.h" #include "curl_sha256.h"