diff options
| author | Brad King <brad.king@kitware.com> | 2023-06-01 13:44:13 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-06-01 13:44:21 (GMT) |
| commit | 859de07aa38af805b74801e0f124e06233263e78 (patch) | |
| tree | 82cefbb04e54300f647b3c6ae8893d83a185fa90 /Utilities/cmcurl/lib/md4.c | |
| parent | 16061844607a96b579dcb3775dad2c0386039781 (diff) | |
| parent | 2de38e0b45a6d685aca932062566ca4e17e68403 (diff) | |
| download | CMake-859de07aa38af805b74801e0f124e06233263e78.zip CMake-859de07aa38af805b74801e0f124e06233263e78.tar.gz CMake-859de07aa38af805b74801e0f124e06233263e78.tar.bz2 | |
Merge topic 'update-curl'
2de38e0b45 Utilities: Update hard-coded try_compile results for curl 8.1.2
a6c9b53273 Merge branch 'upstream-curl' into update-curl
80cb6a5121 curl 2023-05-30 (7ab9d437)
7f1abf62e1 curl: Update script to get curl 8.1.2
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8519
Diffstat (limited to 'Utilities/cmcurl/lib/md4.c')
| -rw-r--r-- | Utilities/cmcurl/lib/md4.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Utilities/cmcurl/lib/md4.c b/Utilities/cmcurl/lib/md4.c index 318e9da..9ff093b 100644 --- a/Utilities/cmcurl/lib/md4.c +++ b/Utilities/cmcurl/lib/md4.c @@ -24,7 +24,7 @@ #include "curl_setup.h" -#if !defined(CURL_DISABLE_CRYPTO_AUTH) +#if defined(USE_CURL_NTLM_CORE) #include <string.h> @@ -68,10 +68,12 @@ #include <openssl/md4.h> #elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \ (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040) && \ - defined(__MAC_OS_X_VERSION_MIN_ALLOWED) && \ - (__MAC_OS_X_VERSION_MIN_ALLOWED < 101500)) || \ + defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && \ + (__MAC_OS_X_VERSION_MIN_REQUIRED < 101500)) || \ (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \ - (__IPHONE_OS_VERSION_MAX_ALLOWED >= 20000)) + (__IPHONE_OS_VERSION_MAX_ALLOWED >= 20000) && \ + defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && \ + (__IPHONE_OS_VERSION_MIN_REQUIRED < 130000)) #define AN_APPLE_OS #include <CommonCrypto/CommonDigest.h> #elif defined(USE_WIN32_CRYPTO) @@ -504,4 +506,4 @@ void Curl_md4it(unsigned char *output, const unsigned char *input, MD4_Final(output, &ctx); } -#endif /* CURL_DISABLE_CRYPTO_AUTH */ +#endif /* USE_CURL_NTLM_CORE */ |