diff options
| author | pkubaj <pkubaj@users.noreply.github.com> | 2018-11-14 12:12:34 +0000 |
|---|---|---|
| committer | Daniel Gustafsson <daniel@yesql.se> | 2018-11-20 14:59:12 +0100 |
| commit | 7c96f6a14b224df8f335164250ae175de30a5a96 (patch) | |
| tree | 4320c8f72ddae09f80f28e59aa6d0c3e0a358018 | |
| parent | 78ff4e0de3c53b026bb23a92c5c7abe3d285038e (diff) | |
| download | curl-7c96f6a14b224df8f335164250ae175de30a5a96.tar.gz | |
ntlm: Remove redundant ifdef USE_OPENSSL
lib/curl_ntlm.c had code that read as follows:
#ifdef USE_OPENSSL
# ifdef USE_OPENSSL
# else
# ..
# endif
#endif
Remove the redundant USE_OPENSSL along with #else (it's not possible to
reach it anyway). The removed construction is a leftover from when the
SSLeay support was removed.
Closes #3269
Reviewed-by: Daniel Gustafsson <daniel@yesql.se>
Reviewed-by: Daniel Stenberg <daniel@haxx.se>
| -rw-r--r-- | lib/curl_ntlm_core.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/lib/curl_ntlm_core.c b/lib/curl_ntlm_core.c index 922e85a92..6b6ff8295 100644 --- a/lib/curl_ntlm_core.c +++ b/lib/curl_ntlm_core.c @@ -54,23 +54,13 @@ #ifdef USE_OPENSSL -# ifdef USE_OPENSSL -# include <openssl/des.h> -# ifndef OPENSSL_NO_MD4 -# include <openssl/md4.h> -# endif -# include <openssl/md5.h> -# include <openssl/ssl.h> -# include <openssl/rand.h> -# else -# include <des.h> -# ifndef OPENSSL_NO_MD4 -# include <md4.h> -# endif -# include <md5.h> -# include <ssl.h> -# include <rand.h> +# include <openssl/des.h> +# ifndef OPENSSL_NO_MD4 +# include <openssl/md4.h> # endif +# include <openssl/md5.h> +# include <openssl/ssl.h> +# include <openssl/rand.h> # if (OPENSSL_VERSION_NUMBER < 0x00907001L) # define DES_key_schedule des_key_schedule # define DES_cblock des_cblock |