diff options
| author | Steve Holme <steve_holme@hotmail.com> | 2019-04-14 02:25:50 +0100 |
|---|---|---|
| committer | Steve Holme <steve_holme@hotmail.com> | 2019-08-04 18:01:26 +0100 |
| commit | 24c298fb4db4c97d477f806a269f2ee524ceb814 (patch) | |
| tree | a7cef93e948952e703397b06a0018dbc0e4c4599 /lib/md4.c | |
| parent | c89365929bb5d4eda4d234b3d82e89192b74ca47 (diff) | |
md4: Use the Curl_md4it() function for OpenSSL based NTLM
Diffstat (limited to 'lib/md4.c')
| -rw-r--r-- | lib/md4.c | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -85,6 +85,13 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx) gcry_md_close(ctx); } +#elif defined(USE_OPENSSL) && !defined(OPENSSL_NO_MD4) +/* When OpenSSL is available we use the MD4-functions from OpenSSL */ +#include <openssl/md4.h> + +#include "curl_md4.h" +#include "warnless.h" + #elif defined(USE_NSS) || defined(USE_OS400CRYPTO) || \ (defined(USE_OPENSSL) && defined(OPENSSL_NO_MD4)) || \ (defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C)) @@ -131,8 +138,6 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx) #include "curl_md4.h" #include "warnless.h" -#ifndef HAVE_OPENSSL - #include <string.h> /* Any 32-bit or wider unsigned integer data type will do */ @@ -381,13 +386,10 @@ static void MD4_Final(unsigned char *result, MD4_CTX *ctx) memset(ctx, 0, sizeof(*ctx)); } -#endif - #endif /* CRYPTO LIBS */ #if defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) || \ - defined(USE_NSS) || defined(USE_OS400CRYPTO) || \ - (defined(USE_OPENSSL) && defined(OPENSSL_NO_MD4)) || \ + defined(USE_OPENSSL) || defined(USE_NSS) || defined(USE_OS400CRYPTO) || \ (defined(USE_OPENSSL) && defined(OPENSSL_NO_MD4)) || \ (defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C)) @@ -400,7 +402,5 @@ void Curl_md4it(unsigned char *output, const unsigned char *input, size_t len) } #endif /* defined(USE_GNUTLS_NETTLE) || defined(USE_GNUTLS) || - defined(USE_NSS) || defined(USE_OS400CRYPTO) || - defined(USE_OS400CRYPTO) || - (defined(USE_OPENSSL) && defined(OPENSSL_NO_MD4)) || + defined(USE_OPENSSL) || defined(USE_NSS) || defined(USE_OS400CRYPTO) || \ (defined(USE_MBEDTLS) && !defined(MBEDTLS_MD4_C)) */ |