summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2015-03-05 10:57:52 +0100
committerDaniel Stenberg <daniel@haxx.se>2015-03-05 10:57:52 +0100
commit709cf76f6bb7dbaca14e3e8df160ccfac04dcecb (patch)
treecffb2677079ffeb53bd6e5afbe623d6295a5eb7d /src
parent1a62b6e68c08c7e471ff22dd92932aba7e026817 (diff)
downloadcurl-709cf76f6bb7dbaca14e3e8df160ccfac04dcecb.tar.gz
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.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.Watcom2
-rw-r--r--src/Makefile.b322
-rw-r--r--src/Makefile.m322
-rw-r--r--src/Makefile.vc64
-rw-r--r--src/tool_metalink.c15
5 files changed, 10 insertions, 15 deletions
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, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2015, Daniel Stenberg, <daniel@haxx.se>, 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, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2015, Daniel Stenberg, <daniel@haxx.se>, 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 <fcntl.h>
#endif
-#ifdef USE_SSLEAY
-# ifdef USE_OPENSSL
-# include <openssl/md5.h>
-# include <openssl/sha.h>
-# else
-# include <md5.h>
-# include <sha.h>
-# endif
+#ifdef USE_OPENSSL
+# include <openssl/md5.h>
+# include <openssl/sha.h>
#elif defined(USE_GNUTLS_NETTLE)
# include <nettle/md5.h>
# include <nettle/sha.h>
@@ -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,