diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2015-03-05 10:57:52 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-03-05 10:57:52 +0100 |
| commit | 709cf76f6bb7dbaca14e3e8df160ccfac04dcecb (patch) | |
| tree | cffb2677079ffeb53bd6e5afbe623d6295a5eb7d /src/tool_metalink.c | |
| parent | 1a62b6e68c08c7e471ff22dd92932aba7e026817 (diff) | |
| download | curl-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/tool_metalink.c')
| -rw-r--r-- | src/tool_metalink.c | 15 |
1 files changed, 5 insertions, 10 deletions
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, |