diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2020-02-19 07:46:22 +0000 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2020-02-20 15:27:32 +0000 |
| commit | 150f45e8d1cce189a5b0b963243a8563d3d14b8e (patch) | |
| tree | 557a919688559aca17d5cd2437d5481f9a354cb9 | |
| parent | 1b6cfb9d24cdcb822996bc23e2eb5a4cea73ec4e (diff) | |
win32: USE_WIN32_CRYPTO to enable Win32 based MD4, MD5 and SHA256 functions
Whilst lib\md4.c used this pre-processor, lib\md5.c and
src\tool_metalink.c did not and simply relied on the WIN32
pre-processor directive.
Reviewed-by: Marcel Raad
Closes #4955
| -rw-r--r-- | lib/config-win32.h | 4 | ||||
| -rw-r--r-- | lib/md5.c | 4 | ||||
| -rw-r--r-- | src/tool_metalink.c | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/config-win32.h b/lib/config-win32.h index 1dcce0db4..8b488c1c1 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -714,7 +714,9 @@ Vista #endif /* Define to use the Windows crypto library. */ +#if !defined(CURL_WINDOWS_APP) #define USE_WIN32_CRYPTO +#endif /* Define to use Unix sockets. */ #if defined(_MSC_VER) && (_MSC_VER >= 1500) @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -124,7 +124,7 @@ static void MD5_Final(unsigned char digest[16], MD5_CTX *ctx) CC_MD5_Final(digest, ctx); } -#elif defined(WIN32) && !defined(CURL_WINDOWS_APP) +#elif defined(USE_WIN32_CRYPTO) #include <wincrypt.h> #include "curl_memory.h" diff --git a/src/tool_metalink.c b/src/tool_metalink.c index 53de61258..7acbb7a07 100644 --- a/src/tool_metalink.c +++ b/src/tool_metalink.c @@ -73,7 +73,7 @@ and later. If you're building for an older cat, well, sorry. */ # define COMMON_DIGEST_FOR_OPENSSL # include <CommonCrypto/CommonDigest.h> -#elif defined(WIN32) +#elif defined(USE_WIN32_CRYPTO) /* For Windows: If no other crypto library is provided, we fallback to the hash functions provided within the Microsoft Windows CryptoAPI */ # include <wincrypt.h> @@ -381,7 +381,7 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx) sha256_finish(ctx, digest); } -#elif defined(WIN32) +#elif defined(USE_WIN32_CRYPTO) static void win32_crypto_final(struct win32_crypto_hash *ctx, unsigned char *digest, |