moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-16 22:45:03 -05:00
Code Issues Releases Wiki Activity

ntlm: Remove redundant ifdef USE_OPENSSL

Browse Source 
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>
This commit is contained in:
pkubaj 2018-11-14 12:12:34 +00:00 committed by Daniel Gustafsson
parent 78ff4e0de3
commit 7c96f6a14b
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/curl_ntlm_core.c
View File

@ -54,23 +54,13 @@
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
# ifdef USE_OPENSSL # include <openssl/des.h>
# include <openssl/des.h> # ifndef OPENSSL_NO_MD4
# ifndef OPENSSL_NO_MD4 # include <openssl/md4.h>
# 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>
# endif # endif
# include <openssl/md5.h>
# include <openssl/ssl.h>
# include <openssl/rand.h>
# if (OPENSSL_VERSION_NUMBER < 0x00907001L) # if (OPENSSL_VERSION_NUMBER < 0x00907001L)
# define DES_key_schedule des_key_schedule # define DES_key_schedule des_key_schedule
# define DES_cblock des_cblock # define DES_cblock des_cblock