diff options
| author | Brad King <brad.king@kitware.com> | 2017-06-15 14:03:11 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-06-15 14:03:31 (GMT) |
| commit | df6f3ef9a6a2de945f43bf1f60e19d60f3137188 (patch) | |
| tree | 9838eabc5c16ccb5f64d2ede5c680011709c9e89 /Utilities/cmcurl/lib/md4.c | |
| parent | 65834d04a21c93e5eaaa7256e386aabd36699041 (diff) | |
| parent | a3ef36f153f51c33ea2154cff17bbf9abb7ee073 (diff) | |
| download | CMake-df6f3ef9a6a2de945f43bf1f60e19d60f3137188.zip CMake-df6f3ef9a6a2de945f43bf1f60e19d60f3137188.tar.gz CMake-df6f3ef9a6a2de945f43bf1f60e19d60f3137188.tar.bz2 | |
Merge topic 'update-curl'
a3ef36f1 Merge branch 'upstream-curl' into update-curl
06d6d6c4 curl 2017-06-14 (54b636f1)
91101f10 curl: Update script to get curl 7.54.1
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !965
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 1bdc9f3..2bb7dcc 100644 --- a/Utilities/cmcurl/lib/md4.c +++ b/Utilities/cmcurl/lib/md4.c @@ -37,9 +37,10 @@ #include "curl_setup.h" -/* NSS and OS/400 crypto library do not provide the MD4 hash algorithm, so - * that we have a local implementation of it */ -#if defined(USE_NSS) || defined(USE_OS400CRYPTO) +/* The NSS, OS/400 and sometimes mbed TLS crypto libraries do not provide the + * MD4 hash algorithm, so we have a local implementation of it */ +#if defined(USE_NSS) || defined(USE_OS400CRYPTO) || \ + (defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C)) #include "curl_md4.h" #include "warnless.h" @@ -89,7 +90,7 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx); */ #if defined(__i386__) || defined(__x86_64__) || defined(__vax__) #define SET(n) \ - (*(MD4_u32plus *)&ptr[(n) * 4]) + (*(MD4_u32plus *)(void *)&ptr[(n) * 4]) #define GET(n) \ SET(n) #else @@ -302,4 +303,5 @@ void Curl_md4it(unsigned char *output, const unsigned char *input, size_t len) MD4_Update(&ctx, input, curlx_uztoui(len)); MD4_Final(output, &ctx); } -#endif /* defined(USE_NSS) || defined(USE_OS400CRYPTO) */ +#endif /* defined(USE_NSS) || defined(USE_OS400CRYPTO) || + (defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C)) */ |