diff options
Diffstat (limited to 'src/tool_metalink.c')
| -rw-r--r-- | src/tool_metalink.c | 71 |
1 files changed, 4 insertions, 67 deletions
diff --git a/src/tool_metalink.c b/src/tool_metalink.c index 6d62f2d93..f87f686f1 100644 --- a/src/tool_metalink.c +++ b/src/tool_metalink.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2020, 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 @@ -54,13 +54,6 @@ # define SHA256_CTX void * # define HAVE_NSS_CONTEXT static NSSInitContext *nss_context; -#elif defined(USE_POLARSSL) -# include <polarssl/md5.h> -# include <polarssl/sha1.h> -# include <polarssl/sha256.h> -# define MD5_CTX md5_context -# define SHA_CTX sha1_context -# define SHA256_CTX sha256_context #elif (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && \ (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1040)) || \ (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && \ @@ -73,7 +66,7 @@ and later. If you're building for an older cat, well, sorry. */ # define COMMON_DIGEST_FOR_OPENSSL # include <CommonCrypto/CommonDigest.h> -#elif defined(WIN32) +#elif defined(USE_WIN32_CRYPTO) /* For Windows: If no other crypto library is provided, we fallback to the hash functions provided within the Microsoft Windows CryptoAPI */ # include <wincrypt.h> @@ -325,63 +318,7 @@ static void SHA256_Final(unsigned char digest[32], SHA256_CTX *pctx) nss_hash_final(pctx, digest, 32); } -#elif defined(USE_POLARSSL) - -static int MD5_Init(MD5_CTX *ctx) -{ - md5_starts(ctx); - return 1; -} - -static void MD5_Update(MD5_CTX *ctx, - const unsigned char *input, - unsigned int inputLen) -{ - md5_update(ctx, input, inputLen); -} - -static void MD5_Final(unsigned char digest[16], MD5_CTX *ctx) -{ - md5_finish(ctx, digest); -} - -static int SHA1_Init(SHA_CTX *ctx) -{ - sha1_starts(ctx); - return 1; -} - -static void SHA1_Update(SHA_CTX *ctx, - const unsigned char *input, - unsigned int inputLen) -{ - sha1_update(ctx, input, inputLen); -} - -static void SHA1_Final(unsigned char digest[20], SHA_CTX *ctx) -{ - sha1_finish(ctx, digest); -} - -static int SHA256_Init(SHA256_CTX *ctx) -{ - sha256_starts(ctx, 0); /* 0 = sha256 */ - return 1; -} - -static void SHA256_Update(SHA256_CTX *ctx, - const unsigned char *input, - unsigned int inputLen) -{ - sha256_update(ctx, input, inputLen); -} - -static void SHA256_Final(unsigned char digest[32], SHA256_CTX *ctx) -{ - sha256_finish(ctx, digest); -} - -#elif defined(WIN32) +#elif defined(USE_WIN32_CRYPTO) static void win32_crypto_final(struct win32_crypto_hash *ctx, unsigned char *digest, @@ -895,7 +832,7 @@ size_t metalink_write_cb(void *buffer, size_t sz, size_t nmemb, { struct per_transfer *per = userdata; struct OutStruct *outs = &per->outs; - struct OperationConfig *config = outs->config; + struct OperationConfig *config = per->config; int rv; /* |