From 709cf76f6bb7dbaca14e3e8df160ccfac04dcecb Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 5 Mar 2015 10:57:52 +0100 Subject: openssl: remove all uses of USE_SSLEAY SSLeay was the name of the library that was subsequently turned into OpenSSL many moons ago (1999). curl does not work with the old SSLeay library since years. This is now reflected by only using USE_OPENSSL in code that depends on OpenSSL. --- src/Makefile.Watcom | 2 +- src/Makefile.b32 | 2 +- src/Makefile.m32 | 2 +- src/Makefile.vc6 | 4 ++-- src/tool_metalink.c | 15 +++++---------- 5 files changed, 10 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom index c48566560..3945f96e5 100644 --- a/src/Makefile.Watcom +++ b/src/Makefile.Watcom @@ -75,7 +75,7 @@ CFLAGS += -d_WIN32_WINNT=0x0501 -dENABLE_IPV6 !endif !ifdef %use_ssl -CFLAGS += -wcd=138 -dUSE_OPENSSL -dUSE_SSLEAY -I"$(OPENSSL_ROOT)/inc32" +CFLAGS += -wcd=138 -dUSE_OPENSSL -dUSE_OPENSSL -I"$(OPENSSL_ROOT)/inc32" !endif !ifdef %curl_static diff --git a/src/Makefile.b32 b/src/Makefile.b32 index 6638a0115..250522619 100644 --- a/src/Makefile.b32 +++ b/src/Makefile.b32 @@ -67,7 +67,7 @@ LINKLIB = $(LINKLIB) $(ZLIB_PATH)\zlib.lib # SSL support is enabled setting WITH_SSL=1 !ifdef WITH_SSL -DEFINES = $(DEFINES) -DUSE_SSLEAY +DEFINES = $(DEFINES) -DUSE_OPENSSL INCDIRS = $(INCDIRS);$(OPENSSL_PATH)\inc32;$(OPENSSL_PATH)\inc32\openssl LINKLIB = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\libeay32.lib !endif diff --git a/src/Makefile.m32 b/src/Makefile.m32 index f3f9054f9..366983388 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -243,7 +243,7 @@ ifdef SSL OPENSSL_LIBS += -lgdi32 -lcrypt32 endif INCLUDES += -I"$(OPENSSL_INCLUDE)" - CFLAGS += -DUSE_SSLEAY -DUSE_OPENSSL + CFLAGS += -DUSE_OPENSSL curl_LDADD += -L"$(OPENSSL_LIBPATH)" $(OPENSSL_LIBS) endif ifdef ZLIB diff --git a/src/Makefile.vc6 b/src/Makefile.vc6 index c8693afb9..415d528fb 100644 --- a/src/Makefile.vc6 +++ b/src/Makefile.vc6 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1999 - 2014, Daniel Stenberg, , et al. +# Copyright (C) 1999 - 2015, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -95,7 +95,7 @@ ZLIB_LFLAGS = "/LIBPATH:$(ZLIB_PATH)" ZLIB_LIBS = zlib.lib ZLIB_IMP_LIBS = zdll.lib -SSL_CFLAGS = /DUSE_SSLEAY +SSL_CFLAGS = /DUSE_OPENSSL SSL_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32" SSL_IMP_LFLAGS = /LIBPATH:"$(OPENSSL_PATH)/out32dll" SSL_LIBS = libeay32.lib ssleay32.lib gdi32.lib user32.lib diff --git a/src/tool_metalink.c b/src/tool_metalink.c index 3573b058b..85d0ff4eb 100644 --- a/src/tool_metalink.c +++ b/src/tool_metalink.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2014, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2015, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -29,14 +29,9 @@ # include #endif -#ifdef USE_SSLEAY -# ifdef USE_OPENSSL -# include -# include -# else -# include -# include -# endif +#ifdef USE_OPENSSL +# include +# include #elif defined(USE_GNUTLS_NETTLE) # include # include @@ -381,7 +376,7 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx) sha256_finish(ctx, digest); } -#elif defined(_WIN32) && !defined(USE_SSLEAY) +#elif defined(_WIN32) && !defined(USE_OPENSSL) static void win32_crypto_final(struct win32_crypto_hash *ctx, unsigned char *digest, -- cgit v1.2.3