0001-ntlm-Remove-redundant-ifdef-USE_OPENSSL.patch
From 9d75b63dce94cfd14c89ad487f8835a374a65826 Mon Sep 17 00:00:00 2001 | |
From: pkubaj <pkubaj@users.noreply.github.com> | |
Date: Wed, 14 Nov 2018 12:12:34 +0000 | |
Subject: [PATCH] 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 Gustafssin <daniel@yesql.se> | |
Reviewed-by: Daniel Stenberg <daniel@haxx.se> | |
--- | |
lib/curl_ntlm_core.c | 22 ++++++---------------- | |
1 file 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 | |
-- | |
2.14.1.145.gb3622a4ee | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment